mirror of
https://github.com/ArcaneChat/android.git
synced 2026-07-03 14:05:24 +02:00
move all chat menu items to a single .xml file to allow grouping
This commit is contained in:
@@ -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() {
|
||||
|
||||
Reference in New Issue
Block a user