From ba0809ba2db3c03e1149388ce2ca93e22a9f7c4d Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 5 Mar 2022 11:00:33 +0100
Subject: [PATCH] Revert widget changes

---
 app/src/main/java/eu/faircode/email/Widget.java  | 16 ++++++++--------
 ...idget_new_baseline_mail_outline_widget_24.xml | 14 --------------
 .../widget_new_baseline_mail_widget_24.xml       | 15 ---------------
 .../res/drawable/widget_old_baseline_mail_24.xml | 10 ----------
 .../widget_old_twotone_mail_outline_24.xml       | 10 ----------
 app/src/main/res/layout/widget.xml               |  3 ++-
 app/src/main/res/layout/widget_new.xml           |  3 ++-
 7 files changed, 12 insertions(+), 59 deletions(-)
 delete mode 100644 app/src/main/res/drawable/widget_new_baseline_mail_outline_widget_24.xml
 delete mode 100644 app/src/main/res/drawable/widget_new_baseline_mail_widget_24.xml
 delete mode 100644 app/src/main/res/drawable/widget_old_baseline_mail_24.xml
 delete mode 100644 app/src/main/res/drawable/widget_old_twotone_mail_outline_24.xml

diff --git a/app/src/main/java/eu/faircode/email/Widget.java b/app/src/main/java/eu/faircode/email/Widget.java
index 014c26be9e..9f65757676 100644
--- a/app/src/main/java/eu/faircode/email/Widget.java
+++ b/app/src/main/java/eu/faircode/email/Widget.java
@@ -114,12 +114,12 @@ public class Widget extends AppWidgetProvider {
 
                     if (layout == 1)
                         views.setImageViewResource(R.id.ivMessage, unseen == 0
-                                ? R.drawable.widget_new_baseline_mail_outline_widget_24
-                                : R.drawable.widget_new_baseline_mail_widget_24);
+                                ? R.drawable.baseline_mail_outline_widget_24
+                                : R.drawable.baseline_mail_widget_24);
                     else
                         views.setImageViewResource(R.id.ivMessage, unseen == 0
-                                ? R.drawable.widget_old_twotone_mail_outline_24
-                                : R.drawable.widget_old_baseline_mail_24);
+                                ? R.drawable.twotone_mail_outline_24
+                                : R.drawable.baseline_mail_24);
                     views.setTextViewText(R.id.tvCount, unseen < 100 ? nf.format(unseen) : "99+");
                     views.setViewVisibility(R.id.tvCount, layout == 1 && unseen == 0 ? View.GONE : View.VISIBLE);
 
@@ -134,10 +134,10 @@ public class Widget extends AppWidgetProvider {
                         else
                             views.setInt(android.R.id.background, "setBackgroundColor", background);
 
-                        //int colorWidgetForeground = context.getResources().getColor(R.color.colorWidgetForeground);
-                        //views.setInt(R.id.ivMessage, "setColorFilter", colorWidgetForeground);
-                        //views.setTextColor(R.id.tvCount, colorWidgetForeground);
-                        //views.setTextColor(R.id.tvAccount, colorWidgetForeground);
+                        int colorWidgetForeground = context.getResources().getColor(R.color.colorWidgetForeground);
+                        views.setInt(R.id.ivMessage, "setColorFilter", colorWidgetForeground);
+                        views.setTextColor(R.id.tvCount, colorWidgetForeground);
+                        views.setTextColor(R.id.tvAccount, colorWidgetForeground);
                     } else {
                         float lum = (float) ColorUtils.calculateLuminance(background);
 
diff --git a/app/src/main/res/drawable/widget_new_baseline_mail_outline_widget_24.xml b/app/src/main/res/drawable/widget_new_baseline_mail_outline_widget_24.xml
deleted file mode 100644
index b2e7adbec4..0000000000
--- a/app/src/main/res/drawable/widget_new_baseline_mail_outline_widget_24.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="16dp"
-    android:tint="@color/colorWidgetForeground"
-    android:viewportWidth="20.0"
-    android:viewportHeight="16.0">
-    <group
-        android:translateX="-2.0"
-        android:translateY="-4.0">
-        <path
-            android:fillColor="@android:color/white"
-            android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM20,18L4,18L4,8l8,5 8,-5v10zM12,11L4,6h16l-8,5z" />
-    </group>
-</vector>
diff --git a/app/src/main/res/drawable/widget_new_baseline_mail_widget_24.xml b/app/src/main/res/drawable/widget_new_baseline_mail_widget_24.xml
deleted file mode 100644
index dc20857c40..0000000000
--- a/app/src/main/res/drawable/widget_new_baseline_mail_widget_24.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="16dp"
-    android:tint="@color/colorWidgetForeground"
-    android:viewportWidth="20.0"
-    android:viewportHeight="16.0">
-    <group
-        android:translateX="-2.0"
-        android:translateY="-4.0">
-
-        <path
-            android:fillColor="@android:color/white"
-            android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM20,8l-8,5 -8,-5L4,6l8,5 8,-5v2z" />
-    </group>
-</vector>
diff --git a/app/src/main/res/drawable/widget_old_baseline_mail_24.xml b/app/src/main/res/drawable/widget_old_baseline_mail_24.xml
deleted file mode 100644
index d7db765d1d..0000000000
--- a/app/src/main/res/drawable/widget_old_baseline_mail_24.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="@color/colorWidgetForeground"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM20,8l-8,5 -8,-5L4,6l8,5 8,-5v2z" />
-</vector>
diff --git a/app/src/main/res/drawable/widget_old_twotone_mail_outline_24.xml b/app/src/main/res/drawable/widget_old_twotone_mail_outline_24.xml
deleted file mode 100644
index db76414b88..0000000000
--- a/app/src/main/res/drawable/widget_old_twotone_mail_outline_24.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="@color/colorWidgetForeground"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM20,18L4,18L4,8l8,5 8,-5v10zM12,11L4,6h16l-8,5z" />
-</vector>
diff --git a/app/src/main/res/layout/widget.xml b/app/src/main/res/layout/widget.xml
index 726056ff1f..10752f0b18 100644
--- a/app/src/main/res/layout/widget.xml
+++ b/app/src/main/res/layout/widget.xml
@@ -20,7 +20,8 @@
             android:layout_gravity="center_horizontal"
             android:layout_weight="2"
             android:contentDescription="@string/title_legend_count"
-            android:src="@drawable/widget_old_baseline_mail_24" />
+            android:src="@drawable/baseline_mail_24"
+            app:tint="@color/colorWidgetForeground" />
 
         <TextView
             android:id="@+id/tvCount"
diff --git a/app/src/main/res/layout/widget_new.xml b/app/src/main/res/layout/widget_new.xml
index 84e4203bdc..873cab7daf 100644
--- a/app/src/main/res/layout/widget_new.xml
+++ b/app/src/main/res/layout/widget_new.xml
@@ -20,7 +20,8 @@
             android:contentDescription="@string/title_legend_count"
             android:padding="3dp"
             android:scaleType="fitXY"
-            android:src="@drawable/widget_new_baseline_mail_widget_24" />
+            android:src="@drawable/baseline_mail_widget_24"
+            app:tint="@color/colorWidgetForeground" />
 
         <TextView
             android:id="@+id/tvCount"