From 43247ef638f150013856921965bb836a7285676e Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 9 May 2019 13:08:02 +0200
Subject: [PATCH] Refactoring

---
 app/src/main/java/eu/faircode/email/FragmentCompose.java | 6 +++---
 app/src/main/res/menu/menu_compose.xml                   | 4 ++--
 app/src/main/res/values/strings.xml                      | 3 ++-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 1b5735d0d8..b498160c1e 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -768,7 +768,7 @@ public class FragmentCompose extends FragmentBase {
         menu.findItem(R.id.menu_addresses).setVisible(false);
         //menu.findItem(R.id.menu_addresses).setVisible(working >= 0);
         menu.findItem(R.id.menu_zoom).setVisible(state == State.LOADED);
-        menu.findItem(R.id.menu_style_toolbar).setVisible(state == State.LOADED);
+        menu.findItem(R.id.menu_media_toolbar).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);
@@ -784,7 +784,7 @@ public class FragmentCompose extends FragmentBase {
         menu.findItem(R.id.menu_encrypt).setEnabled(!busy);
         menu.findItem(R.id.menu_send_after).setEnabled(!busy);
 
-        menu.findItem(R.id.menu_style_toolbar).setChecked(style);
+        menu.findItem(R.id.menu_media_toolbar).setChecked(style);
 
         menu.findItem(R.id.menu_plain_only).setChecked(plain_only);
         menu.findItem(R.id.menu_encrypt).setChecked(encrypt);
@@ -805,7 +805,7 @@ public class FragmentCompose extends FragmentBase {
             case R.id.menu_zoom:
                 onMenuZoom();
                 return true;
-            case R.id.menu_style_toolbar:
+            case R.id.menu_media_toolbar:
                 onMenuStyleToolbar();
                 return true;
             case R.id.menu_clear:
diff --git a/app/src/main/res/menu/menu_compose.xml b/app/src/main/res/menu/menu_compose.xml
index f535d27137..a1af44c221 100644
--- a/app/src/main/res/menu/menu_compose.xml
+++ b/app/src/main/res/menu/menu_compose.xml
@@ -14,9 +14,9 @@
         app:showAsAction="ifRoom" />
 
     <item
-        android:id="@+id/menu_style_toolbar"
+        android:id="@+id/menu_media_toolbar"
         android:checkable="true"
-        android:title="@string/title_style_toolbar"
+        android:title="@string/title_media_toolbar"
         app:showAsAction="never" />
 
     <item
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 343c275926..4c7858e8b7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -459,12 +459,13 @@
     <string name="title_style_clear">Clear formatting</string>
     <string name="title_style_link">Insert link</string>
     <string name="title_style_image">Insert image</string>
-    <string name="title_style_toolbar">Style toolbar</string>
     <string name="title_add_attachment">Add attachment</string>
     <string name="title_attachment_file">Attach file</string>
     <string name="title_attachment_photo">Take photo</string>
     <string name="title_attachment_audio">Record audio</string>
     <string name="title_show_addresses">Show CC/BCC</string>
+
+    <string name="title_media_toolbar">Media toolbar</string>
     <string name="title_insert_contact_group">Insert contact group</string>
     <string name="title_insert_template">Insert template</string>
     <string name="title_send_plain_text">Send plain text only</string>