From 51c3d6ceaf7515997b27ad33a6b2d5b0c53ce85b Mon Sep 17 00:00:00 2001
From: cketti <cketti@thunderbird.net>
Date: Tue, 14 Feb 2023 17:23:15 +0100
Subject: [PATCH 1/2] =?UTF-8?q?Remove=20"Send=E2=80=A6"=20submenu=20from?=
 =?UTF-8?q?=20message=20view=20toolbar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

All of the items are now part of the menu displayed in the message header view.
---
 .../k9/ui/messageview/MessageViewFragment.kt  |  2 +-
 .../src/main/res/menu/message_list_option.xml | 29 -------------------
 .../main/res/menu/single_message_options.xml  |  5 +++-
 app/ui/legacy/src/main/res/values/strings.xml |  1 -
 4 files changed, 5 insertions(+), 32 deletions(-)

diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.kt
index 9e38a15c3..73f3d5a4e 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.kt
@@ -279,7 +279,6 @@ class MessageViewFragment :
         }
 
         menu.findItem(R.id.move_to_drafts).isVisible = isOutbox
-        menu.findItem(R.id.single_message_options).isVisible = true
         menu.findItem(R.id.unsubscribe).isVisible = canMessageBeUnsubscribed()
         menu.findItem(R.id.show_headers).isVisible = true
         menu.findItem(R.id.compose).isVisible = true
@@ -396,6 +395,7 @@ class MessageViewFragment :
                 R.id.reply_all -> onReplyAll()
                 R.id.forward -> onForward()
                 R.id.forward_as_attachment -> onForwardAsAttachment()
+                R.id.edit_as_new_message -> onEditAsNewMessage()
                 R.id.share -> onSendAlternate()
                 else -> error("Missing handler for reply menu item $itemId")
             }
diff --git a/app/ui/legacy/src/main/res/menu/message_list_option.xml b/app/ui/legacy/src/main/res/menu/message_list_option.xml
index de9fdba7c..01f82e245 100644
--- a/app/ui/legacy/src/main/res/menu/message_list_option.xml
+++ b/app/ui/legacy/src/main/res/menu/message_list_option.xml
@@ -79,35 +79,6 @@
         android:visible="false"
         app:showAsAction="never" />
 
-    <!-- MessageView -->
-    <item
-        android:id="@+id/single_message_options"
-        android:icon="?attr/iconActionSingleMessageOptions"
-        android:title="@string/single_message_options_action"
-        android:visible="false"
-        app:showAsAction="ifRoom">
-        <menu>
-            <item
-                android:id="@+id/reply"
-                android:title="@string/reply_action" />
-            <item
-                android:id="@+id/reply_all"
-                android:title="@string/reply_all_action" />
-            <item
-                android:id="@+id/forward"
-                android:title="@string/forward_action" />
-            <item
-                android:id="@+id/forward_as_attachment"
-                android:title="@string/forward_as_attachment_action" />
-            <item
-                android:id="@+id/edit_as_new_message"
-                android:title="@string/edit_as_new_message_action" />
-            <item
-                android:id="@+id/share"
-                android:title="@string/send_alternate_action" />
-        </menu>
-    </item>
-
     <!-- MessageView -->
     <item
         android:id="@+id/refile"
diff --git a/app/ui/legacy/src/main/res/menu/single_message_options.xml b/app/ui/legacy/src/main/res/menu/single_message_options.xml
index 1f4cf3e11..043395f71 100644
--- a/app/ui/legacy/src/main/res/menu/single_message_options.xml
+++ b/app/ui/legacy/src/main/res/menu/single_message_options.xml
@@ -12,7 +12,10 @@
     <item
         android:id="@+id/forward_as_attachment"
         android:title="@string/forward_as_attachment_action"/>
+    <item
+        android:id="@+id/edit_as_new_message"
+        android:title="@string/edit_as_new_message_action" />
     <item
         android:id="@+id/share"
         android:title="@string/send_alternate_action"/>
-</menu>
\ No newline at end of file
+</menu>
diff --git a/app/ui/legacy/src/main/res/values/strings.xml b/app/ui/legacy/src/main/res/values/strings.xml
index 43692e4ac..e17f613af 100644
--- a/app/ui/legacy/src/main/res/values/strings.xml
+++ b/app/ui/legacy/src/main/res/values/strings.xml
@@ -111,7 +111,6 @@ Please submit bug reports, contribute new features and ask questions at
     <string name="edit_as_new_message_action">Edit as new message</string>
     <string name="move_action">Move</string>
     <string name="move_to_drafts_action">Move to Drafts</string>
-    <string name="single_message_options_action">Send…</string>
     <string name="refile_action">Refile…</string>
     <string name="done_action">Done</string>
     <string name="discard_action">Discard</string>

From fbe7136109b5775d87e8b1d7b4fdd01eb7aa51f7 Mon Sep 17 00:00:00 2001
From: cketti <cketti@thunderbird.net>
Date: Tue, 14 Feb 2023 17:31:29 +0100
Subject: [PATCH 2/2] Remove unnecessary theme attribute

---
 app/ui/legacy/src/main/res/layout/message_view_header.xml | 2 +-
 app/ui/legacy/src/main/res/menu/message_list_option.xml   | 1 -
 app/ui/legacy/src/main/res/values/attrs.xml               | 1 -
 app/ui/legacy/src/main/res/values/themes.xml              | 2 --
 4 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/ui/legacy/src/main/res/layout/message_view_header.xml b/app/ui/legacy/src/main/res/layout/message_view_header.xml
index 2222a7c23..bd12c37c2 100644
--- a/app/ui/legacy/src/main/res/layout/message_view_header.xml
+++ b/app/ui/legacy/src/main/res/layout/message_view_header.xml
@@ -162,7 +162,7 @@
             android:paddingHorizontal="12dp"
             app:layout_constraintEnd_toStartOf="@id/menu_overflow"
             app:layout_constraintTop_toTopOf="@+id/menu_overflow"
-            app:srcCompat="?iconActionSingleMessageOptions" />
+            tools:srcCompat="@drawable/ic_reply_all" />
 
         <ImageView
             android:id="@+id/menu_overflow"
diff --git a/app/ui/legacy/src/main/res/menu/message_list_option.xml b/app/ui/legacy/src/main/res/menu/message_list_option.xml
index 01f82e245..7d57918c3 100644
--- a/app/ui/legacy/src/main/res/menu/message_list_option.xml
+++ b/app/ui/legacy/src/main/res/menu/message_list_option.xml
@@ -82,7 +82,6 @@
     <!-- MessageView -->
     <item
         android:id="@+id/refile"
-        android:icon="?attr/iconActionSingleMessageOptions"
         android:title="@string/refile_action"
         android:visible="false"
         app:showAsAction="never">
diff --git a/app/ui/legacy/src/main/res/values/attrs.xml b/app/ui/legacy/src/main/res/values/attrs.xml
index 001cd401c..64503b603 100644
--- a/app/ui/legacy/src/main/res/values/attrs.xml
+++ b/app/ui/legacy/src/main/res/values/attrs.xml
@@ -29,7 +29,6 @@
         <attr name="iconActionSearchFolder" format="reference" />
         <attr name="iconActionSend" format="reference" />
         <attr name="iconActionSettings" format="reference" />
-        <attr name="iconActionSingleMessageOptions" format="reference" />
         <attr name="iconActionSort" format="reference" />
         <attr name="iconActionSpam" format="reference" />
         <attr name="iconActionFlag" format="reference" />
diff --git a/app/ui/legacy/src/main/res/values/themes.xml b/app/ui/legacy/src/main/res/values/themes.xml
index 2a64b98cc..47fd88344 100644
--- a/app/ui/legacy/src/main/res/values/themes.xml
+++ b/app/ui/legacy/src/main/res/values/themes.xml
@@ -52,7 +52,6 @@
         <item name="iconActionSearchFolder">@drawable/ic_folder_magnify</item>
         <item name="iconActionSend">@drawable/ic_send</item>
         <item name="iconActionSettings">@drawable/ic_cog</item>
-        <item name="iconActionSingleMessageOptions">@drawable/ic_reply_all</item>
         <item name="iconActionSort">@drawable/ic_sort</item>
         <item name="iconActionSpam">@drawable/ic_alert_octagon</item>
         <item name="iconActionFlag">@drawable/ic_star</item>
@@ -215,7 +214,6 @@
         <item name="iconActionSearchFolder">@drawable/ic_folder_magnify</item>
         <item name="iconActionSend">@drawable/ic_send</item>
         <item name="iconActionSettings">@drawable/ic_cog</item>
-        <item name="iconActionSingleMessageOptions">@drawable/ic_reply_all</item>
         <item name="iconActionSort">@drawable/ic_sort</item>
         <item name="iconActionSpam">@drawable/ic_alert_octagon</item>
         <item name="iconActionFlag">@drawable/ic_star</item>