diff --git a/app/src/main/java/eu/faircode/email/Widget.java b/app/src/main/java/eu/faircode/email/Widget.java
index 8af9463c5c..db248691d7 100644
--- a/app/src/main/java/eu/faircode/email/Widget.java
+++ b/app/src/main/java/eu/faircode/email/Widget.java
@@ -115,9 +115,10 @@ public class Widget extends AppWidgetProvider {
views.setOnClickPendingIntent(R.id.background, pi);
- // Set background
if (!daynight && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
views.setColorStateListAttr(R.id.background, "setBackgroundTintList", 0);
+
+ // Set background
if (daynight && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
views.setInt(R.id.background, "setBackgroundColor", Color.WHITE);
views.setColorStateListAttr(R.id.background, "setBackgroundTintList", android.R.attr.colorBackground);
@@ -132,25 +133,14 @@ public class Widget extends AppWidgetProvider {
views.setInt(R.id.background, "setBackgroundColor", background);
// Set image
- if (daynight && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
- if (layout == 1)
- views.setImageViewResource(R.id.ivMessage, unseen == 0
- ? R.drawable.baseline_mail_outline_widget_24_dn
- : R.drawable.baseline_mail_widget_24_dn);
- else
- views.setImageViewResource(R.id.ivMessage, unseen == 0
- ? R.drawable.twotone_mail_outline_24_dn
- : R.drawable.baseline_mail_24_dn);
- } else {
- if (layout == 1)
- views.setImageViewResource(R.id.ivMessage, unseen == 0
- ? R.drawable.baseline_mail_outline_widget_24
- : R.drawable.baseline_mail_widget_24);
- else
- views.setImageViewResource(R.id.ivMessage, unseen == 0
- ? R.drawable.twotone_mail_outline_24
- : R.drawable.baseline_mail_24);
- }
+ if (layout == 1)
+ views.setImageViewResource(R.id.ivMessage, unseen == 0
+ ? R.drawable.baseline_mail_outline_widget_24
+ : R.drawable.baseline_mail_widget_24);
+ else
+ views.setImageViewResource(R.id.ivMessage, unseen == 0
+ ? R.drawable.twotone_mail_outline_24
+ : R.drawable.baseline_mail_24);
// Set color
if (daynight && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
diff --git a/app/src/main/java/eu/faircode/email/WidgetSync.java b/app/src/main/java/eu/faircode/email/WidgetSync.java
index fee4222861..56430cff10 100644
--- a/app/src/main/java/eu/faircode/email/WidgetSync.java
+++ b/app/src/main/java/eu/faircode/email/WidgetSync.java
@@ -61,11 +61,10 @@ public class WidgetSync extends AppWidgetProvider {
RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.widget_sync);
views.setOnClickPendingIntent(R.id.ivSync, pi);
- if (!daynight && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+ views.setImageViewResource(R.id.ivSync, enabled ? R.drawable.twotone_sync_24 : R.drawable.twotone_sync_disabled_24);
+
+ if (!daynight && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
views.setColorStateListAttr(R.id.background, "setBackgroundTintList", 0);
- views.setImageViewResource(R.id.ivSync, enabled ? R.drawable.twotone_sync_24 : R.drawable.twotone_sync_disabled_24);
- } else
- views.setImageViewResource(R.id.ivSync, enabled ? R.drawable.twotone_sync_24_dn : R.drawable.twotone_sync_disabled_24_dn);
if (daynight && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
views.setInt(R.id.background, "setBackgroundColor", Color.WHITE);
diff --git a/app/src/main/java/eu/faircode/email/WidgetUnified.java b/app/src/main/java/eu/faircode/email/WidgetUnified.java
index 53072e80fb..e8a6a0437c 100644
--- a/app/src/main/java/eu/faircode/email/WidgetUnified.java
+++ b/app/src/main/java/eu/faircode/email/WidgetUnified.java
@@ -133,6 +133,9 @@ public class WidgetUnified extends AppWidgetProvider {
views.setPendingIntentTemplate(R.id.lv, piItem);
boolean syncing = prefs.getBoolean("widget." + appWidgetId + ".syncing", false);
+ views.setImageViewResource(R.id.refresh, syncing
+ ? R.drawable.twotone_compare_arrows_24
+ : R.drawable.twotone_sync_24);
// https://developer.android.com/guide/topics/ui/look-and-feel/darktheme
if (!daynight && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
@@ -146,10 +149,8 @@ public class WidgetUnified extends AppWidgetProvider {
views.setColorStateListAttr(R.id.title, "setTextColor", android.R.attr.textColorPrimary);
views.setInt(R.id.separator, "setBackgroundColor", Color.WHITE);
views.setColorStateListAttr(R.id.separator, "setBackgroundTintList", android.R.attr.colorControlNormal);
- views.setImageViewResource(R.id.refresh, syncing
- ? R.drawable.twotone_compare_arrows_24_dn
- : R.drawable.twotone_sync_24_dn);
- views.setImageViewResource(R.id.compose, R.drawable.twotone_edit_24_dn);
+ views.setColorAttr(R.id.refresh, "setColorFilter", android.R.attr.textColorPrimary);
+ views.setColorAttr(R.id.compose, "setColorFilter", android.R.attr.textColorPrimary);
} else if (background == Color.TRANSPARENT) {
if (semi)
views.setInt(R.id.background, "setBackgroundResource", R.drawable.widget_background);
@@ -158,10 +159,8 @@ public class WidgetUnified extends AppWidgetProvider {
views.setTextColor(R.id.title, colorWidgetForeground);
views.setInt(R.id.separator, "setBackgroundColor", lightColorSeparator);
- views.setImageViewResource(R.id.refresh, syncing
- ? R.drawable.twotone_compare_arrows_24_white
- : R.drawable.twotone_sync_24_white);
- views.setImageViewResource(R.id.compose, R.drawable.twotone_edit_24_white);
+ views.setInt(R.id.refresh, "setColorFilter", colorWidgetForeground);
+ views.setInt(R.id.compose, "setColorFilter", colorWidgetForeground);
} else {
float lum = (float) ColorUtils.calculateLuminance(background);
@@ -174,17 +173,8 @@ public class WidgetUnified extends AppWidgetProvider {
views.setTextColor(R.id.title, fg);
views.setInt(R.id.separator, "setBackgroundColor",
lum > 0.7f ? darkColorSeparator : lightColorSeparator);
- if (syncing)
- views.setImageViewResource(R.id.refresh, lum > 0.7f
- ? R.drawable.twotone_compare_arrows_24_black
- : R.drawable.twotone_compare_arrows_24_white);
- else
- views.setImageViewResource(R.id.refresh, lum > 0.7f
- ? R.drawable.twotone_sync_24_black
- : R.drawable.twotone_sync_24_white);
- views.setImageViewResource(R.id.compose, lum > 0.7f
- ? R.drawable.twotone_edit_24_black
- : R.drawable.twotone_edit_24_white);
+ views.setInt(R.id.refresh, "setColorFilter", fg);
+ views.setInt(R.id.compose, "setColorFilter", fg);
}
views.setViewVisibility(R.id.separator, separators ? View.VISIBLE : View.GONE);
diff --git a/app/src/main/res/drawable/baseline_mail_24_dn.xml b/app/src/main/res/drawable/baseline_mail_24_dn.xml
deleted file mode 100644
index 5a02faca2b..0000000000
--- a/app/src/main/res/drawable/baseline_mail_24_dn.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/baseline_mail_outline_widget_24_dn.xml b/app/src/main/res/drawable/baseline_mail_outline_widget_24_dn.xml
deleted file mode 100644
index 1939e504b0..0000000000
--- a/app/src/main/res/drawable/baseline_mail_outline_widget_24_dn.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
diff --git a/app/src/main/res/drawable/baseline_mail_widget_24_dn.xml b/app/src/main/res/drawable/baseline_mail_widget_24_dn.xml
deleted file mode 100644
index 53e78064e8..0000000000
--- a/app/src/main/res/drawable/baseline_mail_widget_24_dn.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/twotone_compare_arrows_24_black.xml b/app/src/main/res/drawable/twotone_compare_arrows_24_black.xml
deleted file mode 100644
index 7e563961e9..0000000000
--- a/app/src/main/res/drawable/twotone_compare_arrows_24_black.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/twotone_compare_arrows_24_dn.xml b/app/src/main/res/drawable/twotone_compare_arrows_24_dn.xml
deleted file mode 100644
index 2cc97cdaad..0000000000
--- a/app/src/main/res/drawable/twotone_compare_arrows_24_dn.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/twotone_compare_arrows_24_white.xml b/app/src/main/res/drawable/twotone_compare_arrows_24_white.xml
deleted file mode 100644
index e51086da72..0000000000
--- a/app/src/main/res/drawable/twotone_compare_arrows_24_white.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/twotone_edit_24_black.xml b/app/src/main/res/drawable/twotone_edit_24_black.xml
deleted file mode 100644
index f668feaf7f..0000000000
--- a/app/src/main/res/drawable/twotone_edit_24_black.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
diff --git a/app/src/main/res/drawable/twotone_edit_24_dn.xml b/app/src/main/res/drawable/twotone_edit_24_dn.xml
deleted file mode 100644
index 738180298c..0000000000
--- a/app/src/main/res/drawable/twotone_edit_24_dn.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
diff --git a/app/src/main/res/drawable/twotone_edit_24_white.xml b/app/src/main/res/drawable/twotone_edit_24_white.xml
deleted file mode 100644
index 679dc780d9..0000000000
--- a/app/src/main/res/drawable/twotone_edit_24_white.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
diff --git a/app/src/main/res/drawable/twotone_mail_outline_24_dn.xml b/app/src/main/res/drawable/twotone_mail_outline_24_dn.xml
deleted file mode 100644
index ba30735732..0000000000
--- a/app/src/main/res/drawable/twotone_mail_outline_24_dn.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/twotone_sync_24_black.xml b/app/src/main/res/drawable/twotone_sync_24_black.xml
deleted file mode 100644
index 0175248dcb..0000000000
--- a/app/src/main/res/drawable/twotone_sync_24_black.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/twotone_sync_24_dn.xml b/app/src/main/res/drawable/twotone_sync_24_dn.xml
deleted file mode 100644
index e75984018a..0000000000
--- a/app/src/main/res/drawable/twotone_sync_24_dn.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/twotone_sync_24_white.xml b/app/src/main/res/drawable/twotone_sync_24_white.xml
deleted file mode 100644
index b926b26636..0000000000
--- a/app/src/main/res/drawable/twotone_sync_24_white.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/twotone_sync_disabled_24_dn.xml b/app/src/main/res/drawable/twotone_sync_disabled_24_dn.xml
deleted file mode 100644
index 75988dee49..0000000000
--- a/app/src/main/res/drawable/twotone_sync_disabled_24_dn.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-