Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-28 03:46:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "About widget color filters"

Browse Source 
This reverts commit 6a92c6234b.
This commit is contained in:
M66B
2022-03-05 14:16:59 +01:00
parent 6a92c6234b
commit d937d4edfd
5 changed files with 20 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/java/eu/faircode/email/WidgetSync.java
View File

@@ -26,10 +26,7 @@ import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.drawable.Drawable;
import android.widget.RemoteViews;
import androidx.core.graphics.ColorUtils;
@@ -58,16 +55,15 @@ public class WidgetSync extends AppWidgetProvider {
RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.widget_sync);
views.setOnClickPendingIntent(R.id.ivSync, pi);
views.setImageViewResource(R.id.ivSync, enabled ? R.drawable.twotone_sync_24 : R.drawable.twotone_sync_disabled_24);
int fg;
int colorWidgetForeground = context.getResources().getColor(R.color.colorWidgetForeground);
if (background == Color.TRANSPARENT) {
if (semi)
views.setInt(R.id.background, "setBackgroundResource", R.drawable.widget_background);
else
views.setInt(R.id.background, "setBackgroundColor", background);
fg = colorWidgetForeground;
views.setInt(R.id.ivSync, "setColorFilter",
context.getResources().getColor(R.color.colorWidgetForeground));
} else {
float lum = (float) ColorUtils.calculateLuminance(background);
@@ -76,22 +72,10 @@ public class WidgetSync extends AppWidgetProvider {
views.setInt(R.id.background, "setBackgroundColor", background);
fg = (lum > 0.7f ? Color.BLACK : colorWidgetForeground);
if (lum > 0.7f)
views.setInt(R.id.ivSync, "setColorFilter", Color.BLACK);
}
int resid = (enabled ? R.drawable.twotone_sync_24 : R.drawable.twotone_sync_disabled_24);
Drawable d = context.getDrawable(resid);
d.mutate();
d.setTint(fg);
Bitmap bm = Bitmap.createBitmap(d.getIntrinsicWidth(), d.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);
Canvas canvas = new Canvas(bm);
d.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
d.draw(canvas);
views.setImageViewBitmap(R.id.ivSync, bm);
int dp6 = Helper.dp2pixels(context, 6);
views.setViewPadding(R.id.content, dp6, dp6, dp6, dp6);