From 80a2f939594e1933d1eb2b0f619f010e856141f9 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 20 Jun 2021 14:45:56 +0200
Subject: [PATCH] Improved color style menu

---
 .../java/eu/faircode/email/StyleHelper.java     |  3 ++-
 app/src/main/res/menu/popup_style.xml           | 17 +++++++++--------
 app/src/main/res/values/strings.xml             |  1 -
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/StyleHelper.java b/app/src/main/java/eu/faircode/email/StyleHelper.java
index 228a9061b7..d0f350cdb8 100644
--- a/app/src/main/java/eu/faircode/email/StyleHelper.java
+++ b/app/src/main/java/eu/faircode/email/StyleHelper.java
@@ -178,9 +178,10 @@ public class StyleHelper {
                     public boolean onMenuItemClick(MenuItem item) {
                         try {
                             int groupId = item.getGroupId();
+                            int itemId = item.getItemId();
                             if (groupId == R.id.group_style_size) {
                                 return setSize(item);
-                            } else if (groupId == R.id.group_style_color) {
+                            } else if (itemId == R.id.menu_style_color) {
                                 return setColor(item);
                             } else if (groupId == R.id.group_style_font) {
                                 return setFont(item);
diff --git a/app/src/main/res/menu/popup_style.xml b/app/src/main/res/menu/popup_style.xml
index 68ec2dca9e..cf4174de11 100644
--- a/app/src/main/res/menu/popup_style.xml
+++ b/app/src/main/res/menu/popup_style.xml
@@ -22,14 +22,15 @@
         </menu>
     </item>
 
-    <group
-        android:id="@+id/group_style_color"
-        android:orderInCategory="2">
-        <item
-            android:id="@+id/menu_style_color"
-            android:icon="@drawable/twotone_palette_24"
-            android:title="@string/title_style_color" />
-    </group>
+    <item
+        android:id="@+id/menu_style_color"
+        android:icon="@drawable/twotone_palette_24"
+        android:orderInCategory="2"
+        android:title="@string/title_color">
+        <menu>
+            <group android:id="@+id/group_style_color" />
+        </menu>
+    </item>
 
     <item
         android:id="@+id/menu_style_font"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c5ef1971db..fc042a8d46 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1080,7 +1080,6 @@
     <string name="title_style_size_small">Small</string>
     <string name="title_style_size_medium">Medium</string>
     <string name="title_style_size_large">Large</string>
-    <string name="title_style_color">Color &#8230;</string>
     <string name="title_style_align">Align</string>
     <string name="title_style_align_start">Start</string>
     <string name="title_style_align_center">Center</string>