move all chat menu items to a single .xml file to allow grouping

This commit is contained in:
B. Petersen
2024-07-26 23:11:17 +02:00
committed by bjoern
parent 71e8a6a847
commit 00e76ab7a7
6 changed files with 15 additions and 36 deletions
@@ -440,10 +440,9 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
@Override
public boolean onPrepareOptionsMenu(Menu menu) {
MenuInflater inflater = this.getMenuInflater();
menu.clear();
inflater.inflate(R.menu.conversation, menu);
getMenuInflater().inflate(R.menu.conversation, menu);
if (dcChat.isSelfTalk() || dcChat.isBroadcast()) {
menu.findItem(R.id.menu_mute_notifications).setVisible(false);
@@ -465,18 +464,14 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
if (isMultiUser()) {
if (dcChat.canSend() && !dcChat.isBroadcast() && !dcChat.isMailingList()) {
inflater.inflate(R.menu.conversation_push_group_options, menu);
menu.findItem(R.id.menu_leave).setVisible(true);
}
}
inflater.inflate(R.menu.conversation_archive, menu);
if (isArchived()) {
menu.findItem(R.id.menu_archive_chat).setTitle(R.string.menu_unarchive_chat);
}
inflater.inflate(R.menu.conversation_clear, menu);
inflater.inflate(R.menu.conversation_delete, menu);
try {
MenuItem searchItem = menu.findItem(R.id.menu_search_chat);
searchItem.setOnActionExpandListener(new MenuItem.OnActionExpandListener() {
+13
View File
@@ -42,4 +42,17 @@
<item android:title="@string/menu_add_attachment"
android:id="@+id/menu_add_attachment" />
<item android:id="@+id/menu_leave"
android:visible="false"
android:title="@string/menu_leave_group"/>
<item android:title="@string/menu_archive_chat"
android:id="@+id/menu_archive_chat"/>
<item android:title="@string/clear_chat"
android:id="@+id/menu_clear_chat"/>
<item android:title="@string/menu_delete_chat"
android:id="@+id/menu_delete_chat"/>
</menu>
@@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:title="@string/menu_archive_chat"
android:id="@+id/menu_archive_chat"/>
</menu>
-7
View File
@@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:title="@string/clear_chat"
android:id="@+id/menu_clear_chat"/>
</menu>
@@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:title="@string/menu_delete_chat"
android:id="@+id/menu_delete_chat"/>
</menu>
@@ -1,8 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<item android:id="@+id/menu_leave"
android:title="@string/menu_leave_group"
app:showAsAction="collapseActionView"/>
</menu>