mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2024-12-25 01:06:04 +00:00
Code Issues Releases Wiki Activity

Reorganized compose menu

Browse source
This commit is contained in:
M66B 2020-04-02 20:58:43 +02:00
parent 206c3b06a9
commit c93ac65b0c
2 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

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