From 93b0c4cee354280a2248bdc7353cdc98fed4cc9e Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 23 Feb 2025 19:01:31 +0100
Subject: [PATCH] Fixed odd mouse behavior

---
 app/src/main/res/menu/menu_accounts.xml |  4 +---
 app/src/main/res/menu/menu_compose.xml  | 24 ++++++------------------
 app/src/main/res/menu/menu_folders.xml  | 16 ++++------------
 app/src/main/res/menu/menu_logs.xml     |  4 +---
 app/src/main/res/menu/menu_messages.xml | 16 ++++------------
 app/src/main/res/menu/popup_reply.xml   | 12 +++---------
 6 files changed, 19 insertions(+), 57 deletions(-)

diff --git a/app/src/main/res/menu/menu_accounts.xml b/app/src/main/res/menu/menu_accounts.xml
index 3a9d5188da..2f205f6c1a 100644
--- a/app/src/main/res/menu/menu_accounts.xml
+++ b/app/src/main/res/menu/menu_accounts.xml
@@ -42,9 +42,7 @@
         <item
             android:id="@+id/menu_theme"
             android:title="@string/title_setup_theme"
-            app:showAsAction="never">
-            <menu />
-        </item>
+            app:showAsAction="never" />
     </group>
 
     <group android:id="@+id/group_operations">
diff --git a/app/src/main/res/menu/menu_compose.xml b/app/src/main/res/menu/menu_compose.xml
index 8875fc983c..6b46418432 100644
--- a/app/src/main/res/menu/menu_compose.xml
+++ b/app/src/main/res/menu/menu_compose.xml
@@ -101,49 +101,37 @@
             android:id="@+id/menu_contact_group"
             android:icon="@drawable/twotone_group_add_24"
             android:title="@string/title_insert_contact_group"
-            app:showAsAction="never">
-            <menu />
-        </item>
+            app:showAsAction="never" />
 
         <item
             android:id="@+id/menu_manage_android_contacts"
             android:icon="@drawable/twotone_contacts_24"
             android:title="@string/title_manage_android_contacts"
-            app:showAsAction="never">
-            <menu />
-        </item>
+            app:showAsAction="never" />
 
         <item
             android:id="@+id/menu_manage_local_contacts"
             android:icon="@drawable/twotone_import_contacts_24"
             android:title="@string/title_manage_local_contacts"
-            app:showAsAction="never">
-            <menu />
-        </item>
+            app:showAsAction="never" />
 
         <item
             android:id="@+id/menu_answer_insert"
             android:icon="@drawable/twotone_text_snippet_24"
             android:title="@string/title_insert_template"
-            app:showAsAction="never">
-            <menu />
-        </item>
+            app:showAsAction="never" />
 
         <item
             android:id="@+id/menu_answer_create"
             android:icon="@drawable/outline_post_add_24"
             android:title="@string/title_create_template"
-            app:showAsAction="never">
-            <menu />
-        </item>
+            app:showAsAction="never" />
 
         <item
             android:id="@+id/menu_select_identity"
             android:icon="@drawable/twotone_person_24"
             android:title="@string/title_select_default_identity"
-            app:showAsAction="never">
-            <menu />
-        </item>
+            app:showAsAction="never" />
 
         <item
             android:id="@+id/title_search_in_text"
diff --git a/app/src/main/res/menu/menu_folders.xml b/app/src/main/res/menu/menu_folders.xml
index 56a814f7e9..43fb01c654 100644
--- a/app/src/main/res/menu/menu_folders.xml
+++ b/app/src/main/res/menu/menu_folders.xml
@@ -30,9 +30,7 @@
         <item
             android:id="@+id/menu_theme"
             android:title="@string/title_setup_theme"
-            app:showAsAction="never">
-            <menu />
-        </item>
+            app:showAsAction="never" />
     </group>
 
     <group android:id="@+id/group_options">
@@ -71,21 +69,15 @@
         <item
             android:id="@+id/menu_apply_all"
             android:title="@string/title_apply_to_all"
-            app:showAsAction="never">
-            <menu />
-        </item>
+            app:showAsAction="never" />
 
         <item
             android:id="@+id/menu_edit_account_name"
-            android:title="@string/title_edit_account_name">
-            <menu />
-        </item>
+            android:title="@string/title_edit_account_name" />
 
         <item
             android:id="@+id/menu_edit_account_color"
-            android:title="@string/title_edit_account_color">
-            <menu />
-        </item>
+            android:title="@string/title_edit_account_color" />
 
         <item
             android:id="@+id/menu_force_sync"
diff --git a/app/src/main/res/menu/menu_logs.xml b/app/src/main/res/menu/menu_logs.xml
index 769a133689..c2c1bb5ce4 100644
--- a/app/src/main/res/menu/menu_logs.xml
+++ b/app/src/main/res/menu/menu_logs.xml
@@ -10,9 +10,7 @@
     <item
         android:id="@+id/menu_show"
         android:title="@string/title_unhide"
-        app:showAsAction="never">
-        <menu />
-    </item>
+        app:showAsAction="never" />
 
     <item
         android:id="@+id/menu_clear"
diff --git a/app/src/main/res/menu/menu_messages.xml b/app/src/main/res/menu/menu_messages.xml
index 727105aa45..97ad482782 100644
--- a/app/src/main/res/menu/menu_messages.xml
+++ b/app/src/main/res/menu/menu_messages.xml
@@ -126,9 +126,7 @@
 
                 <item
                     android:id="@+id/menu_filter_language"
-                    android:title="@string/title_select_language">
-                    <menu />
-                </item>
+                    android:title="@string/title_select_language" />
 
                 <item
                     android:id="@+id/menu_filter_duplicates"
@@ -174,9 +172,7 @@
             android:id="@+id/menu_theme"
             android:icon="@drawable/twotone_palette_24"
             android:title="@string/title_setup_theme"
-            app:showAsAction="never">
-            <menu />
-        </item>
+            app:showAsAction="never" />
 
         <item
             android:id="@+id/menu_confirm_links"
@@ -223,9 +219,7 @@
             android:id="@+id/menu_sync_more"
             android:icon="@drawable/twotone_save_alt_24"
             android:title="@string/title_synchronize_more"
-            app:showAsAction="never">
-            <menu />
-        </item>
+            app:showAsAction="never" />
 
         <item
             android:id="@+id/menu_force_sync"
@@ -249,8 +243,6 @@
             android:id="@+id/menu_edit_properties"
             android:icon="@drawable/twotone_edit_24"
             android:title="@string/title_edit_properties"
-            app:showAsAction="never">
-            <menu />
-        </item>
+            app:showAsAction="never" />
     </group>
 </menu>
diff --git a/app/src/main/res/menu/popup_reply.xml b/app/src/main/res/menu/popup_reply.xml
index 0732f7178f..596ef1fafa 100644
--- a/app/src/main/res/menu/popup_reply.xml
+++ b/app/src/main/res/menu/popup_reply.xml
@@ -60,21 +60,15 @@
     <item
         android:id="@+id/menu_reply_answer"
         android:icon="@drawable/twotone_text_snippet_24"
-        android:title="@string/title_reply_template">
-        <menu />
-    </item>
+        android:title="@string/title_reply_template" />
 
     <item
         android:id="@+id/menu_move_to"
         android:icon="@drawable/twotone_drive_file_move_24"
-        android:title="@string/title_move_to">
-        <menu />
-    </item>
+        android:title="@string/title_move_to" />
 
     <item
         android:id="@+id/menu_settings"
         android:icon="@drawable/twotone_settings_24"
-        android:title="@string/menu_setup">
-        <menu />
-    </item>
+        android:title="@string/menu_setup" />
 </menu>
\ No newline at end of file