From b6033db425adfc42de91011e4d4ae0e6028eb659 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 26 Apr 2022 11:54:04 +0200
Subject: [PATCH] Widget highlight color remark

---
 .../email/WidgetUnifiedRemoteViewsFactory.java     | 11 ++++-------
 .../main/res/layout/activity_widget_unified.xml    | 14 +++++++++++++-
 app/src/main/res/values/strings.xml                |  1 +
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/WidgetUnifiedRemoteViewsFactory.java b/app/src/main/java/eu/faircode/email/WidgetUnifiedRemoteViewsFactory.java
index 545b7bc6b8..712d69ae83 100644
--- a/app/src/main/java/eu/faircode/email/WidgetUnifiedRemoteViewsFactory.java
+++ b/app/src/main/java/eu/faircode/email/WidgetUnifiedRemoteViewsFactory.java
@@ -68,7 +68,7 @@ public class WidgetUnifiedRemoteViewsFactory implements RemoteViewsService.Remot
     private boolean distinguish_contacts;
     private int colorStripeWidth;
     private int colorWidgetForeground;
-    private int colorUnreadHighlight;
+    private int colorWidgetUnread;
     private int colorWidgetRead;
     private int colorSeparator;
     private boolean pro;
@@ -113,8 +113,8 @@ public class WidgetUnifiedRemoteViewsFactory implements RemoteViewsService.Remot
         this.colorStripeWidth = Helper.dp2pixels(context, color_stripe_wide ? 12 : 6);
 
         colorWidgetForeground = ContextCompat.getColor(context, R.color.colorWidgetForeground);
-        colorUnreadHighlight = prefs.getInt("highlight_color", Helper.resolveColor(context, R.attr.colorUnreadHighlight));
-        colorUnreadHighlight = ColorUtils.setAlphaComponent(colorUnreadHighlight, 255);
+        int highlight_color = prefs.getInt("highlight_color", colorWidgetForeground);
+        colorWidgetUnread = ColorUtils.setAlphaComponent(highlight_color, 255);
         colorWidgetRead = ContextCompat.getColor(context, R.color.colorWidgetRead);
         colorSeparator = ContextCompat.getColor(context, R.color.lightColorSeparator);
 
@@ -233,10 +233,7 @@ public class WidgetUnifiedRemoteViewsFactory implements RemoteViewsService.Remot
             views.setTextViewText(idSubject, ssSubject);
             views.setTextViewText(idAccount, ssAccount);
 
-            int textColor = (message.ui_seen
-                    ? colorWidgetRead
-                    : (highlight ? colorUnreadHighlight : colorWidgetForeground));
-
+            int textColor = (message.ui_seen ? colorWidgetRead : colorWidgetUnread);
             views.setTextColor(idFrom, textColor);
             views.setTextColor(idTime, textColor);
             views.setTextColor(idSubject, textColor);
diff --git a/app/src/main/res/layout/activity_widget_unified.xml b/app/src/main/res/layout/activity_widget_unified.xml
index f9f3011600..22d046dbcc 100644
--- a/app/src/main/res/layout/activity_widget_unified.xml
+++ b/app/src/main/res/layout/activity_widget_unified.xml
@@ -75,6 +75,18 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbFlagged" />
 
+        <eu.faircode.email.FixedTextView
+            android:id="@+id/tvHighlightHint"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="6dp"
+            android:text="@string/title_widget_highlight_remark"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            android:textStyle="italic"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/cbHighlight" />
+
         <CheckBox
             android:id="@+id/cbSemiTransparent"
             android:layout_width="wrap_content"
@@ -83,7 +95,7 @@
             android:checked="true"
             android:text="@string/title_widget_semi_transparent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/cbHighlight" />
+            app:layout_constraintTop_toBottomOf="@id/tvHighlightHint" />
 
         <eu.faircode.email.ViewButtonColor
             android:id="@+id/btnColor"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a2f3fb4573..899af58475 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1922,6 +1922,7 @@
     <string name="title_widget_folder_unified">Unified inbox folders</string>
     <string name="title_widget_unseen">Unread messages only</string>
     <string name="title_widget_flagged">Starred messages only</string>
+    <string name="title_widget_highlight_remark">The highlight color can be selected in the display settings</string>
     <string name="title_widget_font_size">Text size</string>
     <string name="title_widget_padding">Padding size</string>
     <string name="title_widget_semi_transparent">Semi transparent background</string>