mirror/Infinity-For-Reddit
3
0
Fork 0
mirror of https://github.com/Docile-Alligator/Infinity-For-Reddit.git synced 2026-02-05 07:35:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Offset inbox badge position. Fix badge number not updating.

Browse Source
This commit is contained in:
Docile-Alligator
2025-07-11 16:09:07 -04:00
parent 0d76c70034
commit ee8f5cd70c
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/ml/docilealligator/infinityforreddit/activities/MainActivity.java
View File

@ -1247,9 +1247,7 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
if (adapter != null) {
adapter.setInboxCount(inboxCount);
}
mHandler.post(() -> {
navigationWrapper.setInboxCount(this, inboxCount);
});
mHandler.post(() -> navigationWrapper.setInboxCount(this, inboxCount));
}
@Override

19
app/src/main/java/ml/docilealligator/infinityforreddit/customviews/NavigationWrapper.java
View File

@ -40,6 +40,8 @@ public class NavigationWrapper {
private int option3 = -1;
private int option4 = -1;
private int inboxCount;
public NavigationWrapper(BottomAppBar bottomAppBar, LinearLayout linearLayoutBottomAppBar,
ImageView option1BottomAppBar, ImageView option2BottomAppBar,
ImageView option3BottomAppBar, ImageView option4BottomAppBar,
@ -235,34 +237,37 @@ public class NavigationWrapper {
@ExperimentalBadgeUtils
public void setInboxCount(Context context, int inboxCount) {
if (inboxCount <= 0) {
return;
if (inboxCount < 0) {
this.inboxCount = Math.max(0, this.inboxCount + inboxCount);
} else {
this.inboxCount = inboxCount;
}
if (option1 == SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_OPTION_INBOX || option1 == SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_INBOX) {
if (navigationRailView == null) {
BadgeUtils.attachBadgeDrawable(getBadgeDrawable(context, inboxCount), option1BottomAppBar);
BadgeUtils.attachBadgeDrawable(getBadgeDrawable(context, inboxCount, option1BottomAppBar), option1BottomAppBar);
}
} else if (option2 == SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_OPTION_INBOX || option2 == SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_INBOX) {
if (navigationRailView == null) {
BadgeUtils.attachBadgeDrawable(getBadgeDrawable(context, inboxCount), option2BottomAppBar);
BadgeUtils.attachBadgeDrawable(getBadgeDrawable(context, inboxCount, option2BottomAppBar), option2BottomAppBar);
}
} else if (option3 == SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_OPTION_INBOX || option3 == SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_INBOX) {
if (navigationRailView == null) {
BadgeUtils.attachBadgeDrawable(getBadgeDrawable(context, inboxCount), option3BottomAppBar);
BadgeUtils.attachBadgeDrawable(getBadgeDrawable(context, inboxCount, option3BottomAppBar), option3BottomAppBar);
}
} else if (option4 == SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_OPTION_INBOX || option4 == SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_INBOX) {
if (navigationRailView == null) {
BadgeUtils.attachBadgeDrawable(getBadgeDrawable(context, inboxCount), option4BottomAppBar);
BadgeUtils.attachBadgeDrawable(getBadgeDrawable(context, inboxCount, option4BottomAppBar), option4BottomAppBar);
}
}
}
private BadgeDrawable getBadgeDrawable(Context context, int inboxCount) {
private BadgeDrawable getBadgeDrawable(Context context, int inboxCount, View anchorView) {
BadgeDrawable badgeDrawable = BadgeDrawable.create(context);
badgeDrawable.setNumber(inboxCount);
badgeDrawable.setBackgroundColor(customThemeWrapper.getColorPrimaryLightTheme());
badgeDrawable.setBadgeTextColor(customThemeWrapper.getButtonTextColor());
badgeDrawable.setHorizontalOffset(anchorView.getWidth() / 2);
return badgeDrawable;
}
}