diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..b746bf3f --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +.gradle +.idea +*.iml +local.properties diff --git a/app/build.gradle b/app/build.gradle index de9556a1..3fd305d5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,16 +1,16 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 25 - buildToolsVersion "25.0.3" + compileSdkVersion 29 defaultConfig { applicationId "com.andrognito.pinlockviewapp" - minSdkVersion 11 - targetSdkVersion 25 + minSdkVersion 21 + targetSdkVersion 29 versionCode 1 - versionName "1.0" + versionName "1.0.0" } + buildTypes { release { minifyEnabled false @@ -20,8 +20,12 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - testCompile 'junit:junit:4.12' - compile 'com.android.support:appcompat-v7:25.3.1' - compile project(':pinlockview') + implementation fileTree(dir: 'libs', include: ['*.jar']) + + implementation project(':pinlockview') + + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'com.google.android.material:material:1.2.0-alpha04' + + testImplementation 'junit:junit:4.12' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f3430dc1..765630d5 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -7,7 +7,7 @@ android:icon="@drawable/ic_launcher" android:label="@string/app_name" android:supportsRtl="true" - android:theme="@style/AppTheme"> + android:theme="@style/AppTheme.NoActionBar"> diff --git a/app/src/main/java/com/andrognito/pinlockviewapp/SampleActivity.java b/app/src/main/java/com/andrognito/pinlockviewapp/SampleActivity.java index f6414d5a..85e85e20 100644 --- a/app/src/main/java/com/andrognito/pinlockviewapp/SampleActivity.java +++ b/app/src/main/java/com/andrognito/pinlockviewapp/SampleActivity.java @@ -1,12 +1,13 @@ package com.andrognito.pinlockviewapp; import android.os.Bundle; -import android.support.v4.content.ContextCompat; -import android.support.v7.app.AppCompatActivity; import android.util.Log; import android.view.Window; import android.view.WindowManager; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.content.ContextCompat; + import com.andrognito.pinlockview.IndicatorDots; import com.andrognito.pinlockview.PinLockListener; import com.andrognito.pinlockview.PinLockView; diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 5e404d91..4e7bf59e 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,11 +1,13 @@ - - + diff --git a/build.gradle b/build.gradle index b249cff4..402e40e4 100644 --- a/build.gradle +++ b/build.gradle @@ -2,10 +2,11 @@ buildscript { repositories { + google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.3' + classpath 'com.android.tools.build:gradle:3.5.3' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1' // NOTE: Do not place your application dependencies here; they belong @@ -15,6 +16,7 @@ buildscript { allprojects { repositories { + google() jcenter() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 660db70a..2039fdb4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Mar 10 00:08:20 IST 2017 +#Wed Feb 12 09:08:40 ICT 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip diff --git a/pinlockview/build.gradle b/pinlockview/build.gradle index 2fe6adbf..0d3389a6 100644 --- a/pinlockview/build.gradle +++ b/pinlockview/build.gradle @@ -4,7 +4,7 @@ ext { bintrayRepo = 'maven' bintrayName = 'pin-lock-view' - publishedGroupId = 'com.andrognito.pinlockview' + publishedGroupId = 'com.andrognito.pinlockview-phongbm' libraryName = 'pinlockview' artifact = 'pinlockview' @@ -26,12 +26,11 @@ ext { android { - compileSdkVersion 25 - buildToolsVersion "25.0.3" + compileSdkVersion 29 defaultConfig { - minSdkVersion 11 - targetSdkVersion 25 + minSdkVersion 21 + targetSdkVersion 29 versionCode 5 versionName "2.1.0" } @@ -44,10 +43,12 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - testCompile 'junit:junit:4.12' - compile 'com.android.support:appcompat-v7:25.3.1' - compile 'com.android.support:recyclerview-v7:25.3.1' + implementation fileTree(dir: 'libs', include: ['*.jar']) + + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'com.google.android.material:material:1.2.0-alpha04' + + testImplementation 'junit:junit:4.12' } apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle' diff --git a/pinlockview/src/main/java/com/andrognito/pinlockview/CustomizationOptionsBundle.java b/pinlockview/src/main/java/com/andrognito/pinlockview/CustomizationOptionsBundle.java index 63eee73e..5b3eb7f3 100644 --- a/pinlockview/src/main/java/com/andrognito/pinlockview/CustomizationOptionsBundle.java +++ b/pinlockview/src/main/java/com/andrognito/pinlockview/CustomizationOptionsBundle.java @@ -5,7 +5,7 @@ /** * The customization options for the buttons in {@link PinLockView} * passed to the {@link PinLockAdapter} to decorate the individual views - * + *

* Created by aritraroy on 01/06/16. */ public class CustomizationOptionsBundle { @@ -47,7 +47,7 @@ public void setButtonSize(int buttonSize) { } public Drawable getButtonBackgroundDrawable() { - return buttonBackgroundDrawable; + return buttonBackgroundDrawable.getConstantState().newDrawable(); } public void setButtonBackgroundDrawable(Drawable buttonBackgroundDrawable) { diff --git a/pinlockview/src/main/java/com/andrognito/pinlockview/IndicatorDots.java b/pinlockview/src/main/java/com/andrognito/pinlockview/IndicatorDots.java index b332d4de..0007dd00 100644 --- a/pinlockview/src/main/java/com/andrognito/pinlockview/IndicatorDots.java +++ b/pinlockview/src/main/java/com/andrognito/pinlockview/IndicatorDots.java @@ -3,13 +3,14 @@ import android.animation.LayoutTransition; import android.content.Context; import android.content.res.TypedArray; -import android.support.annotation.IntDef; -import android.support.v4.view.ViewCompat; import android.util.AttributeSet; import android.view.View; import android.view.ViewGroup; import android.widget.LinearLayout; +import androidx.annotation.IntDef; +import androidx.core.view.ViewCompat; + import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/pinlockview/src/main/java/com/andrognito/pinlockview/ItemSpaceDecoration.java b/pinlockview/src/main/java/com/andrognito/pinlockview/ItemSpaceDecoration.java index 3abbd1a9..490aa55a 100644 --- a/pinlockview/src/main/java/com/andrognito/pinlockview/ItemSpaceDecoration.java +++ b/pinlockview/src/main/java/com/andrognito/pinlockview/ItemSpaceDecoration.java @@ -1,9 +1,10 @@ package com.andrognito.pinlockview; import android.graphics.Rect; -import android.support.v7.widget.RecyclerView; import android.view.View; +import androidx.recyclerview.widget.RecyclerView; + /** * Created by aritraroy on 31/05/16. */ diff --git a/pinlockview/src/main/java/com/andrognito/pinlockview/LTRGridLayoutManager.java b/pinlockview/src/main/java/com/andrognito/pinlockview/LTRGridLayoutManager.java index eac00a54..60bf2625 100644 --- a/pinlockview/src/main/java/com/andrognito/pinlockview/LTRGridLayoutManager.java +++ b/pinlockview/src/main/java/com/andrognito/pinlockview/LTRGridLayoutManager.java @@ -1,9 +1,10 @@ package com.andrognito.pinlockview; import android.content.Context; -import android.support.v7.widget.GridLayoutManager; import android.util.AttributeSet; +import androidx.recyclerview.widget.GridLayoutManager; + /** * Used to always maintain an LTR layout no matter what is the real device's layout direction * to avoid an unwanted reversed direction in RTL devices @@ -25,7 +26,7 @@ public LTRGridLayoutManager(Context context, int spanCount, int orientation, boo } @Override - protected boolean isLayoutRTL(){ + protected boolean isLayoutRTL() { return false; } } diff --git a/pinlockview/src/main/java/com/andrognito/pinlockview/PinLockAdapter.java b/pinlockview/src/main/java/com/andrognito/pinlockview/PinLockAdapter.java index 1df5c3a7..ab244f6a 100644 --- a/pinlockview/src/main/java/com/andrognito/pinlockview/PinLockAdapter.java +++ b/pinlockview/src/main/java/com/andrognito/pinlockview/PinLockAdapter.java @@ -3,16 +3,16 @@ import android.content.Context; import android.graphics.PorterDuff; import android.graphics.Rect; -import android.os.Build; -import android.support.v7.widget.RecyclerView; import android.util.TypedValue; import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; -import android.widget.Button; import android.widget.ImageView; import android.widget.LinearLayout; +import android.widget.TextView; + +import androidx.recyclerview.widget.RecyclerView; /** * Created by aritraroy on 31/05/16. @@ -74,13 +74,7 @@ private void configureNumberButtonHolder(NumberViewHolder holder, int position) if (mCustomizationOptionsBundle != null) { holder.mNumberButton.setTextColor(mCustomizationOptionsBundle.getTextColor()); if (mCustomizationOptionsBundle.getButtonBackgroundDrawable() != null) { - if (Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.JELLY_BEAN) { - holder.mNumberButton.setBackgroundDrawable( - mCustomizationOptionsBundle.getButtonBackgroundDrawable()); - } else { - holder.mNumberButton.setBackground( - mCustomizationOptionsBundle.getButtonBackgroundDrawable()); - } + holder.mNumberButton.setBackground(mCustomizationOptionsBundle.getButtonBackgroundDrawable()); } holder.mNumberButton.setTextSize(TypedValue.COMPLEX_UNIT_PX, mCustomizationOptionsBundle.getTextSize()); @@ -179,11 +173,11 @@ public void setCustomizationOptions(CustomizationOptionsBundle customizationOpti } public class NumberViewHolder extends RecyclerView.ViewHolder { - Button mNumberButton; + TextView mNumberButton; public NumberViewHolder(final View itemView) { super(itemView); - mNumberButton = (Button) itemView.findViewById(R.id.button); + mNumberButton = itemView.findViewById(R.id.button); mNumberButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { diff --git a/pinlockview/src/main/java/com/andrognito/pinlockview/PinLockView.java b/pinlockview/src/main/java/com/andrognito/pinlockview/PinLockView.java index 72eade71..28fbcdb3 100644 --- a/pinlockview/src/main/java/com/andrognito/pinlockview/PinLockView.java +++ b/pinlockview/src/main/java/com/andrognito/pinlockview/PinLockView.java @@ -3,10 +3,11 @@ import android.content.Context; import android.content.res.TypedArray; import android.graphics.drawable.Drawable; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; import android.util.AttributeSet; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; + /** * Represents a numeric lock view which can used to taken numbers as input. * The length of the input can be customized using {@link PinLockView#setPinLength(int)}, the default value being 4 diff --git a/pinlockview/src/main/java/com/andrognito/pinlockview/ResourceUtils.java b/pinlockview/src/main/java/com/andrognito/pinlockview/ResourceUtils.java index 57d7016b..f75f301c 100644 --- a/pinlockview/src/main/java/com/andrognito/pinlockview/ResourceUtils.java +++ b/pinlockview/src/main/java/com/andrognito/pinlockview/ResourceUtils.java @@ -2,10 +2,11 @@ import android.content.Context; import android.graphics.drawable.Drawable; -import android.support.annotation.ColorRes; -import android.support.annotation.DimenRes; -import android.support.annotation.DrawableRes; -import android.support.v4.content.ContextCompat; + +import androidx.annotation.ColorRes; +import androidx.annotation.DimenRes; +import androidx.annotation.DrawableRes; +import androidx.core.content.ContextCompat; /** * Created by aritraroy on 10/06/16. diff --git a/pinlockview/src/main/res/layout-v21/layout_number_item.xml b/pinlockview/src/main/res/layout-v21/layout_number_item.xml deleted file mode 100644 index e96e7fe8..00000000 --- a/pinlockview/src/main/res/layout-v21/layout_number_item.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - -