owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'FineFindus/fix/home-overflow-menu-visibility'

Browse Source 
# Conflicts:
#	mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
This commit is contained in:
LucasGGamerM
2023-03-10 16:06:01 -03:00
parent 2531015094 2efdf09333
commit 7460b24fb0
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java
View File

@@ -358,7 +358,7 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
addListsToOverflowMenu(); addListsToOverflowMenu();
addHashtagsToOverflowMenu(); addHashtagsToOverflowMenu();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && !UiUtils.isEMUI()) {
m.setGroupDividerEnabled(true); m.setGroupDividerEnabled(true);
} }
} }

14
mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
View File

@@ -1177,7 +1177,19 @@ public class UiUtils{
return !TextUtils.isEmpty(getSystemProperty("ro.miui.ui.version.code")); return !TextUtils.isEmpty(getSystemProperty("ro.miui.ui.version.code"));
} }
public static boolean pickAccountForCompose(Activity activity, String accountID, String prefilledText){ public static boolean isEMUI() {
return !TextUtils.isEmpty(getSystemProperty("ro.build.version.emui"));
}
public static int alphaBlendColors(int color1, int color2, float alpha) {
float alpha0 = 1f - alpha;
int r = Math.round(((color1 >> 16) & 0xFF) * alpha0 + ((color2 >> 16) & 0xFF) * alpha);
int g = Math.round(((color1 >> 8) & 0xFF) * alpha0 + ((color2 >> 8) & 0xFF) * alpha);
int b = Math.round((color1 & 0xFF) * alpha0 + (color2 & 0xFF) * alpha);
return 0xFF000000 | (r << 16) | (g << 8) | b;
}
public static boolean pickAccountForCompose(Activity activity, String accountID, String prefilledText) {
Bundle args = new Bundle(); Bundle args = new Bundle();
if (prefilledText != null) args.putString("prefilledText", prefilledText); if (prefilledText != null) args.putString("prefilledText", prefilledText);
return pickAccountForCompose(activity, accountID, args); return pickAccountForCompose(activity, accountID, args);