PinEntryEditText has text button bug not focused added issue #33

alphamu · Oct 15, 2018 · a01ab20 · a01ab20
1 parent add221c
commit a01ab20
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 2 deletions.
diff --git a/README.MD b/README.MD
@@ -118,6 +118,10 @@ attribute in the xml. If you want to specify the empty and filled states using y
 you can set the `textColor` to transparent and setup your drawable as follows:
 
 ```xml
+<!--
+    Please look at the sample app's bg_pin.xml
+    or bg_pin_round.xml for all available options
+-->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Space contains text -->
     <item android:state_focused="true" android:state_checked="true">
@@ -146,7 +150,7 @@ you can set the `textColor` to transparent and setup your drawable as follows:
 </selector>
 ```
 
-Note that in this setup, the size of the drawable will be determined by the `textSize` and and the `pinTextBottomPadding`
+**Note** that in this setup, the size of the drawable will be determined by the `textSize` and and the `pinTextBottomPadding`
 which is the space between the character and the line below (or the bottom of the `pinBackgroundDrawable`).
 For good measure, set `pinAnimationType` to none as well.
 

diff --git a/pinentryedittext/src/main/java/com/alimuzaffar/lib/pin/PinEntryEditText.java b/pinentryedittext/src/main/java/com/alimuzaffar/lib/pin/PinEntryEditText.java
@@ -446,7 +446,11 @@ protected void updateDrawableState(boolean hasText, boolean isNext) {
                 mPinBackground.setState(new int[]{android.R.attr.state_focused, android.R.attr.state_checked});
             }
         } else {
-            mPinBackground.setState(new int[]{-android.R.attr.state_focused});
+            if (hasText) {
+                mPinBackground.setState(new int[]{-android.R.attr.state_focused, android.R.attr.state_checked});
+            } else {
+                mPinBackground.setState(new int[]{-android.R.attr.state_focused});
+            }
         }
     }
 

diff --git a/sample-app/src/main/res/drawable/bg_pin.xml b/sample-app/src/main/res/drawable/bg_pin.xml
@@ -24,6 +24,14 @@
             <solid android:color="@android:color/white" />
         </shape>
     </item>
+    <!--Space contains text and not focused -->
+    <item android:state_focused="false" android:state_checked="true">
+        <shape android:shape="oval">
+            <stroke android:width="2dp" android:color="@android:color/holo_green_light" />
+            <corners android:radius="8dp" />
+            <solid android:color="@android:color/darker_gray" />
+        </shape>
+    </item>
     <!-- PinEntryEditText is focused -->
     <item android:state_focused="true">
         <shape android:shape="rectangle">

diff --git a/sample-app/src/main/res/drawable/bg_pin_round.xml b/sample-app/src/main/res/drawable/bg_pin_round.xml
@@ -21,6 +21,13 @@
             <solid android:color="@android:color/white" />
         </shape>
     </item>
+    <!--Space contains text and not focused -->
+    <item android:state_focused="false" android:state_checked="true">
+        <shape android:shape="oval">
+            <stroke android:width="1dp" android:color="@android:color/holo_green_light" />
+            <solid android:color="@android:color/white" />
+        </shape>
+    </item>
     <!-- PinEntryEditText is focused -->
     <item android:state_focused="true">
         <shape android:shape="oval">