Merge pull request #58 from GoodieBag/bug_fix

Bug fix : #57 and bumped gradle version
GoodieBag · Sep 4, 2021 · 9fa0e53 · 9fa0e53
2 parents 84f114b + e4ba285
commit 9fa0e53
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.1'
+        classpath 'com.android.tools.build:gradle:7.0.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/example/src/main/res/drawable/example_drawable.xml b/example/src/main/res/drawable/example_drawable.xml
@@ -2,14 +2,14 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="true" android:state_focused="true">
         <shape android:padding="10dp" android:shape="rectangle">
-            <stroke android:width="0.5dp" android:color="#FF0000" />
-            <solid android:color="#FFFF00" />
+            <stroke android:width="1dp" android:color="#006DCC" />
+            <solid android:color="#F5F5F5" />
             <corners android:radius="4dp" />
         </shape>
     </item>
     <item>
         <shape android:padding="10dp" android:shape="rectangle">
-            <stroke android:width="0.5dp" android:color="#FF0000" />
+            <stroke android:width="0.5dp" android:color="#000000" />
             <solid android:color="#FFF" />
             <corners android:radius="4dp" />
         </shape>

diff --git a/example/src/main/res/drawable/example_drawable_with_grey_disabled.xml b/example/src/main/res/drawable/example_drawable_with_grey_disabled.xml
@@ -8,14 +8,14 @@
     </item>
     <item android:state_enabled="true" android:state_focused="true">
         <shape android:padding="10dp" android:shape="rectangle">
-            <stroke android:width="0.5dp" android:color="#FF0000" />
-            <solid android:color="#FFFF00" />
+            <stroke android:width="1dp" android:color="#006DCC" />
+            <solid android:color="#F5F5F5" />
             <corners android:radius="4dp" />
         </shape>
     </item>
     <item>
         <shape android:padding="10dp" android:shape="rectangle">
-            <stroke android:width="0.5dp" android:color="#FF0000" />
+            <stroke android:width="0.5dp" android:color="#000000" />
             <solid android:color="#FFF" />
             <corners android:radius="4dp" />
         </shape>

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
diff --git a/pinview/src/main/java/com/goodiebag/pinview/Pinview.kt b/pinview/src/main/java/com/goodiebag/pinview/Pinview.kt
@@ -264,9 +264,8 @@ class Pinview @JvmOverloads constructor(context: Context, attrs: AttributeSet? =
                 }
             }
             if (mPinLength > 0) {
-                if (lastTagHavingValue < mPinLength - 1) {
-                    currentFocus = editTextList[lastTagHavingValue + 1]
-                } else {
+                currentFocus = editTextList[mPinLength - 1]
+                if (lastTagHavingValue == mPinLength - 1) {
                     currentFocus = editTextList[mPinLength - 1]
                     if (inputType == InputType.NUMBER || mPassword) {
                         this.finalNumberPin = true
@@ -383,7 +382,9 @@ class Pinview @JvmOverloads constructor(context: Context, attrs: AttributeSet? =
                 finalNumberPin = true
             }
         } else if (charSequence.isEmpty()) {
-
+            if(indexOfCurrentFocus < 0){
+                return
+            }
             val currentTag = indexOfCurrentFocus
             this.mDelPressed = true