From 6b77b4adb04db362f5e6f901ee53319a60043f55 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 29 Jun 2020 08:00:15 +0200
Subject: [PATCH] Refactoring

---
 .../java/eu/faircode/email/StyleHelper.java   | 34 +++++---------
 app/src/main/res/menu/popup_style.xml         | 46 +++++++++++++++++++
 2 files changed, 57 insertions(+), 23 deletions(-)
 create mode 100644 app/src/main/res/menu/popup_style.xml

diff --git a/app/src/main/java/eu/faircode/email/StyleHelper.java b/app/src/main/java/eu/faircode/email/StyleHelper.java
index 5762842509..daa8466c15 100644
--- a/app/src/main/java/eu/faircode/email/StyleHelper.java
+++ b/app/src/main/java/eu/faircode/email/StyleHelper.java
@@ -90,32 +90,20 @@ public class StyleHelper {
                     final int e = end;
                     final SpannableString t = ss;
 
-                    int order = 1;
                     PopupMenu popupMenu = new PopupMenu(anchor.getContext(), anchor);
-                    popupMenu.getMenu().add(0, R.string.title_style_size_small, order++, R.string.title_style_size_small);
-                    popupMenu.getMenu().add(0, R.string.title_style_size_medium, order++, R.string.title_style_size_medium);
-                    popupMenu.getMenu().add(0, R.string.title_style_size_large, order++, R.string.title_style_size_large);
-
-                    popupMenu.getMenu().add(1, R.string.title_style_color, order++, R.string.title_style_color);
-
-                    popupMenu.getMenu().add(2, R.string.title_style_font_cursive, order++, R.string.title_style_font_cursive);
-                    popupMenu.getMenu().add(2, R.string.title_style_font_serif, order++, R.string.title_style_font_serif);
-                    popupMenu.getMenu().add(2, R.string.title_style_font_sans_serif, order++, R.string.title_style_font_sans_serif);
-                    popupMenu.getMenu().add(2, R.string.title_style_font_monospace, order++, R.string.title_style_font_monospace);
-
-                    popupMenu.getMenu().add(3, R.string.title_style_clear, order++, R.string.title_style_clear);
+                    popupMenu.inflate(R.menu.popup_style);
 
                     popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
                         @Override
                         public boolean onMenuItemClick(MenuItem item) {
                             switch (item.getGroupId()) {
-                                case 0:
+                                case R.id.group_style_size:
                                     return setSize(item);
-                                case 1:
+                                case R.id.group_style_color:
                                     return setColor(item);
-                                case 2:
+                                case R.id.group_style_font:
                                     return setFont(item);
-                                case 3:
+                                case R.id.group_style_clear:
                                     return clear(item);
                                 default:
                                     return false;
@@ -128,9 +116,9 @@ public class StyleHelper {
                                 t.removeSpan(span);
 
                             Float size;
-                            if (item.getItemId() == R.string.title_style_size_small)
+                            if (item.getItemId() == R.id.menu_style_size_small)
                                 size = 0.8f;
-                            else if (item.getItemId() == R.string.title_style_size_large)
+                            else if (item.getItemId() == R.id.menu_style_size_large)
                                 size = 1.25f;
                             else
                                 size = null;
@@ -203,16 +191,16 @@ public class StyleHelper {
 
                             String face;
                             switch (item.getItemId()) {
-                                case R.string.title_style_font_cursive:
+                                case R.id.menu_style_font_cursive:
                                     face = "cursive";
                                     break;
-                                case R.string.title_style_font_serif:
+                                case R.id.menu_style_font_serif:
                                     face = "serif";
                                     break;
-                                case R.string.title_style_font_sans_serif:
+                                case R.id.menu_style_font_sans_serif:
                                     face = "sans-serif";
                                     break;
-                                case R.string.title_style_font_monospace:
+                                case R.id.menu_style_font_monospace:
                                     face = "monospace";
                                     break;
                                 default:
diff --git a/app/src/main/res/menu/popup_style.xml b/app/src/main/res/menu/popup_style.xml
new file mode 100644
index 0000000000..c251e7bc60
--- /dev/null
+++ b/app/src/main/res/menu/popup_style.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <group android:id="@+id/group_style_size">
+        <item
+            android:id="@+id/menu_style_size_small"
+            android:title="@string/title_style_size_small" />
+
+        <item
+            android:id="@+id/menu_style_size_medium"
+            android:title="@string/title_style_size_medium" />
+
+        <item
+            android:id="@+id/menu_style_size_large"
+            android:title="@string/title_style_size_large" />
+    </group>
+
+    <group android:id="@+id/group_style_color">
+        <item
+            android:id="@+id/menu_style_color"
+            android:title="@string/title_style_color" />
+    </group>
+
+    <group android:id="@+id/group_style_font">
+        <item
+            android:id="@+id/menu_style_font_cursive"
+            android:title="@string/title_style_font_cursive" />
+        <item
+            android:id="@+id/menu_style_font_serif"
+            android:title="@string/title_style_font_serif" />
+        <item
+            android:id="@+id/menu_style_font_sans_serif"
+            android:title="@string/title_style_font_sans_serif" />
+        <item
+            android:id="@+id/menu_style_font_monospace"
+            android:title="@string/title_style_font_monospace" />
+        <item
+            android:id="@+id/menu_style_font_default"
+            android:title="@string/title_style_font_default" />
+    </group>
+
+    <group android:id="@+id/group_style_clear">
+        <item
+            android:id="@+id/menu_style_clear"
+            android:title="@string/title_style_clear" />
+    </group>
+</menu>
\ No newline at end of file