awesome-bookmarks/arcanechat-android
3
0
Fork 0
mirror of https://github.com/ArcaneChat/android.git synced 2026-07-03 14:05:24 +02:00
Code Issues Packages Projects Releases 3 Wiki Activity

show trash/delete icon when selecting a message

Browse Source
This commit is contained in:
adbenitez
2025-03-02 02:09:32 +01:00
parent 823e6b6e1f
commit f0fb8e62f8
3 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/org/thoughtcrime/securesms/ConversationFragment.java
+6 -6
View File
@@ -324,7 +324,7 @@ public class ConversationFragment extends MessageSelectorFragment
if (messageRecords.size() > 1) {
menu.findItem(R.id.menu_context_details).setVisible(false);
menu.findItem(R.id.menu_context_share).setVisible(false);
menu.findItem(R.id.menu_context_reply).setVisible(false);
//menu.findItem(R.id.menu_context_reply).setVisible(false);
menu.findItem(R.id.menu_context_edit).setVisible(false);
menu.findItem(R.id.menu_context_reply_privately).setVisible(false);
menu.findItem(R.id.menu_add_to_home_screen).setVisible(false);
@@ -334,7 +334,7 @@ public class ConversationFragment extends MessageSelectorFragment
menu.findItem(R.id.menu_context_details).setVisible(true);
menu.findItem(R.id.menu_context_share).setVisible(messageRecord.hasFile());
boolean canReply = canReplyToMsg(messageRecord);
menu.findItem(R.id.menu_context_reply).setVisible(chat.canSend() && canReply);
//menu.findItem(R.id.menu_context_reply).setVisible(chat.canSend() && canReply);
boolean canEdit = canEditMsg(messageRecord);
menu.findItem(R.id.menu_context_edit).setVisible(chat.canSend() && canEdit);
boolean showReplyPrivately = !dcContext.isCommunity() && chat.isMultiUser() && !messageRecord.isOutgoing() && canReply;
@@ -995,10 +995,10 @@ public class ConversationFragment extends MessageSelectorFragment
} else if (itemId == R.id.menu_context_save_attachment) {
handleSaveAttachment(getListAdapter().getSelectedItems());
return true;
} else if (itemId == R.id.menu_context_reply) {
handleReplyMessage(getSelectedMessageRecord(getListAdapter().getSelectedItems()));
actionMode.finish();
return true;
// } else if (itemId == R.id.menu_context_reply) {
// handleReplyMessage(getSelectedMessageRecord(getListAdapter().getSelectedItems()));
// actionMode.finish();
// return true;
} else if (itemId == R.id.menu_context_edit) {
handleEditMessage(getSelectedMessageRecord(getListAdapter().getSelectedItems()));
actionMode.finish();
src/main/java/org/thoughtcrime/securesms/util/views/ConversationAdaptiveActionsToolbar.java
+3 -1
View File
@@ -27,6 +27,7 @@ public class ConversationAdaptiveActionsToolbar extends Toolbar {
private static final int ID_ACTION_2 = R.id.menu_context_copy;
private static final int ID_ACTION_3 = R.id.menu_context_share;
private static final int ID_ACTION_4 = R.id.menu_context_forward;
private static final int ID_ACTION_5 = R.id.menu_context_delete_message;
private final int maxShown;
@@ -79,7 +80,8 @@ public class ConversationAdaptiveActionsToolbar extends Toolbar {
boolean showAsAction = item.getItemId() == ID_ACTION_1
|| item.getItemId() == ID_ACTION_2
|| item.getItemId() == ID_ACTION_3
|| item.getItemId() == ID_ACTION_4;
|| item.getItemId() == ID_ACTION_4
|| item.getItemId() == ID_ACTION_5;
if (showAsAction && item.isVisible() && nItemsToShow > 0) {
item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
src/main/res/menu/conversation_context.xml
+8 -8
View File
@@ -20,6 +20,11 @@
android:icon="?menu_forward_icon"
app:showAsAction="ifRoom" />
<item android:title="@string/delete"
android:id="@+id/menu_context_delete_message"
android:icon="?menu_trash_icon"
app:showAsAction="ifRoom" />
<item android:title="@string/add_to_home_screen"
android:id="@+id/menu_add_to_home_screen"
android:visible="false"
@@ -34,9 +39,9 @@
android:id="@+id/menu_context_details"
app:showAsAction="never" />
<item android:title="@string/notify_reply_button"
android:id="@+id/menu_context_reply"
app:showAsAction="never" />
<!-- <item android:title="@string/notify_reply_button" -->
<!-- android:id="@+id/menu_context_reply" -->
<!-- app:showAsAction="never" /> -->
<item android:title="@string/reply_privately"
android:id="@+id/menu_context_reply_privately"
@@ -46,11 +51,6 @@
android:id="@+id/menu_resend"
app:showAsAction="never" />
<item android:title="@string/delete"
android:id="@+id/menu_context_delete_message"
android:icon="?menu_trash_icon"
app:showAsAction="never" />
<!-- The `showAsAction` behaviors are managed by
ConversationAdaptiveActionsToolbar. The `app:showAsAction`
values set here don't actually make a difference.-->