fix with addAnimation

Author: HarlonWang

app/src/main/java/com/wang/avi/sample/MainActivity.java

@@ -2,6 +2,7 @@
 
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.view.View;
 
 
 public class MainActivity extends AppCompatActivity {
@@ -14,4 +15,15 @@ protected void onCreate(Bundle savedInstanceState) {
     }
 
 
+/*    public void visible(View view) {
+        findViewById(R.id.testView).setVisibility(View.VISIBLE);
+    }
+
+    public void gone(View view) {
+        findViewById(R.id.testView).setVisibility(View.GONE);
+    }
+
+    public void invisible(View view) {
+        findViewById(R.id.testView).setVisibility(View.INVISIBLE);
+    }*/
 }

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

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:background="#FFE75764"
+              xmlns:app="http://schemas.android.com/apk/res-auto"
+              android:layout_height="match_parent">
+
+    <com.wang.avi.AVLoadingIndicatorView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:indicator="BallPulse"
+        android:id="@+id/testView"
+        />
+
+    <Button
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Visible"
+        android:onClick="visible"
+        />
+
+    <Button
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="GONE"
+        android:onClick="gone"
+        />
+
+    <Button
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Invisible"
+        android:onClick="invisible"
+        />
+
+
+</LinearLayout>

library/src/main/java/com/wang/avi/AVLoadingIndicatorView.java

@@ -315,6 +315,25 @@ protected void onLayout(boolean changed, int left, int top, int right, int botto
         }
     }
 
+    @Override
+    public void setVisibility(int v) {
+        if (getVisibility() != v) {
+            super.setVisibility(v);
+            if (v == GONE || v == INVISIBLE) {
+                mIndicatorController.setAnimationStatus(BaseIndicatorController.AnimStatus.END);
+            } else {
+                mIndicatorController.setAnimationStatus(BaseIndicatorController.AnimStatus.START);
+            }
+        }
+    }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        mIndicatorController.setAnimationStatus(BaseIndicatorController.AnimStatus.CANCEL);
+    }
+
+
     void drawIndicator(Canvas canvas){
         mIndicatorController.draw(canvas,mPaint);
     }

library/src/main/java/com/wang/avi/indicator/BallBeatIndicator.java

@@ -52,6 +52,7 @@ public void createAnimation() {
                 @Override
                 public void onAnimationUpdate(ValueAnimator animation) {
                     scaleFloats[index] = (float) animation.getAnimatedValue();
+                    System.out.println("scaleFloats="+scaleFloats[index]);
                     postInvalidate();
                 }
             });
@@ -69,6 +70,7 @@ public void onAnimationUpdate(ValueAnimator animation) {
                 }
             });
             alphaAnim.start();
+            addAnimation(scaleAnim, alphaAnim);
         }
     }
 

library/src/main/java/com/wang/avi/indicator/BallClipRotateIndicator.java

@@ -53,6 +53,7 @@ public void onAnimationUpdate(ValueAnimator animation) {
             }
         });
         rotateAnim.start();
+        addAnimation(scaleAnim,rotateAnim);
     }
 
 }

library/src/main/java/com/wang/avi/indicator/BallClipRotateMultipleIndicator.java

@@ -73,6 +73,7 @@ public void onAnimationUpdate(ValueAnimator animation) {
             }
         });
         rotateAnim.start();
+        addAnimation(scaleAnim,rotateAnim);
     }
 
 }

library/src/main/java/com/wang/avi/indicator/BallClipRotatePulseIndicator.java

@@ -81,6 +81,7 @@ public void onAnimationUpdate(ValueAnimator animation) {
             }
         });
         rotateAnim.start();
+        addAnimation(scaleAnim,scaleAnim2,rotateAnim);
     }
 
 }

library/src/main/java/com/wang/avi/indicator/BallGridBeatIndicator.java

@@ -61,6 +61,7 @@ public void onAnimationUpdate(ValueAnimator animation) {
                 }
             });
             alphaAnim.start();
+            addAnimation(alphaAnim);
         }
     }
 

library/src/main/java/com/wang/avi/indicator/BallGridPulseIndicator.java

@@ -89,6 +89,7 @@ public void onAnimationUpdate(ValueAnimator animation) {
                 }
             });
             alphaAnim.start();
+            addAnimation(scaleAnim,alphaAnim);
         }
     }
 

library/src/main/java/com/wang/avi/indicator/BallPulseIndicator.java

@@ -51,11 +51,13 @@ public void createAnimation() {
                 @Override
                 public void onAnimationUpdate(ValueAnimator animation) {
                     scaleFloats[index] = (float) animation.getAnimatedValue();
+                    System.out.println("scaleFloats="+scaleFloats[index]);
                     postInvalidate();
 
                 }
             });
             scaleAnim.start();
+            addAnimation(scaleAnim);
         }
     }
 

library/src/main/java/com/wang/avi/indicator/BallPulseRiseIndicator.java

@@ -31,5 +31,6 @@ public void createAnimation() {
         animator.setRepeatCount(-1);
         animator.setDuration(1500);
         animator.start();
+        addAnimation(animator);
     }
 }

library/src/main/java/com/wang/avi/indicator/BallPulseSyncIndicator.java

@@ -45,6 +45,7 @@ public void onAnimationUpdate(ValueAnimator animation) {
                 }
             });
             scaleAnim.start();
+            addAnimation(scaleAnim);
         }
     }
 

library/src/main/java/com/wang/avi/indicator/BallRotateIndicator.java

@@ -57,6 +57,7 @@ public void onAnimationUpdate(ValueAnimator animation) {
         rotateAnim.setRepeatCount(-1);
         rotateAnim.start();
 
+        addAnimation(scaleAnim,rotateAnim);
     }
 
 

library/src/main/java/com/wang/avi/indicator/BallScaleIndicator.java

@@ -50,6 +50,7 @@ public void onAnimationUpdate(ValueAnimator animation) {
             }
         });
         alphaAnim.start();
+        addAnimation(scaleAnim,alphaAnim);
     }
 
 

library/src/main/java/com/wang/avi/indicator/BallScaleMultipleIndicator.java

@@ -56,6 +56,8 @@ public void onAnimationUpdate(ValueAnimator animation) {
             });
             scaleAnim.setStartDelay(delays[i]);
             alphaAnim.start();
+
+            addAnimation(scaleAnim,alphaAnim);
         }
     }
 

library/src/main/java/com/wang/avi/indicator/BallScaleRippleIndicator.java

@@ -46,6 +46,8 @@ public void onAnimationUpdate(ValueAnimator animation) {
             }
         });
         alphaAnim.start();
+
+        addAnimation(scaleAnim,alphaAnim);
     }
 
 }

library/src/main/java/com/wang/avi/indicator/BallScaleRippleMultipleIndicator.java

@@ -51,6 +51,8 @@ public void onAnimationUpdate(ValueAnimator animation) {
             });
             scaleAnim.setStartDelay(delays[i]);
             alphaAnim.start();
+
+            addAnimation(scaleAnim,alphaAnim);
         }
     }
 

library/src/main/java/com/wang/avi/indicator/BallSpinFadeLoaderIndicator.java

@@ -92,6 +92,7 @@ public void onAnimationUpdate(ValueAnimator animation) {
                 }
             });
             alphaAnim.start();
+            addAnimation(scaleAnim,alphaAnim);
         }
     }
 

library/src/main/java/com/wang/avi/indicator/BallTrianglePathIndicator.java

@@ -67,6 +67,8 @@ public void onAnimationUpdate(ValueAnimator animation) {
                 }
             });
             translateYAnim.start();
+
+            addAnimation(translateXAnim,translateYAnim);
         }
     }
 

library/src/main/java/com/wang/avi/indicator/BallZigZagDeflectIndicator.java

@@ -51,6 +51,8 @@ public void onAnimationUpdate(ValueAnimator animation) {
                 }
             });
             translateYAnim.start();
+
+            addAnimation(translateXAnim,translateYAnim);
         }
     }
 

library/src/main/java/com/wang/avi/indicator/BallZigZagIndicator.java

@@ -62,6 +62,7 @@ public void onAnimationUpdate(ValueAnimator animation) {
                 }
             });
             translateYAnim.start();
+            addAnimation(translateXAnim,translateYAnim);
         }
     }
 

library/src/main/java/com/wang/avi/indicator/BaseIndicatorController.java

@@ -2,15 +2,24 @@
 
 import android.graphics.Canvas;
 import android.graphics.Paint;
+import android.util.Log;
 import android.view.View;
 
+import com.nineoldandroids.animation.Animator;
+
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Created by Jack on 2015/10/15.
  */
 public abstract class BaseIndicatorController {
 
+
     private View mTarget;
 
+    private List<Animator> mAnimators;
+
 
     public void setTarget(View target){
         this.mTarget=target;
@@ -47,5 +56,63 @@ public void postInvalidate(){
      */
     public abstract void createAnimation();
 
+    /**
+     * should be called when you create animation.
+     * To make animation release better.
+     * @see #setAnimationStatus(AnimStatus)
+     * @param animator
+     */
+    public void addAnimation(Animator... animator){
+        if (mAnimators==null){
+            mAnimators=new ArrayList<>();
+        }
+        int length=animator.length;
+        for (int i = 0; i < length; i++) {
+            mAnimators.add(animator[i]);
+        }
+    }
+
+
+    /**
+     * make animation to start or end when target
+     * view was be Visible or Gone or Invisible.
+     * make animation to cancel when target view
+     * be onDetachedFromWindow.
+     * @param animStatus
+     */
+    public void setAnimationStatus(AnimStatus animStatus){
+        if (mAnimators==null){
+            return;
+        }
+        Log.d("AnimStatus","setAnimationStatus");
+        int count=mAnimators.size();
+        for (int i = 0; i < count; i++) {
+            Animator animator=mAnimators.get(i);
+            switch (animStatus){
+                case START:
+                    if (!animator.isRunning()){
+                        animator.start();
+                    }
+                    break;
+                case END:
+                    if (animator.isRunning()){
+                        animator.end();
+                    }
+                    break;
+                case CANCEL:
+                    if (animator.isRunning()){
+                        animator.cancel();
+                    }
+                    break;
+            }
+        }
+    }
+
+
+    public enum AnimStatus{
+        START,END,CANCEL
+    }
+
+
 
 }

library/src/main/java/com/wang/avi/indicator/CubeTransitionIndicator.java

@@ -68,6 +68,8 @@ public void onAnimationUpdate(ValueAnimator animation) {
                 }
             });
             translationYAnim.start();
+
+            addAnimation(translationXAnim,translationYAnim);
         }
 
         ValueAnimator scaleAnim=ValueAnimator.ofFloat(1,0.5f,1,0.5f,1);
@@ -95,5 +97,7 @@ public void onAnimationUpdate(ValueAnimator animation) {
             }
         });
         rotateAnim.start();
+
+        addAnimation(scaleAnim,rotateAnim);
     }
 }

library/src/main/java/com/wang/avi/indicator/LineScaleIndicator.java

@@ -50,6 +50,7 @@ public void onAnimationUpdate(ValueAnimator animation) {
                 }
             });
             scaleAnim.start();
+            addAnimation(scaleAnim);
         }
     }
 

library/src/main/java/com/wang/avi/indicator/LineScalePartyIndicator.java

@@ -51,6 +51,7 @@ public void onAnimationUpdate(ValueAnimator animation) {
                 }
             });
             scaleAnim.start();
+            addAnimation(scaleAnim);
         }
     }
 

library/src/main/java/com/wang/avi/indicator/LineScalePulseOutIndicator.java

@@ -26,6 +26,7 @@ public void onAnimationUpdate(ValueAnimator animation) {
                 }
             });
             scaleAnim.start();
+            addAnimation(scaleAnim);
         }
     }
 

library/src/main/java/com/wang/avi/indicator/LineScalePulseOutRapidIndicator.java

@@ -25,6 +25,7 @@ public void onAnimationUpdate(ValueAnimator animation) {
                 }
             });
             scaleAnim.start();
+            addAnimation(scaleAnim);
         }
     }
 

library/src/main/java/com/wang/avi/indicator/PacmanIndicator.java

@@ -105,5 +105,7 @@ public void onAnimationUpdate(ValueAnimator animation) {
             }
         });
         rotateAnim2.start();
+
+        addAnimation(translationAnim,alphaAnim,rotateAnim1,rotateAnim2);
     }
 }