shrink anim complete

Author: FlodCoding

Loadingbutton/src/main/java/com/flod/loadingbutton/LoadingButton.java

@@ -28,6 +28,9 @@
  * 3、收缩后的大小随loading的大小决定
  * 4、设置loading 可以设置为上下左右
  * 5、重复start的动画处理
+ * 6、恢复动画还没结束时，点击收缩会变成恢复的状态
+ * 7、正在显示EndDrawable时，再次点击start会变成恢复状态的加载
+ *    先执行 beginShrinkAnim(true) 后执行 beginShrinkAnim(false);
  */
 @SuppressWarnings("UnusedReturnValue,SameParameterValue")
 public class LoadingButton extends DrawableTextView {
@@ -143,39 +146,22 @@ public void onAnimationStart(Animator animation) {
                 }
             }
 
-            @Override
-            public void onAnimationCancel(Animator animation) {
-                super.onAnimationCancel(animation);
-                isAnimRunning = false;
-                // Log.d("Animation", "onAnimationCancel");
-            }
-
             @Override
             public void onAnimationEnd(Animator animation) {
                 //Log.d("Animation", "onAnimationEnd");
                 if (mOnLoadingListener != null) {
                     mOnLoadingListener.onShrinkEnd(isShrinkAnimReverse);
                 }
-                //Log.d("Animation", "isAnimRunning= " + isAnimRunning);
-                if (isAnimRunning) {
-                    if (!isShrinkAnimReverse) {
-                        //收缩结束
-                        startLoading();
-                    } else {
-                        //恢复结束
-                        restoreStatus();
-                        setEnabled(true);
-                        isAnimRunning = false;
-                    }
+                if (!isShrinkAnimReverse) {
+                    //收缩结束
+                    startLoading();
                 } else {
+                    //恢复结束
                     stopLoading();
                     restoreStatus();
                     setEnabled(true);
                     isAnimRunning = false;
                 }
-
-                //Log.d("Animation", "isAnimRunning= " + isAnimRunning);
-                //Log.d("Animation", "isShrinkAnimReverse= " + isShrinkAnimReverse);
                 isShrinkAnimReverse = !isShrinkAnimReverse;
             }
 
@@ -184,6 +170,40 @@ public void onAnimationEnd(Animator animation) {
 
     }
 
+    public void start() {
+        Log.d("Animation", "start");
+        if (enableShrink) {
+
+            //TODO 如果mEndDrawable mEndDrawable.isShowing 且准备执行 beginShrinkAnim(false); 就会冲突
+            if (mEndDrawable != null && mEndDrawable.isShowing) {
+                //想办法先让上一个动画先结束
+                mEndDrawable.cancel();
+            }
+            beginShrinkAnim(true, false);
+        } else {
+            startLoading();
+        }
+
+    }
+
+    public void end() {
+        if (mEndDrawable == null) {
+            if (mOnLoadingListener != null) {
+                mOnLoadingListener.onLoadingEnd();
+            }
+            beginShrinkAnim(false, false);
+        } else {
+            if (mShrinkAnimator.isRunning()) {
+                //结束正在收缩的动画
+                mShrinkAnimator.end();
+            }
+            stopLoading();
+            Log.d("Animation", "end");
+            mEndDrawable.show();
+        }
+
+    }
+
     /**
      * 保存收缩前的状态
      */
@@ -209,18 +229,23 @@ private void restoreStatus() {
     }
 
 
-    private void beginShrinkAnim(boolean isShrink) {
-
+    private void beginShrinkAnim(boolean isShrink, boolean lastFrame) {
         Log.d("Animation", "isShrink" + isShrink);
         if (enableShrink) {
-            //isShrinkAnimReverse = !isShrink;
-            mShrinkAnimator.cancel();
+            if (mShrinkAnimator.isRunning()) {
+                //如果上一个动画还在执行，就结束到最后一帧
+                mShrinkAnimator.end();
+            }
             if (isShrink) {
                 mShrinkAnimator.start();
             } else {
                 mShrinkAnimator.reverse();
             }
 
+            if (lastFrame) {
+                mShrinkAnimator.end();
+            }
+
         }
     }
 
@@ -323,6 +348,8 @@ private class EndDrawable {
         private ObjectAnimator mAppearAnimator;
         private long duration;
         private float animValue;
+        private boolean isShowing;
+        private Runnable mRunnable;
 
 
         private EndDrawable(@DrawableRes int id) {
@@ -332,35 +359,55 @@ private EndDrawable(@DrawableRes int id) {
             mCirclePath = new Path();
             mAppearAnimator = ObjectAnimator.ofFloat(this, "animValue", 1.0f);
             mAppearAnimator.setDuration(DEFAULT_APPEAR_DURATION);
+            mRunnable = new Runnable() {
+                @Override
+                public void run() {
+                    Log.d("Animation", "onEndDrawableAnimationEnd");
+                    setAnimValue(0);
+                    if (enableShrink && isAnimRunning) {
+                        beginShrinkAnim(false, false);
+                    } else {
+                        setEnabled(true);
+                        isAnimRunning = false;
+                    }
+                    isShowing = false;
+                }
+            };
             mAppearAnimator.addListener(new AnimatorListenerAdapter() {
                 @Override
                 public void onAnimationEnd(Animator animation) {
                     if (mOnLoadingListener != null) {
                         mOnLoadingListener.onLoadingEnd();
                     }
-                    postDelayed(new Runnable() {
-                        @Override
-                        public void run() {
-                            Log.d("Animation", "onEndDrawableAnimationEnd");
-                            setAnimValue(0);
-                            if (enableShrink && isAnimRunning) {
-                                beginShrinkAnim(false);
-                            } else {
-                                setEnabled(true);
-                                isAnimRunning = false;
-                            }
-                        }
-                    }, duration);
+                    if (isShowing) {
+                        postDelayed(mRunnable, duration);
+                    }
                 }
             });
 
         }
 
         private void show() {
-            mAppearAnimator.cancel();
+            //如果仍在显示中，结束动画
+            if (isShowing) {
+                cancel();
+            }
             mAppearAnimator.start();
+            isShowing = true;
+        }
+
+        private void cancel() {
+            isShowing = false;
+            if (mAppearAnimator.isRunning()) {
+                //出现中
+                mAppearAnimator.end();
+            }
+            getHandler().removeCallbacks(mRunnable);
+            beginShrinkAnim(false, true);
+            setAnimValue(0);
         }
 
+
         private void hide() {
             mAppearAnimator.cancel();
             mAppearAnimator.reverse();
@@ -503,36 +550,6 @@ public void setOnLoadingListener(OnLoadingListener onLoadingListener) {
     }
 
 
-    public void start() {
-        Log.d("Animation", "start");
-        if (enableShrink)
-            beginShrinkAnim(true);
-        else {
-            startLoading();
-        }
-
-    }
-
-    public void stop() {
-
-        if (mEndDrawable == null) {
-            if (mOnLoadingListener != null) {
-                mOnLoadingListener.onLoadingEnd();
-            }
-            beginShrinkAnim(false);
-        } else {
-            if (mShrinkAnimator.isRunning()) {
-                isAnimRunning = false;
-                mShrinkAnimator.end();
-                isShrinkAnimReverse = true;
-            }
-            //mShrinkAnimator.cancel();
-            Log.d("Animation", "stop");
-            mEndDrawable.show();
-        }
-
-    }
-
     private void cancel() {
 
     }

app/src/main/java/com/flod/hardloadingbutton/MainActivity.java

@@ -5,6 +5,7 @@
 
 import androidx.appcompat.app.AppCompatActivity;
 
+import com.flod.loadingbutton.DrawableTextView;
 import com.flod.loadingbutton.LoadingButton;
 
 public class MainActivity extends AppCompatActivity {
@@ -23,7 +24,7 @@ public void onClick(View v) {
                 if (!mBoolean) {
                     view.start();
                 } else
-                    view.stop();
+                    view.end();
 
             }
         });
@@ -40,7 +41,8 @@ public void onLoadingEnd() {
             }
 
         });
-/*
+
+        /*
         final DrawableTextView view1 = findViewById(R.id.test3);
         view1.setOnClickListener(new View.OnClickListener() {
             @Override