From db34b049fd62567685c3c34f8fc9df57143a67e6 Mon Sep 17 00:00:00 2001
From: NekoInverter <7741672-NekoInverter@users.noreply.gitlab.com>
Date: Sat, 9 Jan 2021 17:43:48 +0800
Subject: [PATCH] Fix drawable animation

---
 .../java/com/hippo/drawable/AddDeleteDrawable.java     |  1 +
 .../java/com/hippo/drawable/DrawerArrowDrawable.java   | 10 ++++------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/hippo/drawable/AddDeleteDrawable.java b/app/src/main/java/com/hippo/drawable/AddDeleteDrawable.java
index eb0169e98..f511ff43b 100644
--- a/app/src/main/java/com/hippo/drawable/AddDeleteDrawable.java
+++ b/app/src/main/java/com/hippo/drawable/AddDeleteDrawable.java
@@ -119,6 +119,7 @@ public class AddDeleteDrawable extends Drawable {
         mAutoUpdateMirror = autoUpdateMirror;
     }
 
+    @Keep
     public float getProgress() {
         return mProgress;
     }
diff --git a/app/src/main/java/com/hippo/drawable/DrawerArrowDrawable.java b/app/src/main/java/com/hippo/drawable/DrawerArrowDrawable.java
index 7d78ac74b..51ea44eb1 100644
--- a/app/src/main/java/com/hippo/drawable/DrawerArrowDrawable.java
+++ b/app/src/main/java/com/hippo/drawable/DrawerArrowDrawable.java
@@ -26,9 +26,9 @@ import android.graphics.Path;
 import android.graphics.PixelFormat;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
-import android.os.Build;
 
 import androidx.annotation.ColorInt;
+import androidx.annotation.Keep;
 
 import com.hippo.ehviewer.R;
 import com.hippo.yorozuya.MathUtils;
@@ -175,12 +175,12 @@ public class DrawerArrowDrawable extends Drawable {
         return PixelFormat.TRANSLUCENT;
     }
 
-    @SuppressWarnings("unused")
+    @Keep
     public float getProgress() {
         return mProgress;
     }
 
-    @SuppressWarnings("unused")
+    @Keep
     public void setProgress(float progress) {
         if (progress == 1f) {
             setVerticalMirror(true);
@@ -207,9 +207,7 @@ public class DrawerArrowDrawable extends Drawable {
             } else {
                 ObjectAnimator oa = ObjectAnimator.ofFloat(this, "progress", endProgress);
                 oa.setDuration(duration);
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
-                    oa.setAutoCancel(true);
-                }
+                oa.setAutoCancel(true);
                 oa.start();
             }
         }