Bug fixes

Author: dkzwm

app/src/main/res/layout/activity_main.xml

@@ -43,11 +43,14 @@
         android:layout_height="wrap_content"
         android:hint="@string/please_input_phone_number"
         android:inputType="phone"
-        android:maxLength="22"
+        android:maxLength="19"
         android:padding="12dp"
         android:text="13012345678"
         android:textColor="@android:color/black"
         android:textSize="16sp"
+        app:fet_clearDrawable="@drawable/icon_clear"
+        app:fet_drawableGravity="fet_center"
+        app:fet_drawablePadding="4dp"
         app:fet_formatStyle="+(86)-***-****-****"
         app:fet_mark="*"
         app:fet_mode="mode_complex" />
@@ -76,7 +79,6 @@
         app:fet_clearDrawable="@drawable/icon_clear"
         app:fet_drawableGravity="fet_center"
         app:fet_drawablePadding="4dp"
-        app:fet_emptyPlaceholder="_"
         app:fet_formatStyle="+(86)-000-0000-0000"
         app:fet_mode="mode_mask"
         app:fet_showHintWhileEmpty="true" />
@@ -108,7 +110,7 @@
         app:fet_formatStyle="000 000 0000 0000 000*"
         app:fet_hintText="100 000 2020 0101 000X"
         app:fet_mode="mode_hint"
-        app:fet_showHintWhileEmpty="true" />
+        app:fet_showHintWhileEmpty="false" />
 
     <TextView
         android:id="@+id/textView_hint"

core/src/main/java/me/dkzwm/widget/fet/FormattedEditText.java

@@ -303,10 +303,12 @@ public boolean onTouchEvent(MotionEvent event) {
                                 && Math.abs(mDownPoint[1] - y) <= mTouchSlop) {
                             if (mClearClickListener != null) {
                                 if (!mClearClickListener.onClearClick(this, mClearDrawable)) {
-                                    getText().clear();
+                                    event.setAction(MotionEvent.ACTION_CANCEL);
+                                    clearText();
                                 }
                             } else {
-                                getText().clear();
+                                event.setAction(MotionEvent.ACTION_CANCEL);
+                                clearText();
                             }
                             super.onTouchEvent(event);
                             return true;
@@ -396,6 +398,13 @@ public int getHintColor() {
         return mHintColor;
     }
 
+    private void clearText() {
+        Editable editable = getText();
+        if (editable != null) {
+            editable.clear();
+        }
+    }
+
     private void setConfig(Config config, boolean create) {
         if (config.mMode != null) {
             mMode = config.mMode;
@@ -530,7 +539,7 @@ public String getRealText() {
 
     private String getRealText(boolean saved) {
         if (saved && mMode == MODE_NONE) {
-            return "";
+            return null;
         }
         Editable editable = getText();
         if (editable == null || editable.length() == 0) {
@@ -552,11 +561,14 @@ private String getRealText(boolean saved) {
                             0,
                             Math.min(value.length(), mFormatStyle.length()),
                             IPlaceholderSpan.class);
+            if (spans.length == mFormatStyle.length()) {
+                return "";
+            }
         }
         if (spans.length == 0) {
             if (saved) {
                 value.clear();
-                return "";
+                return null;
             }
         } else {
             clearNonEmptySpans(value, spans);
@@ -671,13 +683,18 @@ private <T> void clearArray(final T[] holders) {
 
     private void formatTextWhenDelete(final Editable editable, int start, int before) {
         mIsFormatted = true;
+        final boolean filter = mFilterRestoreTextChangeEvent;
         super.removeTextChangedListener(mTextWatcher);
         final int length = editable.length();
         InputFilter[] filters = editable.getFilters();
         editable.setFilters(EMPTY_FILTERS);
-        int selectionStart = Selection.getSelectionStart(editable);
-        int selectionEnd = Selection.getSelectionEnd(editable);
-        editable.setSpan(SELECTION_SPAN, selectionStart, selectionEnd, Spanned.SPAN_MARK_MARK);
+        int selectionStart, selectionEnd;
+        if (!filter) {
+            selectionStart = Selection.getSelectionStart(editable);
+            selectionEnd = Selection.getSelectionEnd(editable);
+            Selection.removeSelection(editable);
+            editable.setSpan(SELECTION_SPAN, selectionStart, selectionEnd, Spanned.SPAN_MARK_MARK);
+        }
         if (mMode < MODE_MASK) {
             final boolean deletedLast = start >= editable.length();
             if (!deletedLast) {
@@ -697,15 +714,19 @@ private void formatTextWhenDelete(final Editable editable, int start, int before
         } else {
             formatMask(editable, start, true);
         }
-        final int realCount = before + Math.max(length - editable.length(), 0);
-        selectionStart = editable.getSpanStart(SELECTION_SPAN);
-        selectionEnd = editable.getSpanEnd(SELECTION_SPAN);
-        editable.removeSpan(SELECTION_SPAN);
-        editable.setFilters(filters);
-        Editable text = getText();
-        Selection.setSelection(text, selectionStart, selectionEnd);
-        sendOnTextChanged(text, selectionStart, realCount, 0);
-        sendAfterTextChanged(text);
+        if (!filter) {
+            final int realCount = before + Math.max(length - editable.length(), 0);
+            selectionStart = editable.getSpanStart(SELECTION_SPAN);
+            selectionEnd = editable.getSpanEnd(SELECTION_SPAN);
+            editable.removeSpan(SELECTION_SPAN);
+            editable.setFilters(filters);
+            Editable text = getText();
+            Selection.setSelection(text, selectionStart, selectionEnd);
+            sendOnTextChanged(text, selectionStart, realCount, 0);
+            sendAfterTextChanged(text);
+        } else {
+            setFilters(filters);
+        }
         mIsFormatted = false;
         super.addTextChangedListener(mTextWatcher);
     }
@@ -721,6 +742,7 @@ private void formatTextWhenAppend(final Editable editable, int start, int count)
         if (!filter) {
             selectionStart = Selection.getSelectionStart(editable);
             selectionEnd = Selection.getSelectionEnd(editable);
+            Selection.removeSelection(editable);
             editable.setSpan(SELECTION_SPAN, selectionStart, selectionEnd, Spanned.SPAN_MARK_MARK);
         }
         if (mMode < MODE_MASK) {
@@ -876,7 +898,7 @@ private void formatMask(final Editable editable, int start, boolean delete) {
                             break;
                         }
                     } else {
-                        if (mHintText==null){
+                        if (mHintText == null) {
                             break;
                         }
                         editable.insert(
@@ -1002,7 +1024,7 @@ public void onRestoreInstanceState(Parcelable state) {
         } else if (mMode == MODE_COMPLEX) {
             parseComplexPlaceholders();
         }
-        if (!TextUtils.isEmpty(savedState.mRealText)) {
+        if (savedState.mRealText != null) {
             mRestoring = true;
             super.onRestoreInstanceState(savedState.getSuperState());
             mRestoring = false;