Merge pull request #422 from FineFindus/fix/honor-group-divider

fix: disable GroupDivider on Honor's MagicOS
LucasGGamerM · Jun 9, 2024 · 4f11a79 · 4f11a79
2 parents c8f2e7a + 7ab920d
commit 4f11a79
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
@@ -1663,7 +1663,7 @@ private void buildVisibilityPopup(View v){
  }
  }
  UiUtils.enablePopupMenuIcons(getActivity(), visibilityPopup);
- if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.P && !UiUtils.isEMUI()) m.setGroupDividerEnabled(true);
+ if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.P && !UiUtils.isEMUI() && !UiUtils.isMagic()) m.setGroupDividerEnabled(true);
  visibilityPopup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener(){
  @Override
  public boolean onMenuItemClick(MenuItem item){

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java
@@ -408,7 +408,7 @@ private void updateOverflowMenu() {
  addListsToOverflowMenu();
  addHashtagsToOverflowMenu();
 
- if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.P && !UiUtils.isEMUI())
+ if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.P && !UiUtils.isEMUI() && !UiUtils.isMagic())
  m.setGroupDividerEnabled(true);
  }
 

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
@@ -179,7 +179,7 @@ protected Holder(Activity activity, @LayoutRes int layout, ViewGroup parent){
 
  optionsMenu=new PopupMenu(activity, more);
  optionsMenu.inflate(R.menu.post);
- if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.P && !UiUtils.isEMUI())
+ if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.P && !UiUtils.isEMUI() && !UiUtils.isMagic())
  optionsMenu.getMenu().setGroupDividerEnabled(true);
  optionsMenu.setOnMenuItemClickListener(menuItem->{
  Account account=item.user;

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
@@ -1530,6 +1530,10 @@ public static boolean isEMUI() {
  return !TextUtils.isEmpty(getSystemProperty("ro.build.version.emui"));
  }
 
+ public static boolean isMagic() {
+ return !TextUtils.isEmpty(getSystemProperty("ro.build.version.magic"));
+ }
+
  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);

diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/viewholders/AccountViewHolder.java b/mastodon/src/main/java/org/joinmastodon/android/ui/viewholders/AccountViewHolder.java
@@ -113,7 +113,7 @@ public AccountViewHolder(Fragment fragment, ViewGroup list, HashMap<String, Rela
  contextMenu.inflate(R.menu.profile);
  contextMenu.setOnMenuItemClickListener(this::onContextMenuItemSelected);
  menuButton.setOnClickListener(v->showMenuFromButton());
- if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.P && !UiUtils.isEMUI())
+ if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.P && !UiUtils.isEMUI() && !UiUtils.isMagic())
  contextMenu.getMenu().setGroupDividerEnabled(true);
  UiUtils.enablePopupMenuIcons(fragment.getContext(), contextMenu);