From 3f87be9f536cd65e265401757c5898bc0962e983 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 7 May 2021 11:14:20 +0200
Subject: [PATCH] Added answer menu icons

---
 .../java/eu/faircode/email/ActivityView.java     |  2 +-
 .../java/eu/faircode/email/FragmentMessages.java |  3 +++
 .../main/res/drawable/twotone_call_missed_24.xml | 11 +++++++++++
 .../res/drawable/twotone_text_snippet_24.xml     | 16 ++++++++++++++++
 app/src/main/res/menu/popup_reply.xml            |  9 +++++++++
 5 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/drawable/twotone_call_missed_24.xml
 create mode 100644 app/src/main/res/drawable/twotone_text_snippet_24.xml

diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index 51b96950bb..11eb3b77fe 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -503,7 +503,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
             }
         }));
 
-        menus.add(new NavMenuItem(R.drawable.twotone_reply_24, R.string.menu_answers, new Runnable() {
+        menus.add(new NavMenuItem(R.drawable.twotone_text_snippet_24, R.string.menu_answers, new Runnable() {
             @Override
             public void run() {
                 if (!drawerLayout.isLocked(drawerContainer))
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index afd3b052e3..28a6f0d45e 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -2511,10 +2511,13 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                     for (EntityAnswer answer : data.answers) {
                         order++;
                         popupMenu.getMenu().add(1, order, order, answer.toString())
+                                .setIcon(R.drawable.twotone_text_snippet_24)
                                 .setIntent(new Intent().putExtra("id", answer.id));
                     }
                 }
 
+                popupMenu.insertIcons(context);
+
                 popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
                     @Override
                     public boolean onMenuItemClick(MenuItem target) {
diff --git a/app/src/main/res/drawable/twotone_call_missed_24.xml b/app/src/main/res/drawable/twotone_call_missed_24.xml
new file mode 100644
index 0000000000..2be3262ea0
--- /dev/null
+++ b/app/src/main/res/drawable/twotone_call_missed_24.xml
@@ -0,0 +1,11 @@
+<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"
+    android:autoMirrored="true">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M5,10.41l7,7 9,-9L19.59,7 12,14.59 6.41,9H11V7H3v8h2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/twotone_text_snippet_24.xml b/app/src/main/res/drawable/twotone_text_snippet_24.xml
new file mode 100644
index 0000000000..e5e016fcef
--- /dev/null
+++ b/app/src/main/res/drawable/twotone_text_snippet_24.xml
@@ -0,0 +1,16 @@
+<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"
+    android:autoMirrored="true">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M14.17,5L19,9.83V19H5V5L14.17,5L14.17,5M7,15h10v2H7V15zM7,11h10v2H7V11zM7,7h7v2H7V7z"
+      android:strokeAlpha="0.3"
+      android:fillAlpha="0.3"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M14.17,5L19,9.83V19H5V5L14.17,5L14.17,5M14.17,3H5C3.9,3 3,3.9 3,5v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V9.83c0,-0.53 -0.21,-1.04 -0.59,-1.41l-4.83,-4.83C15.21,3.21 14.7,3 14.17,3L14.17,3zM7,15h10v2H7V15zM7,11h10v2H7V11zM7,7h7v2H7V7z"/>
+</vector>
diff --git a/app/src/main/res/menu/popup_reply.xml b/app/src/main/res/menu/popup_reply.xml
index 6b6b8c6906..346bddbdc2 100644
--- a/app/src/main/res/menu/popup_reply.xml
+++ b/app/src/main/res/menu/popup_reply.xml
@@ -2,38 +2,47 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/menu_reply_to_sender"
+        android:icon="@drawable/twotone_reply_24"
         android:title="@string/title_reply_to_sender" />
 
     <item
         android:id="@+id/menu_reply_to_all"
+        android:icon="@drawable/twotone_reply_all_24"
         android:title="@string/title_reply_to_all" />
 
     <item
         android:id="@+id/menu_reply_list"
+        android:icon="@drawable/twotone_reorder_24"
         android:title="@string/title_reply_list" />
 
     <item
         android:id="@+id/menu_reply_receipt"
+        android:icon="@drawable/twotone_playlist_add_check_24"
         android:title="@string/title_reply_receipt" />
 
     <item
         android:id="@+id/menu_reply_hard_bounce"
+        android:icon="@drawable/twotone_call_missed_24"
         android:title="@string/title_reply_hard_bounce" />
 
     <item
         android:id="@+id/menu_forward"
+        android:icon="@drawable/twotone_forward_24"
         android:title="@string/title_forward" />
 
     <item
         android:id="@+id/menu_editasnew"
+        android:icon="@drawable/twotone_edit_24"
         android:title="@string/title_editasnew" />
 
     <item
         android:id="@+id/menu_new_message"
+        android:icon="@drawable/twotone_add_24"
         android:title="@string/title_new_message" />
 
     <item
         android:id="@+id/menu_reply_answer"
+        android:icon="@drawable/twotone_text_snippet_24"
         android:title="@string/title_reply_template">
         <menu />
     </item>