From cc59a13917feb6c3d2ba992055bac81009bc4a95 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 5 Mar 2022 09:55:59 +0100
Subject: [PATCH] Use dedicated widget icon (2)

---
 app/src/main/java/eu/faircode/email/Widget.java    |  8 ++++----
 .../main/res/drawable/widget_baseline_mail_24.xml  | 10 ++++++++++
 .../widget_baseline_mail_outline_widget_24.xml     | 14 ++++++++++++++
 ...dget.xml => widget_baseline_mail_widget_24.xml} |  0
 .../drawable/widget_twotone_mail_outline_24.xml    | 10 ++++++++++
 app/src/main/res/layout/widget.xml                 |  2 +-
 app/src/main/res/layout/widget_new.xml             |  2 +-
 7 files changed, 40 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/res/drawable/widget_baseline_mail_24.xml
 create mode 100644 app/src/main/res/drawable/widget_baseline_mail_outline_widget_24.xml
 rename app/src/main/res/drawable/{baseline_mail_widget_24_widget.xml => widget_baseline_mail_widget_24.xml} (100%)
 create mode 100644 app/src/main/res/drawable/widget_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 9f65757676..cdda720ac2 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.baseline_mail_outline_widget_24
-                                : R.drawable.baseline_mail_widget_24);
+                                ? R.drawable.widget_baseline_mail_outline_widget_24
+                                : R.drawable.widget_baseline_mail_widget_24);
                     else
                         views.setImageViewResource(R.id.ivMessage, unseen == 0
-                                ? R.drawable.twotone_mail_outline_24
-                                : R.drawable.baseline_mail_24);
+                                ? R.drawable.widget_twotone_mail_outline_24
+                                : R.drawable.widget_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);
 
diff --git a/app/src/main/res/drawable/widget_baseline_mail_24.xml b/app/src/main/res/drawable/widget_baseline_mail_24.xml
new file mode 100644
index 0000000000..d7db765d1d
--- /dev/null
+++ b/app/src/main/res/drawable/widget_baseline_mail_24.xml
@@ -0,0 +1,10 @@
+<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_baseline_mail_outline_widget_24.xml b/app/src/main/res/drawable/widget_baseline_mail_outline_widget_24.xml
new file mode 100644
index 0000000000..b2e7adbec4
--- /dev/null
+++ b/app/src/main/res/drawable/widget_baseline_mail_outline_widget_24.xml
@@ -0,0 +1,14 @@
+<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/baseline_mail_widget_24_widget.xml b/app/src/main/res/drawable/widget_baseline_mail_widget_24.xml
similarity index 100%
rename from app/src/main/res/drawable/baseline_mail_widget_24_widget.xml
rename to app/src/main/res/drawable/widget_baseline_mail_widget_24.xml
diff --git a/app/src/main/res/drawable/widget_twotone_mail_outline_24.xml b/app/src/main/res/drawable/widget_twotone_mail_outline_24.xml
new file mode 100644
index 0000000000..db76414b88
--- /dev/null
+++ b/app/src/main/res/drawable/widget_twotone_mail_outline_24.xml
@@ -0,0 +1,10 @@
+<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 ed03e39408..0f4c37ff04 100644
--- a/app/src/main/res/layout/widget.xml
+++ b/app/src/main/res/layout/widget.xml
@@ -20,7 +20,7 @@
             android:layout_gravity="center_horizontal"
             android:layout_weight="2"
             android:contentDescription="@string/title_legend_count"
-            android:src="@drawable/baseline_mail_widget_24_widget" />
+            android:src="@drawable/widget_baseline_mail_24" />
 
         <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 5a2bc10ad0..0debff9e36 100644
--- a/app/src/main/res/layout/widget_new.xml
+++ b/app/src/main/res/layout/widget_new.xml
@@ -20,7 +20,7 @@
             android:contentDescription="@string/title_legend_count"
             android:padding="3dp"
             android:scaleType="fitXY"
-            android:src="@drawable/baseline_mail_widget_24_widget" />
+            android:src="@drawable/widget_baseline_mail_widget_24" />
 
         <TextView
             android:id="@+id/tvCount"