From 85003d0f36c9029f5a8438f1480a7ab189bb0d2f Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 25 Apr 2022 13:08:45 +0200
Subject: [PATCH] Fixed widget button colors

---
 .../java/eu/faircode/email/WidgetUnified.java     |  6 ++++++
 .../main/res/drawable/twotone_edit_24_black.xml   | 15 +++++++++++++++
 .../main/res/drawable/twotone_edit_24_white.xml   | 15 +++++++++++++++
 .../main/res/drawable/twotone_sync_24_black.xml   |  9 +++++++++
 .../main/res/drawable/twotone_sync_24_white.xml   | 10 ++++++++++
 app/src/main/res/layout/widget_unified.xml        |  8 ++------
 6 files changed, 57 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/res/drawable/twotone_edit_24_black.xml
 create mode 100644 app/src/main/res/drawable/twotone_edit_24_white.xml
 create mode 100644 app/src/main/res/drawable/twotone_sync_24_black.xml
 create mode 100644 app/src/main/res/drawable/twotone_sync_24_white.xml

diff --git a/app/src/main/java/eu/faircode/email/WidgetUnified.java b/app/src/main/java/eu/faircode/email/WidgetUnified.java
index a983e588c5..4546f4c388 100644
--- a/app/src/main/java/eu/faircode/email/WidgetUnified.java
+++ b/app/src/main/java/eu/faircode/email/WidgetUnified.java
@@ -138,6 +138,8 @@ public class WidgetUnified extends AppWidgetProvider {
                     views.setInt(R.id.background, "setBackgroundColor", background);
 
                 views.setTextColor(R.id.title, colorWidgetForeground);
+                views.setImageViewResource(R.id.refresh, R.drawable.twotone_sync_24_white);
+                views.setImageViewResource(R.id.compose, R.drawable.twotone_edit_24_white);
             } else {
                 float lum = (float) ColorUtils.calculateLuminance(background);
 
@@ -148,6 +150,10 @@ public class WidgetUnified extends AppWidgetProvider {
 
                 int fg = (lum > 0.7f ? Color.BLACK : colorWidgetForeground);
                 views.setTextColor(R.id.title, fg);
+                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);
             }
 
             int dp6 = Helper.dp2pixels(context, 6);
diff --git a/app/src/main/res/drawable/twotone_edit_24_black.xml b/app/src/main/res/drawable/twotone_edit_24_black.xml
new file mode 100644
index 0000000000..f668feaf7f
--- /dev/null
+++ b/app/src/main/res/drawable/twotone_edit_24_black.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="@android:color/black">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M5,18.08V19h0.92l9.06,-9.06 -0.92,-0.92z"
+        android:strokeAlpha="0.3"
+        android:fillAlpha="0.3"/>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.2,-0.2 -0.45,-0.29 -0.71,-0.29s-0.51,0.1 -0.7,0.29l-1.83,1.83 3.75,3.75 1.83,-1.83zM3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM5.92,19H5v-0.92l9.06,-9.06 0.92,0.92L5.92,19z"/>
+</vector>
diff --git a/app/src/main/res/drawable/twotone_edit_24_white.xml b/app/src/main/res/drawable/twotone_edit_24_white.xml
new file mode 100644
index 0000000000..679dc780d9
--- /dev/null
+++ b/app/src/main/res/drawable/twotone_edit_24_white.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="@color/colorWidgetForeground">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M5,18.08V19h0.92l9.06,-9.06 -0.92,-0.92z"
+        android:strokeAlpha="0.3"
+        android:fillAlpha="0.3"/>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.2,-0.2 -0.45,-0.29 -0.71,-0.29s-0.51,0.1 -0.7,0.29l-1.83,1.83 3.75,3.75 1.83,-1.83zM3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM5.92,19H5v-0.92l9.06,-9.06 0.92,0.92L5.92,19z"/>
+</vector>
diff --git a/app/src/main/res/drawable/twotone_sync_24_black.xml b/app/src/main/res/drawable/twotone_sync_24_black.xml
new file mode 100644
index 0000000000..0175248dcb
--- /dev/null
+++ b/app/src/main/res/drawable/twotone_sync_24_black.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/black"
+        android:pathData="M12.01,4L12.01,1l-4,4 4,4L12.01,6c3.31,0 6,2.69 6,6 0,1.01 -0.25,1.97 -0.7,2.8l1.46,1.46c0.78,-1.23 1.24,-2.69 1.24,-4.26 0,-4.42 -3.58,-8 -8,-8zM12.01,18c-3.31,0 -6,-2.69 -6,-6 0,-1.01 0.25,-1.97 0.7,-2.8L5.25,7.74C4.47,8.97 4.01,10.43 4.01,12c0,4.42 3.58,8 8,8v3l4,-4 -4,-4v3z"/>
+</vector>
diff --git a/app/src/main/res/drawable/twotone_sync_24_white.xml b/app/src/main/res/drawable/twotone_sync_24_white.xml
new file mode 100644
index 0000000000..b926b26636
--- /dev/null
+++ b/app/src/main/res/drawable/twotone_sync_24_white.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="@color/colorWidgetForeground">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12.01,4L12.01,1l-4,4 4,4L12.01,6c3.31,0 6,2.69 6,6 0,1.01 -0.25,1.97 -0.7,2.8l1.46,1.46c0.78,-1.23 1.24,-2.69 1.24,-4.26 0,-4.42 -3.58,-8 -8,-8zM12.01,18c-3.31,0 -6,-2.69 -6,-6 0,-1.01 0.25,-1.97 0.7,-2.8L5.25,7.74C4.47,8.97 4.01,10.43 4.01,12c0,4.42 3.58,8 8,8v3l4,-4 -4,-4v3z"/>
+</vector>
diff --git a/app/src/main/res/layout/widget_unified.xml b/app/src/main/res/layout/widget_unified.xml
index 9ba18d9a0e..6a990a0add 100644
--- a/app/src/main/res/layout/widget_unified.xml
+++ b/app/src/main/res/layout/widget_unified.xml
@@ -38,9 +38,7 @@
                 android:layout_weight="0"
                 android:contentDescription="@string/tile_synchronize"
                 android:padding="6dp"
-                android:src="@drawable/twotone_sync_24"
-                android:visibility="gone"
-                app:tint="@color/colorWidgetForeground" />
+                android:src="@drawable/twotone_sync_24_white" />
 
             <ImageView
                 android:id="@+id/compose"
@@ -49,9 +47,7 @@
                 android:layout_weight="0"
                 android:contentDescription="@string/title_compose"
                 android:padding="6dp"
-                android:src="@drawable/twotone_edit_24"
-                android:visibility="gone"
-                app:tint="@color/colorWidgetForeground" />
+                android:src="@drawable/twotone_edit_24_white" />
         </LinearLayout>
 
         <FrameLayout