diff --git a/app/src/main/java/com/hippo/drawable/AddDeleteDrawable.java b/app/src/main/java/com/hippo/drawable/AddDeleteDrawable.java index ccdf34190..d37f782c9 100644 --- a/app/src/main/java/com/hippo/drawable/AddDeleteDrawable.java +++ b/app/src/main/java/com/hippo/drawable/AddDeleteDrawable.java @@ -20,7 +20,6 @@ import android.animation.ObjectAnimator; import android.content.Context; import android.content.res.Resources; import android.graphics.Canvas; -import android.graphics.Color; import android.graphics.ColorFilter; import android.graphics.Paint; import android.graphics.Path; @@ -31,7 +30,6 @@ import android.graphics.drawable.Drawable; import androidx.annotation.Keep; import com.hippo.ehviewer.R; -import com.hippo.ehviewer.ui.EhActivity; import com.hippo.yorozuya.MathUtils; public class AddDeleteDrawable extends Drawable { @@ -55,8 +53,6 @@ public class AddDeleteDrawable extends Drawable { mSize = resources.getDimensionPixelSize(R.dimen.add_size); float barThickness = Math.round(resources.getDimension(R.dimen.add_thickness)); - int colorID = EhActivity.isNightMode(context.getResources().getConfiguration()) ? Color.WHITE : Color.BLACK; - mPaint.setColor(colorID); mPaint.setStyle(Paint.Style.STROKE); mPaint.setStrokeJoin(Paint.Join.MITER); mPaint.setStrokeCap(Paint.Cap.BUTT); @@ -86,6 +82,11 @@ public class AddDeleteDrawable extends Drawable { canvas.restore(); } + public void setColor(int color) { + mPaint.setColor(color); + invalidateSelf(); + } + @Override public void setAlpha(int alpha) { mPaint.setAlpha(alpha); diff --git a/app/src/main/java/com/hippo/drawable/DrawerArrowDrawable.java b/app/src/main/java/com/hippo/drawable/DrawerArrowDrawable.java index 5c1420436..dbf1fa233 100644 --- a/app/src/main/java/com/hippo/drawable/DrawerArrowDrawable.java +++ b/app/src/main/java/com/hippo/drawable/DrawerArrowDrawable.java @@ -20,7 +20,6 @@ import android.animation.ObjectAnimator; import android.content.Context; import android.content.res.Resources; import android.graphics.Canvas; -import android.graphics.Color; import android.graphics.ColorFilter; import android.graphics.Paint; import android.graphics.Path; @@ -32,7 +31,6 @@ import androidx.annotation.ColorInt; import androidx.annotation.Keep; import com.hippo.ehviewer.R; -import com.hippo.ehviewer.ui.EhActivity; import com.hippo.yorozuya.MathUtils; /** @@ -84,8 +82,6 @@ public class DrawerArrowDrawable extends Drawable { mSpin = resources.getBoolean(R.bool.dad_spin_bars); mMiddleArrowSize = resources.getDimension(R.dimen.dad_middle_bar_arrow_size); - int colorID = EhActivity.isNightMode(context.getResources().getConfiguration()) ? Color.WHITE : Color.BLACK; - mPaint.setColor(colorID); mPaint.setStyle(Paint.Style.STROKE); mPaint.setStrokeJoin(Paint.Join.MITER); mPaint.setStrokeCap(Paint.Cap.BUTT);