From 04a3fe2f4c920d9f9a52ce648d33377da075f973 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Thu, 30 Mar 2023 17:52:35 -0400 Subject: [PATCH] Groups Notifications on Double click in the navigation row. --- .../com/vitorpamplona/amethyst/ui/screen/CardFeedViewModel.kt | 1 + .../amethyst/ui/screen/loggedIn/NotificationScreen.kt | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedViewModel.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedViewModel.kt index 9095dc023..65defcd94 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedViewModel.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedViewModel.kt @@ -173,6 +173,7 @@ open class CardFeedViewModel(val dataSource: FeedFilter) : ViewModel() { } fun clear() { + lastAccount = null lastNotes = null } diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/NotificationScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/NotificationScreen.kt index dfba51058..96149588d 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/NotificationScreen.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/NotificationScreen.kt @@ -30,6 +30,10 @@ fun NotificationScreen( val accountState by accountViewModel.accountLiveData.observeAsState() val account = accountState?.account ?: return + if (scrollToTop) { + notifFeedViewModel.clear() + } + LaunchedEffect(accountViewModel) { NotificationFeedFilter.account = account notifFeedViewModel.invalidateData()