TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-26 05:55:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix AdaptiveActionsToolbar sizing algorithm.

Browse Source
This commit is contained in:
Alex Hart
2020-04-01 11:26:19 -03:00
committed by GitHub
parent 520658e1b8
commit 9fe3026941
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/org/thoughtcrime/securesms/util/views/AdaptiveActionsToolbar.java
View File

@@ -29,9 +29,9 @@ import org.thoughtcrime.securesms.util.ViewUtil;
*/ */
public class AdaptiveActionsToolbar extends Toolbar { public class AdaptiveActionsToolbar extends Toolbar {
private static final int NAVIGATION_SP = 48; private static final int NAVIGATION_DP = 56;
private static final int ACTION_VIEW_WIDTH_SP = 42; private static final int ACTION_VIEW_WIDTH_DP = 48;
private static final int OVERFLOW_VIEW_WIDTH_SP = 35; private static final int OVERFLOW_VIEW_WIDTH_DP = 36;
private int maxShown; private int maxShown;
@@ -63,24 +63,23 @@ public class AdaptiveActionsToolbar extends Toolbar {
public static void adjustMenuActions(@NonNull Menu menu, int maxToShow, int toolbarWidthPx) { public static void adjustMenuActions(@NonNull Menu menu, int maxToShow, int toolbarWidthPx) {
int menuSize = menu.size(); int menuSize = menu.size();
int widthAllowed = toolbarWidthPx - ViewUtil.spToPx(NAVIGATION_SP); int widthAllowed = toolbarWidthPx - ViewUtil.dpToPx(NAVIGATION_DP);
int nItemsToShow = Math.min(maxToShow, Math.round(widthAllowed / ViewUtil.spToPx(ACTION_VIEW_WIDTH_SP))); int nItemsToShow = Math.min(maxToShow, widthAllowed / ViewUtil.dpToPx(ACTION_VIEW_WIDTH_DP));
if (nItemsToShow < menuSize) { if (nItemsToShow < menuSize) {
widthAllowed -= ViewUtil.spToPx(OVERFLOW_VIEW_WIDTH_SP); widthAllowed -= ViewUtil.dpToPx(OVERFLOW_VIEW_WIDTH_DP);
} }
nItemsToShow = Math.min(maxToShow, Math.round(widthAllowed / ViewUtil.spToPx(ACTION_VIEW_WIDTH_SP))); nItemsToShow = Math.min(maxToShow, widthAllowed / ViewUtil.dpToPx(ACTION_VIEW_WIDTH_DP));
for (int i = 0; i < menu.size(); i++) { for (int i = 0; i < menu.size(); i++) {
MenuItem item = menu.getItem(i); MenuItem item = menu.getItem(i);
if (nItemsToShow > 0) { if (item.isVisible() && nItemsToShow > 0) {
item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
nItemsToShow--;
} else { } else {
item.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER); item.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
} }
nItemsToShow--;
} }
} }
} }