From 2f3f3d6480bc8c61723d700ffadd157fb642e65d Mon Sep 17 00:00:00 2001 From: tarsin Date: Thu, 26 May 2022 22:23:00 +0800 Subject: [PATCH] Drawable color fix --- .../main/java/com/hippo/drawable/AddDeleteDrawable.java | 9 ++++----- .../java/com/hippo/drawable/DrawerArrowDrawable.java | 4 ++++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/hippo/drawable/AddDeleteDrawable.java b/app/src/main/java/com/hippo/drawable/AddDeleteDrawable.java index d37f782c9..ccdf34190 100644 --- a/app/src/main/java/com/hippo/drawable/AddDeleteDrawable.java +++ b/app/src/main/java/com/hippo/drawable/AddDeleteDrawable.java @@ -20,6 +20,7 @@ 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; @@ -30,6 +31,7 @@ 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 { @@ -53,6 +55,8 @@ 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); @@ -82,11 +86,6 @@ 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 dbf1fa233..5c1420436 100644 --- a/app/src/main/java/com/hippo/drawable/DrawerArrowDrawable.java +++ b/app/src/main/java/com/hippo/drawable/DrawerArrowDrawable.java @@ -20,6 +20,7 @@ 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,6 +32,7 @@ import androidx.annotation.ColorInt; import androidx.annotation.Keep; import com.hippo.ehviewer.R; +import com.hippo.ehviewer.ui.EhActivity; import com.hippo.yorozuya.MathUtils; /** @@ -82,6 +84,8 @@ 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);