From 2280c4581e440f877b2258f6840d466a52df82f6 Mon Sep 17 00:00:00 2001
From: Naveen Singh <36371707+naveensingh@users.noreply.github.com>
Date: Fri, 26 Sep 2025 21:49:40 +0530
Subject: [PATCH] feat: reorder action buttons (#530)

* feat: never show delete button as action

This makes it slightly harder to accidentally deleted conversations.

* feat: reorder action buttons in chats and main screen

* docs: update changelog
---
 CHANGELOG.md                                  |  3 +
 .../res/menu/cab_archived_conversations.xml   | 12 +--
 app/src/main/res/menu/cab_conversations.xml   | 82 ++++++++++---------
 app/src/main/res/menu/cab_thread.xml          | 35 ++++----
 app/src/main/res/menu/menu_main.xml           |  2 +
 app/src/main/res/menu/menu_thread.xml         | 55 +++++++------
 6 files changed, 102 insertions(+), 87 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a319e604..e9b8b8bb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Changed
+- Reordered action buttons throughout the app
+
 ### Added
 - Ability to save multiple attachments ([#75])
 
diff --git a/app/src/main/res/menu/cab_archived_conversations.xml b/app/src/main/res/menu/cab_archived_conversations.xml
index 6c636ea0..9a0a7353 100644
--- a/app/src/main/res/menu/cab_archived_conversations.xml
+++ b/app/src/main/res/menu/cab_archived_conversations.xml
@@ -3,18 +3,18 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     tools:ignore="AppCompatResource,AlwaysShowAction">
-    <item
-        android:id="@+id/cab_delete"
-        android:icon="@drawable/ic_delete_vector"
-        android:showAsAction="always"
-        android:title="@string/delete"
-        app:showAsAction="always" />
     <item
         android:id="@+id/cab_unarchive"
         android:icon="@drawable/ic_unarchive_vector"
         android:showAsAction="ifRoom"
         android:title="@string/unarchive"
         app:showAsAction="ifRoom" />
+    <item
+        android:id="@+id/cab_delete"
+        android:icon="@drawable/ic_delete_vector"
+        android:showAsAction="always"
+        android:title="@string/delete"
+        app:showAsAction="always" />
     <item
         android:id="@+id/cab_select_all"
         android:icon="@drawable/ic_select_all_vector"
diff --git a/app/src/main/res/menu/cab_conversations.xml b/app/src/main/res/menu/cab_conversations.xml
index 6b069926..54c881b8 100644
--- a/app/src/main/res/menu/cab_conversations.xml
+++ b/app/src/main/res/menu/cab_conversations.xml
@@ -3,50 +3,30 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     tools:ignore="AppCompatResource,AlwaysShowAction">
-    <item
-        android:id="@+id/cab_delete"
-        android:icon="@drawable/ic_delete_vector"
-        android:showAsAction="always"
-        android:title="@string/delete"
-        app:showAsAction="always" />
-    <item
-        android:id="@+id/cab_add_number_to_contact"
-        android:icon="@drawable/ic_add_person_vector"
-        android:showAsAction="always"
-        android:title="@string/add_number_to_contact"
-        app:showAsAction="always" />
     <item
         android:id="@+id/cab_dial_number"
         android:icon="@drawable/ic_phone_vector"
         android:showAsAction="always"
         android:title="@string/dial_number"
         app:showAsAction="always" />
-    <item
-        android:id="@+id/cab_block_number"
-        android:icon="@drawable/ic_minus_circle_vector"
-        android:title="@string/block_number"
-        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/cab_archive"
         android:icon="@drawable/ic_archive_vector"
-        android:showAsAction="ifRoom"
+        android:showAsAction="always"
         android:title="@string/archive"
+        app:showAsAction="always" />
+    <item
+        android:id="@+id/cab_delete"
+        android:icon="@drawable/ic_delete_vector"
+        android:showAsAction="always"
+        android:title="@string/delete"
+        app:showAsAction="always" />
+    <item
+        android:id="@+id/cab_select_all"
+        android:icon="@drawable/ic_select_all_vector"
+        android:showAsAction="ifRoom"
+        android:title="@string/select_all"
         app:showAsAction="ifRoom" />
-    <item
-        android:id="@+id/cab_copy_number"
-        android:showAsAction="never"
-        android:title="@string/copy_number_to_clipboard"
-        app:showAsAction="never" />
-    <item
-        android:id="@+id/cab_rename_conversation"
-        android:icon="@drawable/ic_edit_vector"
-        android:title="@string/rename_conversation"
-        app:showAsAction="ifRoom" />
-    <item
-        android:id="@+id/cab_conversation_details"
-        android:showAsAction="never"
-        android:title="@string/conversation_details"
-        app:showAsAction="never" />
     <item
         android:id="@+id/cab_mark_as_read"
         android:showAsAction="never"
@@ -57,19 +37,41 @@
         android:showAsAction="never"
         android:title="@string/mark_as_unread"
         app:showAsAction="never" />
+    <item
+        android:id="@+id/cab_add_number_to_contact"
+        android:showAsAction="never"
+        android:title="@string/add_number_to_contact"
+        app:showAsAction="never" />
+    <item
+        android:id="@+id/cab_copy_number"
+        android:showAsAction="never"
+        android:title="@string/copy_number_to_clipboard"
+        app:showAsAction="never" />
+    <item
+        android:id="@+id/cab_rename_conversation"
+        android:showAsAction="never"
+        android:title="@string/rename_conversation"
+        app:showAsAction="never" />
+    <item
+        android:id="@+id/cab_conversation_details"
+        android:showAsAction="never"
+        android:title="@string/conversation_details"
+        app:showAsAction="never" />
+    <item
+        android:id="@+id/cab_block_number"
+        android:showAsAction="never"
+        android:title="@string/block_number"
+        app:showAsAction="never" />
     <item
         android:id="@+id/cab_pin_conversation"
         android:icon="@drawable/ic_pin_filled_vector"
+        android:showAsAction="never"
         android:title="@string/pin_conversation"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="never" />
     <item
         android:id="@+id/cab_unpin_conversation"
         android:icon="@drawable/ic_pin_filled_vector"
+        android:showAsAction="never"
         android:title="@string/unpin_conversation"
-        app:showAsAction="ifRoom" />
-    <item
-        android:id="@+id/cab_select_all"
-        android:icon="@drawable/ic_select_all_vector"
-        android:title="@string/select_all"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="never" />
 </menu>
diff --git a/app/src/main/res/menu/cab_thread.xml b/app/src/main/res/menu/cab_thread.xml
index 1c615d95..2b81f67b 100644
--- a/app/src/main/res/menu/cab_thread.xml
+++ b/app/src/main/res/menu/cab_thread.xml
@@ -15,27 +15,18 @@
         android:showAsAction="always"
         android:title="@string/share"
         app:showAsAction="always" />
+    <item
+        android:id="@+id/cab_save_as"
+        android:icon="@drawable/ic_save_vector"
+        android:showAsAction="ifRoom"
+        android:title="@string/save_as"
+        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/cab_delete"
         android:icon="@drawable/ic_delete_vector"
         android:showAsAction="always"
         android:title="@string/delete"
         app:showAsAction="always" />
-    <item
-        android:id="@+id/cab_save_as"
-        android:icon="@drawable/ic_save_vector"
-        android:title="@string/save_as"
-        app:showAsAction="ifRoom" />
-    <item
-        android:id="@+id/cab_properties"
-        android:icon="@drawable/ic_info_vector"
-        android:title="@string/properties"
-        app:showAsAction="ifRoom" />
-    <item
-        android:id="@+id/cab_restore"
-        android:showAsAction="never"
-        android:title="@string/restore"
-        app:showAsAction="never" />
     <item
         android:id="@+id/cab_forward_message"
         android:showAsAction="never"
@@ -49,6 +40,18 @@
     <item
         android:id="@+id/cab_select_all"
         android:icon="@drawable/ic_select_all_vector"
+        android:showAsAction="never"
         android:title="@string/select_all"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="never" />
+    <item
+        android:id="@+id/cab_properties"
+        android:icon="@drawable/ic_info_vector"
+        android:showAsAction="never"
+        android:title="@string/properties"
+        app:showAsAction="never" />
+    <item
+        android:id="@+id/cab_restore"
+        android:showAsAction="never"
+        android:title="@string/restore"
+        app:showAsAction="never" />
 </menu>
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index 93f2fb40..2ff1424b 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -16,11 +16,13 @@
     <item
         android:id="@+id/settings"
         android:icon="@drawable/ic_settings_cog_vector"
+        android:showAsAction="never"
         android:title="@string/settings"
         app:showAsAction="never" />
     <item
         android:id="@+id/about"
         android:icon="@drawable/ic_info_vector"
+        android:showAsAction="never"
         android:title="@string/about"
         app:showAsAction="never" />
 </menu>
diff --git a/app/src/main/res/menu/menu_thread.xml b/app/src/main/res/menu/menu_thread.xml
index e37ddee7..96afda49 100644
--- a/app/src/main/res/menu/menu_thread.xml
+++ b/app/src/main/res/menu/menu_thread.xml
@@ -2,59 +2,64 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:ignore="AppCompatResource">
-    <item
-        android:id="@+id/delete"
-        android:icon="@drawable/ic_delete_vector"
-        android:title="@string/delete"
-        app:showAsAction="always" />
+    tools:ignore="AppCompatResource,AlwaysShowAction">
     <item
         android:id="@+id/dial_number"
         android:icon="@drawable/ic_phone_vector"
+        android:showAsAction="always"
         android:title="@string/dial_number"
         app:showAsAction="always" />
-    <item
-        android:id="@+id/manage_people"
-        android:icon="@drawable/ic_add_person_vector"
-        android:title="@string/add_person"
-        app:showAsAction="always" />
-    <item
-        android:id="@+id/rename_conversation"
-        android:icon="@drawable/ic_edit_vector"
-        android:title="@string/rename_conversation"
-        app:showAsAction="always" />
     <item
         android:id="@+id/archive"
         android:icon="@drawable/ic_archive_vector"
+        android:showAsAction="always"
         android:title="@string/archive"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="always" />
     <item
         android:id="@+id/unarchive"
         android:icon="@drawable/ic_unarchive_vector"
+        android:showAsAction="always"
         android:title="@string/unarchive"
+        app:showAsAction="always" />
+    <item
+        android:id="@+id/manage_people"
+        android:icon="@drawable/ic_add_person_vector"
+        android:showAsAction="ifRoom"
+        android:title="@string/add_person"
         app:showAsAction="ifRoom" />
+    <item
+        android:id="@+id/add_number_to_contact"
+        android:title="@string/add_number_to_contact"
+        app:showAsAction="never" />
+    <item
+        android:id="@+id/rename_conversation"
+        android:showAsAction="never"
+        android:title="@string/rename_conversation"
+        app:showAsAction="never" />
     <item
         android:id="@+id/conversation_details"
         android:showAsAction="never"
         android:title="@string/conversation_details"
         app:showAsAction="never" />
     <item
-        android:id="@+id/add_number_to_contact"
-        android:title="@string/add_number_to_contact"
-        app:showAsAction="ifRoom" />
+        android:id="@+id/mark_as_unread"
+        android:showAsAction="never"
+        android:title="@string/mark_as_unread"
+        app:showAsAction="never" />
     <item
         android:id="@+id/block_number"
         android:showAsAction="never"
         android:title="@string/block_number"
         app:showAsAction="never" />
+    <item
+        android:id="@+id/delete"
+        android:icon="@drawable/ic_delete_vector"
+        android:showAsAction="never"
+        android:title="@string/delete"
+        app:showAsAction="never" />
     <item
         android:id="@+id/restore"
         android:showAsAction="never"
         android:title="@string/restore_all_messages"
         app:showAsAction="never" />
-    <item
-        android:id="@+id/mark_as_unread"
-        android:showAsAction="never"
-        android:title="@string/mark_as_unread"
-        app:showAsAction="never" />
 </menu>