mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2024-12-29 11:15:51 +00:00
Code Issues Releases Wiki Activity

Refactoring

Browse source
This commit is contained in:
M66B 2019-05-09 13:08:02 +02:00
parent f086e98272
commit 43247ef638
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/eu/faircode/email/FragmentCompose.java
View file

@ -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:

4
app/src/main/res/menu/menu_compose.xml
View file

@ -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

3
app/src/main/res/values/strings.xml
View file

@ -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>