fix mark all read button

sk22 · Jun 27, 2023 · 5754c62 · 5754c62
1 parent c101813
commit 5754c62
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java
@@ -132,8 +132,8 @@ private void markAsRead(){
 		}
 	}
 
-	private void updateMarkAllReadButton(){
-		markAllReadItem.setEnabled(!allNotificationsFragment.getData().isEmpty() &&
+	public void updateMarkAllReadButton(){
+		markAllReadItem.setVisible(!allNotificationsFragment.getData().isEmpty() &&
 				!realUnreadMarker.equals(allNotificationsFragment.getData().get(0).id));
 	}
 

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java
@@ -116,6 +116,9 @@ public void onSuccess(PaginatedResponse<List<Notification>> result){
 						onDataLoaded(result.items.stream().filter(n->n.type!=null).collect(Collectors.toList()), !result.items.isEmpty());
 						maxID=result.maxID;
 						reloadingFromCache=false;
+						if (getParentFragment() instanceof NotificationsFragment nf) {
+							nf.updateMarkAllReadButton();
+						}
 					}
 				});
 	}
@@ -300,6 +303,7 @@ public void onRefresh(){
 		if (getParentFragment() instanceof NotificationsFragment nf) {
 			AccountSessionManager.get(accountID).reloadNotificationsMarker(m->{
 				nf.unreadMarker=nf.realUnreadMarker=m;
+				nf.updateMarkAllReadButton();
 			});
 		}
 	}