From c93ac65b0c048417e1a2f8e765e2bd8cdbee9939 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 2 Apr 2020 20:58:43 +0200
Subject: [PATCH] Reorganized compose menu

---
 .../eu/faircode/email/FragmentCompose.java    | 16 +++++++--------
 app/src/main/res/menu/menu_compose.xml        | 20 +++++++++----------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 8b1dc7ec4a..297c329583 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -1148,17 +1148,17 @@ public class FragmentCompose extends FragmentBase {
         menu.findItem(R.id.menu_zoom).setVisible(state == State.LOADED);
         menu.findItem(R.id.menu_media).setVisible(state == State.LOADED);
         menu.findItem(R.id.menu_compact).setVisible(state == State.LOADED);
-        menu.findItem(R.id.menu_clear).setVisible(state == State.LOADED);
         menu.findItem(R.id.menu_contact_group).setVisible(state == State.LOADED);
         menu.findItem(R.id.menu_answer).setVisible(state == State.LOADED);
+        menu.findItem(R.id.menu_clear).setVisible(state == State.LOADED);
 
         menu.findItem(R.id.menu_encrypt).setEnabled(!busy);
         menu.findItem(R.id.menu_zoom).setEnabled(!busy);
         menu.findItem(R.id.menu_media).setEnabled(!busy);
         menu.findItem(R.id.menu_compact).setEnabled(!busy);
-        menu.findItem(R.id.menu_clear).setEnabled(!busy);
         menu.findItem(R.id.menu_contact_group).setEnabled(!busy && hasPermission(Manifest.permission.READ_CONTACTS));
         menu.findItem(R.id.menu_answer).setEnabled(!busy);
+        menu.findItem(R.id.menu_clear).setEnabled(!busy);
 
         int colorEncrypt = Helper.resolveColor(getContext(), R.attr.colorEncrypt);
         ImageButton ib = (ImageButton) menu.findItem(R.id.menu_encrypt).getActionView();
@@ -1214,18 +1214,18 @@ public class FragmentCompose extends FragmentBase {
             case R.id.menu_compact:
                 onMenuCompact();
                 return true;
-            case R.id.menu_clear:
-                StyleHelper.apply(R.id.menu_clear, etBody);
-                return true;
-            case R.id.menu_legend:
-                onMenuLegend();
-                return true;
             case R.id.menu_contact_group:
                 onMenuContactGroup();
                 return true;
             case R.id.menu_answer:
                 onMenuAnswer();
                 return true;
+            case R.id.menu_clear:
+                StyleHelper.apply(R.id.menu_clear, etBody);
+                return true;
+            case R.id.menu_legend:
+                onMenuLegend();
+                return true;
             default:
                 return super.onOptionsItemSelected(item);
         }
diff --git a/app/src/main/res/menu/menu_compose.xml b/app/src/main/res/menu/menu_compose.xml
index 111794be7a..227f6fb0f3 100644
--- a/app/src/main/res/menu/menu_compose.xml
+++ b/app/src/main/res/menu/menu_compose.xml
@@ -40,16 +40,6 @@
         android:title="@string/title_compact"
         app:showAsAction="never" />
 
-    <item
-        android:id="@+id/menu_legend"
-        android:title="@string/menu_legend"
-        app:showAsAction="never" />
-
-    <item
-        android:id="@+id/menu_clear"
-        android:title="@string/title_style_clear"
-        app:showAsAction="never" />
-
     <item
         android:id="@+id/menu_contact_group"
         android:title="@string/title_insert_contact_group"
@@ -59,4 +49,14 @@
         android:id="@+id/menu_answer"
         android:title="@string/title_insert_template"
         app:showAsAction="never" />
+
+    <item
+        android:id="@+id/menu_clear"
+        android:title="@string/title_style_clear"
+        app:showAsAction="never" />
+
+    <item
+        android:id="@+id/menu_legend"
+        android:title="@string/menu_legend"
+        app:showAsAction="never" />
 </menu>