Fix a bug that the floating label animation works improperly.

It's caused by incorrect use of ObjectAnimator.reverse().
hixin · Apr 28, 2015 · 58e3c02 · 58e3c02
1 parent da02d43
commit 58e3c02
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 30 deletions.
diff --git a/library/src/main/java/com/rengwuxian/materialedittext/MaterialAutoCompleteTextView.java b/library/src/main/java/com/rengwuxian/materialedittext/MaterialAutoCompleteTextView.java
@@ -849,11 +849,7 @@ public void afterTextChanged(Editable s) {
             }
           } else if (!floatingLabelShown) {
             floatingLabelShown = true;
-            if (getLabelAnimator().isStarted()) {
-              getLabelAnimator().reverse();
-            } else {
-              getLabelAnimator().start();
-            }
+            getLabelAnimator().start();
           }
         }
       }
@@ -864,11 +860,7 @@ public void afterTextChanged(Editable s) {
       public void onFocusChange(View v, boolean hasFocus) {
         if (floatingLabelEnabled && highlightFloatingLabel) {
           if (hasFocus) {
-            if (getLabelFocusAnimator().isStarted()) {
-              getLabelFocusAnimator().reverse();
-            } else {
-              getLabelFocusAnimator().start();
-            }
+            getLabelFocusAnimator().start();
           } else {
             getLabelFocusAnimator().reverse();
           }

diff --git a/library/src/main/java/com/rengwuxian/materialedittext/MaterialEditText.java b/library/src/main/java/com/rengwuxian/materialedittext/MaterialEditText.java
@@ -849,11 +849,7 @@ public void afterTextChanged(Editable s) {
             }
           } else if (!floatingLabelShown) {
             floatingLabelShown = true;
-            if (getLabelAnimator().isStarted()) {
-              getLabelAnimator().reverse();
-            } else {
-              getLabelAnimator().start();
-            }
+            getLabelAnimator().start();
           }
         }
       }
@@ -864,11 +860,7 @@ public void afterTextChanged(Editable s) {
       public void onFocusChange(View v, boolean hasFocus) {
         if (floatingLabelEnabled && highlightFloatingLabel) {
           if (hasFocus) {
-            if (getLabelFocusAnimator().isStarted()) {
-              getLabelFocusAnimator().reverse();
-            } else {
-              getLabelFocusAnimator().start();
-            }
+            getLabelFocusAnimator().start();
           } else {
             getLabelFocusAnimator().reverse();
           }

diff --git a/library/src/main/java/com/rengwuxian/materialedittext/MaterialMultiAutoCompleteTextView.java b/library/src/main/java/com/rengwuxian/materialedittext/MaterialMultiAutoCompleteTextView.java
@@ -846,11 +846,7 @@ public void afterTextChanged(Editable s) {
             }
           } else if (!floatingLabelShown) {
             floatingLabelShown = true;
-            if (getLabelAnimator().isStarted()) {
-              getLabelAnimator().reverse();
-            } else {
-              getLabelAnimator().start();
-            }
+            getLabelAnimator().start();
           }
         }
       }
@@ -861,11 +857,7 @@ public void afterTextChanged(Editable s) {
       public void onFocusChange(View v, boolean hasFocus) {
         if (floatingLabelEnabled && highlightFloatingLabel) {
           if (hasFocus) {
-            if (getLabelFocusAnimator().isStarted()) {
-              getLabelFocusAnimator().reverse();
-            } else {
-              getLabelFocusAnimator().start();
-            }
+            getLabelFocusAnimator().start();
           } else {
             getLabelFocusAnimator().reverse();
           }