From 7a8916f1416cab37eb36c256a52426a9f4e5e63c Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 6 Jul 2020 14:40:27 +0200
Subject: [PATCH] Fixed style menu order

---
 .../main/java/eu/faircode/email/StyleHelper.java |  4 ++--
 app/src/main/res/menu/popup_style.xml            | 16 ++++++++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/StyleHelper.java b/app/src/main/java/eu/faircode/email/StyleHelper.java
index cd5177b183..716c685237 100644
--- a/app/src/main/java/eu/faircode/email/StyleHelper.java
+++ b/app/src/main/java/eu/faircode/email/StyleHelper.java
@@ -96,8 +96,8 @@ public class StyleHelper {
 
                     String[] fontNames = anchor.getResources().getStringArray(R.array.fontNameNames);
                     for (int i = 0; i < fontNames.length; i++)
-                        popupMenu.getMenu().add(R.id.group_style_font, i, Menu.NONE, fontNames[i]);
-                    popupMenu.getMenu().add(R.id.group_style_font, fontNames.length, Menu.NONE, R.string.title_style_font_default);
+                        popupMenu.getMenu().add(R.id.group_style_font, i, 3, fontNames[i]);
+                    popupMenu.getMenu().add(R.id.group_style_font, fontNames.length, 3, R.string.title_style_font_default);
 
                     popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
                         @Override
diff --git a/app/src/main/res/menu/popup_style.xml b/app/src/main/res/menu/popup_style.xml
index 64a69553e1..ebe222bae2 100644
--- a/app/src/main/res/menu/popup_style.xml
+++ b/app/src/main/res/menu/popup_style.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <group android:id="@+id/group_style_size">
+    <group
+        android:id="@+id/group_style_size"
+        android:orderInCategory="1">
         <item
             android:id="@+id/menu_style_size_small"
             android:title="@string/title_style_size_small" />
@@ -14,15 +16,21 @@
             android:title="@string/title_style_size_large" />
     </group>
 
-    <group android:id="@+id/group_style_color">
+    <group
+        android:id="@+id/group_style_color"
+        android:orderInCategory="2">
         <item
             android:id="@+id/menu_style_color"
             android:title="@string/title_style_color" />
     </group>
 
-    <group android:id="@+id/group_style_font" />
+    <group
+        android:id="@+id/group_style_font"
+        android:orderInCategory="3" />
 
-    <group android:id="@+id/group_style_clear">
+    <group
+        android:id="@+id/group_style_clear"
+        android:orderInCategory="4">
         <item
             android:id="@+id/menu_style_clear"
             android:title="@string/title_style_clear" />