From 4c327e987444e7bf3e80537cc4ba1768e91b5f74 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 15 Jun 2021 14:35:13 -0300
Subject: [PATCH] Re-organize conversations overflow menu

---
 .../main/res/menu/conversation_actions.xml    | 54 +++++++++++--------
 briar-android/src/main/res/values/strings.xml |  1 +
 2 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/briar-android/src/main/res/menu/conversation_actions.xml b/briar-android/src/main/res/menu/conversation_actions.xml
index c4a80ad5c..a2f23a6be 100644
--- a/briar-android/src/main/res/menu/conversation_actions.xml
+++ b/briar-android/src/main/res/menu/conversation_actions.xml
@@ -10,12 +10,6 @@
 		android:title="@string/introduction_menu_item"
 		app:showAsAction="never" />
 
-	<item
-		android:id="@+id/action_set_alias"
-		android:enabled="false"
-		android:title="@string/set_contact_alias"
-		app:showAsAction="never" />
-
 	<item
 		android:id="@+id/action_conversation_settings"
 		android:title="@string/menu_item_disappearing_messages"
@@ -23,27 +17,43 @@
 		app:showAsAction="never"
 		tools:visible="true" />
 
-	<item
-		android:id="@+id/action_connect_via_bluetooth"
-		android:enabled="false"
-		android:title="@string/menu_item_connect_via_bluetooth"
-		app:showAsAction="never" />
-
-	<item
-		android:id="@+id/action_transfer_data"
-		android:title="@string/removable_drive_menu_title"
-		android:visible="false"
-		app:showAsAction="never" />
-
 	<item
 		android:id="@+id/action_delete_all_messages"
 		android:title="@string/delete_all_messages"
 		app:showAsAction="never" />
 
 	<item
-		android:id="@+id/action_social_remove_person"
-		android:icon="@drawable/action_delete_white"
-		android:title="@string/delete_contact"
-		app:showAsAction="never" />
+		android:title="@string/network_settings_title"
+		app:showAsAction="never">
+		<menu>
+			<item
+				android:id="@+id/action_connect_via_bluetooth"
+				android:enabled="false"
+				android:title="@string/menu_item_connect_via_bluetooth"
+				app:showAsAction="never" />
+
+			<item
+				android:id="@+id/action_transfer_data"
+				android:title="@string/removable_drive_menu_title"
+				android:visible="false"
+				app:showAsAction="never" />
+		</menu>
+	</item>
+
+	<item
+		android:title="@string/menu_contact"
+		app:showAsAction="never">
+		<menu>
+			<item
+				android:id="@+id/action_set_alias"
+				android:enabled="false"
+				android:title="@string/set_contact_alias"
+				app:showAsAction="never" />
+			<item
+				android:id="@+id/action_social_remove_person"
+				android:title="@string/delete_contact"
+				app:showAsAction="never" />
+		</menu>
+	</item>
 
 </menu>
diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml
index 75bb8d80d..c742340e4 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -239,6 +239,7 @@
 	<string name="dialog_title_image_support">You can now send images to this contact</string>
 	<string name="dialog_message_image_support">Tap this icon to attach images.</string>
 	<string name="messaging_too_many_attachments_toast">Only the first %d images will be sent</string>
+	<string name="menu_contact">Contact</string>
 
 	<!-- Adding Contacts -->