fix issue with too-wide context menu icons

closes #893
sk22 · Oct 22, 2023 · 3cf2347 · 3cf2347
1 parent 9f0ff2d
commit 3cf2347
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 11 deletions.
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java
@@ -546,7 +546,8 @@ private void updateOptionsMenu(){
 				follow.setIcon(following ? R.drawable.ic_fluent_person_delete_24_regular : R.drawable.ic_fluent_person_add_24_regular);
 				manageUserLists.setVisible(relationship != null && relationship.following);
 				manageUserLists.setTitle(item.parentFragment.getString(R.string.sk_lists_with_user, username));
-				UiUtils.insetPopupMenuIcon(item.parentFragment.getContext(), follow);
+				// ic_fluent_person_add_24_regular actually has a width of 25dp -.-
+				UiUtils.insetPopupMenuIcon(item.parentFragment.getContext(), follow, following ? 0 : V.dp(-1));
 			}
 
 			workaroundChangingMenuItemWidths(menu, username);

diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
@@ -906,17 +906,26 @@ public static Bitmap getBitmapFromDrawable(Drawable d) {
 	}
 
 	public static void insetPopupMenuIcon(Context context, MenuItem item) {
+		insetPopupMenuIcon(context, item, 0);
+	}
+
+	public static void insetPopupMenuIcon(Context context, MenuItem item, int addWidth) {
 		ColorStateList iconTint = ColorStateList.valueOf(UiUtils.getThemeColor(context, android.R.attr.textColorSecondary));
-		insetPopupMenuIcon(item, iconTint);
+		insetPopupMenuIcon(item, iconTint, addWidth);
 	}
 
-	public static void insetPopupMenuIcon(MenuItem item, ColorStateList iconTint) {
-		Drawable icon = item.getIcon().mutate();
-		if (Build.VERSION.SDK_INT >= 26) item.setIconTintList(iconTint);
+	/**
+	 * @param addWidth set if icon is too wide/narrow. if icon is 25dp in width, set to -1dp
+	 */
+	public static void insetPopupMenuIcon(MenuItem item, ColorStateList iconTint, int addWidth) {
+		Drawable icon=item.getIcon().mutate();
+		if(Build.VERSION.SDK_INT>=26) item.setIconTintList(iconTint);
 		else icon.setTintList(iconTint);
-		icon = new InsetDrawable(icon, V.dp(8), 0, V.dp(8), 0);
+		int pad=V.dp(8);
+		boolean rtl=icon.getLayoutDirection()==View.LAYOUT_DIRECTION_RTL;
+		icon=new InsetDrawable(icon, rtl ? pad+addWidth : pad, 0, rtl ? pad : addWidth+pad, 0);
 		item.setIcon(icon);
-		SpannableStringBuilder ssb = new SpannableStringBuilder(item.getTitle());
+ 		SpannableStringBuilder ssb = new SpannableStringBuilder(item.getTitle());
 		item.setTitle(ssb);
 	}
 
@@ -950,7 +959,7 @@ public static void enableMenuIcons(Context context, Menu m, @IdRes int... exclud
 			if (subMenu != null) enableMenuIcons(context, subMenu, exclude);
 			if (item.getIcon() == null || Arrays.stream(exclude).anyMatch(id -> id == item.getItemId()))
 				continue;
-			insetPopupMenuIcon(item, iconTint);
+			insetPopupMenuIcon(item, iconTint, 0);
 		}
 	}
 

diff --git a/mastodon/src/main/res/drawable/ic_fluent_prohibited_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_prohibited_24_regular.xml