Reorganized compose menu

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);
         }

app/src/main/res/menu/menu_compose.xml

@@ -41,22 +41,22 @@
         app:showAsAction="never" />
 
     <item
-        android:id="@+id/menu_legend"
+        android:id="@+id/menu_contact_group"
-        android:title="@string/menu_legend"
+        android:title="@string/title_insert_contact_group"
         app:showAsAction="never" />
 
     <item
-        android:id="@+id/menu_clear"
+        android:id="@+id/menu_answer"
-        android:title="@string/title_style_clear"
+        android:title="@string/title_insert_template"
         app:showAsAction="never" />
 
     <item
-        android:id="@+id/menu_contact_group"
+        android:id="@+id/menu_clear"
-        android:title="@string/title_insert_contact_group"
+        android:title="@string/title_style_clear"
         app:showAsAction="never" />
 
     <item
-        android:id="@+id/menu_answer"
+        android:id="@+id/menu_legend"
-        android:title="@string/title_insert_template"
+        android:title="@string/menu_legend"
         app:showAsAction="never" />
 </menu>