msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Added compose menu icons

Browse Source
pull/199/head
M66B 3 years ago
parent 996fee96fa
commit 04b5f296ba
6 changed files with 61 additions and 3 deletions
Show Stats Download Patch File Download Diff File

3
app/src/main/java/eu/faircode/email/FragmentCompose.java
Unescape View File

@ -100,6 +100,7 @@ import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.view.menu.MenuBuilder;
import androidx.appcompat.widget.PopupMenu;
import androidx.appcompat.widget.SwitchCompat;
import androidx.constraintlayout.widget.Group;
@ -1418,6 +1419,8 @@ public class FragmentCompose extends FragmentBase {
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
inflater.inflate(R.menu.menu_compose, menu);
PopupMenuLifecycle.insertIcons(getContext(), menu);
menu.findItem(R.id.menu_encrypt).setActionView(R.layout.action_button_text);
ImageButton ib = menu.findItem(R.id.menu_encrypt).getActionView().findViewById(R.id.button);
ib.setOnClickListener(new View.OnClickListener() {

2
app/src/main/java/eu/faircode/email/PopupMenuLifecycle.java
Unescape View File

@ -84,7 +84,7 @@ public class PopupMenuLifecycle extends PopupMenu implements LifecycleObserver {
this.dismiss();
}
private static void insertIcons(Context context, Menu menu) {
static void insertIcons(Context context, Menu menu) {
for (int i = 0; i < menu.size(); i++) {
MenuItem item = menu.getItem(i);
CharSequence title = item.getTitle();

22
app/src/main/res/drawable/outline_post_add_24.xml
Unescape View File

@ -0,0 +1,22 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M17,19.22H5V7h7V5H5C3.9,5 3,5.9 3,7v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2v-7h-2V19.22z"/>
<path
android:fillColor="@android:color/white"
android:pathData="M19,2h-2v3h-3c0.01,0.01 0,2 0,2h3v2.99c0.01,0.01 2,0 2,0V7h3V5h-3V2z"/>
<path
android:fillColor="@android:color/white"
android:pathData="M7,9h8v2h-8z"/>
<path
android:fillColor="@android:color/white"
android:pathData="M7,12l0,2l8,0l0,-2l-3,0z"/>
<path
android:fillColor="@android:color/white"
android:pathData="M7,15h8v2h-8z"/>
</vector>

10
app/src/main/res/drawable/outline_translate_24.xml
Unescape View File

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M12.87,15.07l-2.54,-2.51 0.03,-0.03c1.74,-1.94 2.98,-4.17 3.71,-6.53L17,6L17,4h-7L10,2L8,2v2L1,4v1.99h11.17C11.5,7.92 10.44,9.75 9,11.35 8.07,10.32 7.3,9.19 6.69,8h-2c0.73,1.63 1.73,3.17 2.98,4.56l-5.09,5.02L4,19l5,-5 3.11,3.11 0.76,-2.04zM18.5,10h-2L12,22h2l1.12,-3h4.75L21,22h2l-4.5,-12zM15.88,17l1.62,-4.33L19.12,17h-3.24z"/>
</vector>

10
app/src/main/res/drawable/outline_unfold_less_24.xml
Unescape View File

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M7.41,18.59L8.83,20 12,16.83 15.17,20l1.41,-1.41L12,14l-4.59,4.59zM16.59,5.41L15.17,4 12,7.17 8.83,4 7.41,5.41 12,10l4.59,-4.59z"/>
</vector>

17
app/src/main/res/menu/menu_compose.xml
Unescape View File

@ -17,6 +17,7 @@
android:id="@+id/menu_save_drafts"
android:checkable="true"
android:checked="true"
android:icon="@drawable/twotone_save_24"
android:title="@string/title_save_drafts"
app:showAsAction="never" />
@ -24,6 +25,7 @@
android:id="@+id/menu_send_dialog"
android:checkable="true"
android:checked="true"
android:icon="@drawable/twotone_send_24"
android:title="@string/title_send_dialog"
app:showAsAction="never" />
@ -31,6 +33,7 @@
android:id="@+id/menu_image_dialog"
android:checkable="true"
android:checked="true"
android:icon="@drawable/twotone_image_24"
android:title="@string/title_image_dialog"
app:showAsAction="never" />
@ -38,17 +41,20 @@
android:id="@+id/menu_media"
android:checkable="true"
android:checked="true"
android:icon="@drawable/twotone_attachment_24"
android:title="@string/title_media_toolbar"
app:showAsAction="never" />
<item
android:id="@+id/menu_compact"
android:checkable="true"
android:icon="@drawable/outline_unfold_less_24"
android:title="@string/title_compact"
app:showAsAction="never" />
<item
android:id="@+id/menu_contact_group"
android:icon="@drawable/twotone_people_24"
android:title="@string/title_insert_contact_group"
app:showAsAction="never">
<menu />
@ -56,6 +62,7 @@
<item
android:id="@+id/menu_answer_insert"
android:icon="@drawable/twotone_text_snippet_24"
android:title="@string/title_insert_template"
app:showAsAction="never">
<menu />
@ -63,18 +70,22 @@
<item
android:id="@+id/menu_answer_create"
android:icon="@drawable/outline_post_add_24"
android:title="@string/title_create_template"
app:showAsAction="never" />
app:showAsAction="never">
<menu />
</item>
<item
android:id="@+id/menu_translate"
android:icon="@drawable/outline_translate_24"
android:title="@string/title_translate"
app:showAsAction="never">
<menu>
<group android:id="@+id/group_translate">
<item
android:id="@+id/menu_translate_configure"
android:icon="@drawable/twotone_settings_24"
android:title="@string/title_translate_configure" />
</group>
</menu>
@ -82,11 +93,13 @@
<item
android:id="@+id/menu_clear"
android:icon="@drawable/twotone_format_clear_24"
android:title="@string/title_style_clear"
app:showAsAction="never" />
<item
android:id="@+id/menu_legend"
android:icon="@drawable/twotone_help_24"
android:title="@string/menu_legend"
app:showAsAction="never" />
</menu>

Write Preview
Loading…
Cancel
Save