Merge pull request #4 from joaortk/master

Added clear text drawable parameter
ilegra · Aug 17, 2017 · 14be1f8 · 14be1f8
2 parents 3acf883 + aec203c
commit 14be1f8
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/library/src/main/java/com/rengwuxian/materialedittext/MaterialEditText.java b/library/src/main/java/com/rengwuxian/materialedittext/MaterialEditText.java
@@ -295,7 +295,7 @@ public class MaterialEditText extends MaterialBaseEditText {
     /**
      * Clear Button
      */
-    private Bitmap[] clearButtonBitmaps;
+    private int clearButtonDrawable;
 
     /**
      * Auto validate when focus lost.
@@ -422,7 +422,7 @@ private void init(Context context, AttributeSet attrs) {
         iconLeftBitmaps = generateIconBitmaps(typedArray.getResourceId(R.styleable.MaterialEditText_met_iconLeft, -1));
         iconRightBitmaps = generateIconBitmaps(typedArray.getResourceId(R.styleable.MaterialEditText_met_iconRight, -1));
         showClearButton = typedArray.getBoolean(R.styleable.MaterialEditText_met_clearButton, false);
-        clearButtonBitmaps = generateIconBitmaps(R.drawable.met_ic_clear);
+        clearButtonDrawable = typedArray.getResourceId(R.styleable.MaterialEditText_met_clearIconDrawable, R.drawable.met_ic_clear);
         iconPadding = typedArray.getDimensionPixelSize(R.styleable.MaterialEditText_met_iconPadding, getPixel(16));
         floatingLabelAlwaysShown = typedArray.getBoolean(R.styleable.MaterialEditText_met_floatingLabelAlwaysShown, false);
         helperTextAlwaysShown = typedArray.getBoolean(R.styleable.MaterialEditText_met_helperTextAlwaysShown, false);
@@ -496,6 +496,9 @@ public void afterTextChanged(Editable s) {
                 } else {
                     setError(null);
                 }
+                if (s.length() == 0 && showClearButton) {
+                    hideClearButton();
+                }
                 postInvalidate();
             }
         });
@@ -1304,7 +1307,7 @@ protected void onDraw(@NonNull Canvas canvas) {
 
         // draw the clear button
         if (hasFocus() && showClearButton && !TextUtils.isEmpty(getText()) && isEnabled()) {
-            setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.met_ic_clear, 0);
+            showClearButton();
         }
 
         // draw the underline
@@ -1414,6 +1417,10 @@ protected void onDraw(@NonNull Canvas canvas) {
         super.onDraw(canvas);
     }
 
+    private void showClearButton() {
+        setCompoundDrawablesWithIntrinsicBounds(0, 0, clearButtonDrawable, 0);
+    }
+
     @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
     private boolean isRTL() {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1) {
@@ -1495,7 +1502,7 @@ public boolean onTouchEvent(MotionEvent event) {
                     if (clearButtonClicking) {
                         if (!TextUtils.isEmpty(getText())) {
                             setText(null);
-                            setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
+                            hideClearButton();
                         }
                         clearButtonClicking = false;
                     }
@@ -1522,4 +1529,9 @@ private int checkLength(CharSequence text) {
         if (lengthChecker == null) return text.length();
         return lengthChecker.getLength(text);
     }
+
+    private void hideClearButton() {
+        setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
+    }
+
 }
diff --git a/library/src/main/res/values/attrs.xml b/library/src/main/res/values/attrs.xml
@@ -71,6 +71,8 @@
     <attr name="met_validateOnFocusLost" format="boolean"/>
     <!-- Whether check the characters count at the beginning it's shown. True by default. -->
     <attr name="met_checkCharactersCountAtBeginning" format="boolean"/>
+    <!-- Clear icon -->
+    <attr name="met_clearIconDrawable" format="reference" />
 
   </declare-styleable>
 </resources>