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

Revert "refactor(notifications-tab/badge): use improved implementation"

Browse Source 
This reverts commit ac561549
This commit is contained in:
LucasGGamerM
2023-03-21 19:40:11 -03:00
parent d0e4578af0
commit 898fbcc52b
3 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
View File

@@ -47,7 +47,6 @@ public class GlobalUserPreferences{
public static boolean collapseLongPosts; public static boolean collapseLongPosts;
public static boolean spectatorMode; public static boolean spectatorMode;
public static boolean autoHideFab; public static boolean autoHideFab;
public static boolean unreadNotifications;
public static boolean defaultToUnlistedReplies; public static boolean defaultToUnlistedReplies;
public static boolean disableDoubleTapToSwipe; public static boolean disableDoubleTapToSwipe;
public static String publishButtonText; public static String publishButtonText;
@@ -104,7 +103,6 @@ public class GlobalUserPreferences{
collapseLongPosts=prefs.getBoolean("collapseLongPosts", true); collapseLongPosts=prefs.getBoolean("collapseLongPosts", true);
spectatorMode=prefs.getBoolean("spectatorMode", false); spectatorMode=prefs.getBoolean("spectatorMode", false);
autoHideFab=prefs.getBoolean("autoHideFab", true); autoHideFab=prefs.getBoolean("autoHideFab", true);
unreadNotifications=prefs.getBoolean("unreadNotifications", false);
defaultToUnlistedReplies=prefs.getBoolean("defaultToUnlistedReplies", false); defaultToUnlistedReplies=prefs.getBoolean("defaultToUnlistedReplies", false);
disableDoubleTapToSwipe=prefs.getBoolean("disableDoubleTapToSwipe", false); disableDoubleTapToSwipe=prefs.getBoolean("disableDoubleTapToSwipe", false);
publishButtonText=prefs.getString("publishButtonText", ""); publishButtonText=prefs.getString("publishButtonText", "");
@@ -156,7 +154,6 @@ public class GlobalUserPreferences{
.putBoolean("collapseLongPosts", collapseLongPosts) .putBoolean("collapseLongPosts", collapseLongPosts)
.putBoolean("spectatorMode", spectatorMode) .putBoolean("spectatorMode", spectatorMode)
.putBoolean("autoHideFab", autoHideFab) .putBoolean("autoHideFab", autoHideFab)
.putBoolean("unreadNotifications", unreadNotifications)
.putString("publishButtonText", publishButtonText) .putString("publishButtonText", publishButtonText)
.putBoolean("bottomEncoding", bottomEncoding) .putBoolean("bottomEncoding", bottomEncoding)
.putBoolean("defaultToUnlistedReplies", defaultToUnlistedReplies) .putBoolean("defaultToUnlistedReplies", defaultToUnlistedReplies)

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

@@ -89,8 +89,6 @@ public class PushNotificationReceiver extends BroadcastReceiver{
@Override @Override
public void onSuccess(org.joinmastodon.android.model.Notification result){ public void onSuccess(org.joinmastodon.android.model.Notification result){
MastodonAPIController.runInBackground(()->PushNotificationReceiver.this.notify(context, pn, accountID, result)); MastodonAPIController.runInBackground(()->PushNotificationReceiver.this.notify(context, pn, accountID, result));
GlobalUserPreferences.unreadNotifications = true;
GlobalUserPreferences.save();
} }
@Override @Override

20
mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
View File

@@ -58,6 +58,7 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
private View tabBarWrap; private View tabBarWrap;
private ImageView tabBarAvatar; private ImageView tabBarAvatar;
private ImageView notificationTabIcon; private ImageView notificationTabIcon;
private boolean notificationBadged = false;
@IdRes @IdRes
private int currentTab=R.id.tab_home; private int currentTab=R.id.tab_home;
@@ -124,7 +125,21 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
ViewImageLoader.load(tabBarAvatar, null, new UrlImageLoaderRequest(self.avatar, V.dp(28), V.dp(28))); ViewImageLoader.load(tabBarAvatar, null, new UrlImageLoaderRequest(self.avatar, V.dp(28), V.dp(28)));
notificationTabIcon=content.findViewById(R.id.tab_notifications); notificationTabIcon=content.findViewById(R.id.tab_notifications);
AccountSessionManager.getInstance()
.getAccount(accountID).getCacheController()
.getNotifications(null, 1, false, false, true, new Callback<>() {
@Override
public void onSuccess(PaginatedResponse<List<Notification>> result) {
notificationBadged = result.items.get(0).createdAt.isAfter(Instant.ofEpochMilli(GlobalUserPreferences.lastNotificationOpenedTime));
setNotificationBadge(); setNotificationBadge();
}
@Override
public void onError(ErrorResponse error) {
error.showToast(getContext());
}
});
if(savedInstanceState==null){ if(savedInstanceState==null){
getChildFragmentManager().beginTransaction() getChildFragmentManager().beginTransaction()
@@ -268,7 +283,8 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
} }
if(tab == R.id.tab_notifications){ if(tab == R.id.tab_notifications){
GlobalUserPreferences.unreadNotifications = false; notificationBadged=false;
GlobalUserPreferences.lastNotificationOpenedTime = System.currentTimeMillis();
GlobalUserPreferences.save(); GlobalUserPreferences.save();
setNotificationBadge(); setNotificationBadge();
} }
@@ -354,6 +370,6 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
} }
private void setNotificationBadge() { private void setNotificationBadge() {
notificationTabIcon.setImageDrawable(getContext().getDrawable(GlobalUserPreferences.unreadNotifications ? R.drawable.ic_notifications_tab_badged : R.drawable.ic_fluent_alert_28_selector)); notificationTabIcon.setImageDrawable(getContext().getDrawable(notificationBadged ? R.drawable.ic_notifications_tab_badged : R.drawable.ic_fluent_alert_28_selector));
} }
} }