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

re-organize menu and add pencil icon

Browse Source
This commit is contained in:
adbenitez
2025-02-20 20:19:56 +01:00
parent e3c108c773
commit 7b11c5dd79
2 changed files with 46 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/org/thoughtcrime/securesms/util/views/ConversationAdaptiveActionsToolbar.java
+9 -16
View File
@@ -23,11 +23,10 @@ public class ConversationAdaptiveActionsToolbar extends Toolbar {
private static final int ACTION_VIEW_WIDTH_DP = 48;
private static final int OVERFLOW_VIEW_WIDTH_DP = 36;
private static final int ID_NEVER_SHOW_AS_ACTION_1 = R.id.menu_context_reply_privately;
private static final int ID_NEVER_SHOW_AS_ACTION_2 = R.id.menu_add_to_home_screen;
private static final int ID_NEVER_SHOW_AS_ACTION_3 = R.id.menu_context_save_attachment;
private static final int ID_NEVER_SHOW_AS_ACTION_4 = R.id.menu_resend;
private static final int ID_ALWAYS_SHOW_AS_ACTION = R.id.menu_context_forward;
private static final int ID_ACTION_1 = R.id.menu_context_edit;
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 final int maxShown;
@@ -74,21 +73,15 @@ public class ConversationAdaptiveActionsToolbar extends Toolbar {
nItemsToShow = Math.min(maxToShow, widthAllowed / ViewUtil.dpToPx(ACTION_VIEW_WIDTH_DP));
menu.findItem(ID_ALWAYS_SHOW_AS_ACTION).setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
nItemsToShow--;
for (int i = 0; i < menu.size(); i++) {
MenuItem item = menu.getItem(i);
boolean neverShowAsAction = item.getItemId() == ID_NEVER_SHOW_AS_ACTION_1
|| item.getItemId() == ID_NEVER_SHOW_AS_ACTION_2
|| item.getItemId() == ID_NEVER_SHOW_AS_ACTION_3
|| item.getItemId() == ID_NEVER_SHOW_AS_ACTION_4;
boolean alwaysShowAsAction = item.getItemId() == ID_ALWAYS_SHOW_AS_ACTION;
boolean showAsAction = item.getItemId() == ID_ACTION_1
|| item.getItemId() == ID_ACTION_2
|| item.getItemId() == ID_ACTION_3
|| item.getItemId() == ID_ACTION_4;
if (alwaysShowAsAction) continue;
if (item.isVisible() && nItemsToShow > 0 && !neverShowAsAction) {
if (showAsAction && item.isVisible() && nItemsToShow > 0) {
item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
nItemsToShow--;
} else {