#8 #7 #6 #2 Support Exit Animations

wangpeiming110 · Feb 23, 2023 · 2c46e94 · 2c46e94
1 parent d620116
commit 2c46e94
Show file tree

Hide file tree

Showing 22 changed files with 614 additions and 407 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "com.wangpm.enteranimation"
         minSdkVersion 19
         targetSdkVersion 33
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "2.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -8,13 +8,17 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
+        <activity android:name=".MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity android:name=".AnimActivity"
+            >
+        </activity>
     </application>
 
 </manifest>
diff --git a/app/src/main/java/anim/Anim.java b/app/src/main/java/anim/Anim.java
@@ -1,7 +1,7 @@
 package anim;
 
 import android.graphics.Canvas;
-import android.view.View;
+import android.util.Log;
 
 import com.wangpm.enteranimation.EnterAnimLayout;
 
@@ -13,23 +13,28 @@ public abstract class Anim {
     protected float w;
     protected float h;
     public float totalPaintTime;//控制绘制时间
+    public boolean isExitAnim = false;
 
     public Anim(EnterAnimLayout view) {
         this(view,2000);
     }
 
     public Anim(EnterAnimLayout view, float totalPaintTime) {
+        this(view, totalPaintTime, false);
+    }
+
+    public Anim(EnterAnimLayout view, float totalPaintTime, boolean isExitAnim) {
         this.totalPaintTime = totalPaintTime;
         this.view = view;
         this.view.setAnim(this);
         w = view.getWidth();
         h = view.getHeight();
+        this.isExitAnim = isExitAnim;
     }
 
     public void startAnimation() {
-        view.setmIsAnimaionRun(true);
+        view.setIsAnimationRun(true);
         view.setStartTime(System.currentTimeMillis());
-
         view.invalidate();
     }
     public void startAnimation(long animTime) {

diff --git a/app/src/main/java/anim/AnimBaiYeChuang.java b/app/src/main/java/anim/AnimBaiYeChuang.java
@@ -28,7 +28,11 @@ public void handleCanvas(Canvas canvas, float rate) {
             float bottom = top + h / lines * rate;
             path.addRect(0, top, w, bottom, Path.Direction.CW);
         }
-        canvas.clipPath(path);
+        if(isExitAnim) {
+            canvas.clipPath(path, Region.Op.DIFFERENCE);
+        }else{
+            canvas.clipPath(path);
+        }
         canvas.save();
     }
 }
diff --git a/app/src/main/java/anim/AnimCaChu.java b/app/src/main/java/anim/AnimCaChu.java
@@ -1,6 +1,7 @@
 package anim;
 
 import android.graphics.Canvas;
+import android.graphics.Region;
 import android.view.View;
 
 import com.wangpm.enteranimation.EnterAnimLayout;
@@ -18,8 +19,11 @@ public AnimCaChu(EnterAnimLayout view) {
     public void handleCanvas(Canvas canvas, float rate) {
         float rectTop =  (h - h * rate);
         //剪切当前需要展示区域的左上右下
-        canvas.clipRect(0, rectTop, w, h);
-
+        if(isExitAnim) {
+            canvas.clipRect(0, rectTop, w, h, Region.Op.DIFFERENCE);
+        }else{
+            canvas.clipRect(0, rectTop, w, h);
+        }
         canvas.save();
     }
 }
diff --git a/app/src/main/java/anim/AnimHeZhuang.java b/app/src/main/java/anim/AnimHeZhuang.java
@@ -24,8 +24,11 @@ public void handleCanvas(Canvas canvas, float rate) {
         float rectBottom = h - rectTop;
 
         //剪切需要展示的区域
-        canvas.clipRect(rectLeft, rectTop,rectRight , rectBottom, Region.Op.DIFFERENCE);
-
+        if(isExitAnim) {
+            canvas.clipRect(rectLeft, rectTop,rectRight , rectBottom);
+        }else{
+            canvas.clipRect(rectLeft, rectTop,rectRight , rectBottom, Region.Op.DIFFERENCE);
+        }
         canvas.save();
     }
 }
diff --git a/app/src/main/java/anim/AnimJieTi.java b/app/src/main/java/anim/AnimJieTi.java
@@ -44,8 +44,11 @@ public void handleCanvas(Canvas canvas, float rate) {
             float bottom = top + h / lineNum;
             path.addRect(left,top,right,bottom, Path.Direction.CW);
         }
-        canvas.clipPath(path);
-
+        if(isExitAnim) {
+            canvas.clipPath(path, Region.Op.DIFFERENCE);
+        }else{
+            canvas.clipPath(path);
+        }
         canvas.save();
     }
 }
diff --git a/app/src/main/java/anim/AnimLingXing.java b/app/src/main/java/anim/AnimLingXing.java
@@ -26,8 +26,11 @@ public void handleCanvas(Canvas canvas, float rate) {
         path1.lineTo(w/2, h+h/2 - h*rate);
         path1.lineTo(w+w/2 -w*rate, h/2);
         path1.close();//封闭
-        canvas.clipPath(path1, Region.Op.DIFFERENCE);
-
+        if(isExitAnim) {
+            canvas.clipPath(path1);
+        }else{
+            canvas.clipPath(path1, Region.Op.DIFFERENCE);
+        }
         canvas.save();
     }
 }
diff --git a/app/src/main/java/anim/AnimLunZi.java b/app/src/main/java/anim/AnimLunZi.java
@@ -27,8 +27,11 @@ public void handleCanvas(Canvas canvas, float rate) {
         path1.addArc(oval,270,360*rate);
         path1.lineTo(w/2,h/2);
         path1.close();//封闭
-        canvas.clipPath(path1);
-
+        if(isExitAnim) {
+            canvas.clipPath(path1, Region.Op.DIFFERENCE);
+        }else{
+            canvas.clipPath(path1);
+        }
         canvas.save();
     }
 }
diff --git a/app/src/main/java/anim/AnimPiLie.java b/app/src/main/java/anim/AnimPiLie.java
@@ -20,7 +20,11 @@ public AnimPiLie(EnterAnimLayout view) {
     public void handleCanvas(Canvas canvas, float rate) {
         float rectLeft = w / 2 * rate;
         float rectRight = w - w / 2 * rate;
-        canvas.clipRect(rectLeft, 0, rectRight, h, Region.Op.DIFFERENCE);
+        if(isExitAnim) {
+            canvas.clipRect(rectLeft, 0, rectRight, h);
+        }else{
+            canvas.clipRect(rectLeft, 0, rectRight, h, Region.Op.DIFFERENCE);
+        }
         canvas.save();
     }
 }
diff --git a/app/src/main/java/anim/AnimQiPan.java b/app/src/main/java/anim/AnimQiPan.java
@@ -35,7 +35,11 @@ public void handleCanvas(Canvas canvas, float rate) {
                 path.addRect(left, top,right,bottom, Path.Direction.CW);
             }
         }
-        canvas.clipPath(path);
+        if(isExitAnim) {
+            canvas.clipPath(path, Region.Op.DIFFERENCE);
+        }else{
+            canvas.clipPath(path);
+        }
         canvas.save();
     }
 }
diff --git a/app/src/main/java/anim/AnimQieRu.java b/app/src/main/java/anim/AnimQieRu.java
@@ -17,9 +17,11 @@ public AnimQieRu(EnterAnimLayout view) {
 
     @Override
     public void handleCanvas(Canvas canvas, float rate) {
-
-        canvas.translate(0,h-h*rate);
-
+        if(isExitAnim) {
+            canvas.translate(0,h*rate);
+        }else{
+            canvas.translate(0,h-h*rate);
+        }
         canvas.save();
     }
 }
diff --git a/app/src/main/java/anim/AnimShanXingZhanKai.java b/app/src/main/java/anim/AnimShanXingZhanKai.java
@@ -3,6 +3,7 @@
 import android.graphics.Canvas;
 import android.graphics.Path;
 import android.graphics.RectF;
+import android.graphics.Region;
 import android.view.View;
 
 import com.wangpm.enteranimation.EnterAnimLayout;
@@ -26,7 +27,11 @@ public void handleCanvas(Canvas canvas, float rate) {
         path1.addArc(oval,270-180*rate,360*rate);
         path1.lineTo(w/2,h/2);
         path1.close();//封闭
-        canvas.clipPath(path1);
+        if(isExitAnim) {
+            canvas.clipPath(path1, Region.Op.DIFFERENCE);
+        }else{
+            canvas.clipPath(path1);
+        }
 
         canvas.save();
     }

diff --git a/app/src/main/java/anim/AnimShiZiXingKuoZhan.java b/app/src/main/java/anim/AnimShiZiXingKuoZhan.java
@@ -26,9 +26,14 @@ public void handleCanvas(Canvas canvas, float rate) {
         float rectRight1 = w-rectLeft1;
         float rectTop1 = 0;
         float rectBottom1 = h;
-        canvas.clipRect(rectLeft, rectTop,rectRight , rectBottom, Region.Op.DIFFERENCE);
-        canvas.clipRect(rectLeft1, rectTop1,rectRight1 , rectBottom1, Region.Op.DIFFERENCE);
 
+        if(isExitAnim) {
+            canvas.clipRect(rectLeft, rectTop,rectRight , rectBottom);
+            canvas.clipRect(rectLeft1, rectTop1,rectRight1 , rectBottom1);
+        }else{
+            canvas.clipRect(rectLeft, rectTop,rectRight , rectBottom, Region.Op.DIFFERENCE);
+            canvas.clipRect(rectLeft1, rectTop1,rectRight1 , rectBottom1, Region.Op.DIFFERENCE);
+        }
         canvas.save();
     }
 }
diff --git a/app/src/main/java/anim/AnimSuiJiXianTiao.java b/app/src/main/java/anim/AnimSuiJiXianTiao.java
@@ -56,7 +56,11 @@ public void handleCanvas(Canvas canvas, float rate) {
 
         //剩余线条数量
         restNum = restNum - needNum;
-        canvas.clipPath(path);
+        if(isExitAnim) {
+            canvas.clipPath(path, Region.Op.DIFFERENCE);
+        }else{
+            canvas.clipPath(path);
+        }
         canvas.save();
     }
 

diff --git a/app/src/main/java/anim/AnimXiangNeiRongJie.java b/app/src/main/java/anim/AnimXiangNeiRongJie.java
@@ -61,7 +61,11 @@ public void handleCanvas(Canvas canvas, float rate) {
         }
 
         restNum = restNum - needNum;
-        canvas.clipPath(path);
+        if(isExitAnim) {
+            canvas.clipPath(path, Region.Op.DIFFERENCE);
+        }else{
+            canvas.clipPath(path);
+        }
         canvas.save();
     }
 

diff --git a/app/src/main/java/anim/AnimYuanXingKuoZhan.java b/app/src/main/java/anim/AnimYuanXingKuoZhan.java
@@ -28,7 +28,11 @@ public void handleCanvas(Canvas canvas, float rate) {
         path1.addOval(oval, Path.Direction.CCW);
 
         path1.close();//封闭
-        canvas.clipPath(path1, Region.Op.DIFFERENCE);
+        if(isExitAnim) {
+            canvas.clipPath(path1);
+        }else{
+            canvas.clipPath(path1, Region.Op.DIFFERENCE);
+        }
 
         canvas.save();
     }