yenru0/EhViewer
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Drawable color fix"

Browse Source 
This reverts commit 2f3f3d6480.
This commit is contained in:
tarsin committed 2022-05-27 00:26:35 +08:00
1 parent ac25b95eae
commit aa18e5f2f1
2 files changed
+5 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/java/com/hippo/drawable/AddDeleteDrawable.java
+5 -4
View File
@@ -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);
app/src/main/java/com/hippo/drawable/DrawerArrowDrawable.java
-4
View File
@@ -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);