diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/feeds/FeedContentState.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/feeds/FeedContentState.kt index f84a96c83..4b4670378 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/feeds/FeedContentState.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/feeds/FeedContentState.kt @@ -50,7 +50,7 @@ class FeedContentState( // Simple counter that changes when it needs to invalidate everything private val _scrollToTop = MutableStateFlow(0) val scrollToTop = _scrollToTop.asStateFlow() - var scrolltoTopPending = false + var scrollToTopPending = false private var lastFeedKey: Any? = null @@ -59,14 +59,14 @@ class FeedContentState( val lastNoteCreatedAtWhenFullyLoaded = MutableStateFlow(null) fun sendToTop() { - if (scrolltoTopPending) return + if (scrollToTopPending) return - scrolltoTopPending = true + scrollToTopPending = true viewModelScope.launch(Dispatchers.IO) { _scrollToTop.emit(_scrollToTop.value + 1) } } suspend fun sentToTop() { - scrolltoTopPending = false + scrollToTopPending = false } private fun refresh() { @@ -128,7 +128,8 @@ class FeedContentState( fun deleteFromFeed(deletedNotes: Set) { val feed = _feedContent.value if (feed is FeedState.Loaded) { - updateFeed((feed.feed.value.list - deletedNotes).toImmutableList()) + val notes = (feed.feed.value.list - deletedNotes).toImmutableList() + updateFeed(notes) } } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/feeds/WatchScrollToTop.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/feeds/WatchScrollToTop.kt index a35b9d88e..ebb6964e9 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/feeds/WatchScrollToTop.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/feeds/WatchScrollToTop.kt @@ -37,7 +37,7 @@ fun WatchScrollToTop( val scrollToTop by feedContentState.scrollToTop.collectAsStateWithLifecycle() LaunchedEffect(scrollToTop) { - if (scrollToTop > 0 && feedContentState.scrolltoTopPending) { + if (scrollToTop > 0 && feedContentState.scrollToTopPending) { listState.scrollToItem(index = 0) feedContentState.sentToTop() } @@ -52,7 +52,7 @@ fun WatchScrollToTop( val scrollToTop by feedContentState.scrollToTop.collectAsStateWithLifecycle() LaunchedEffect(scrollToTop) { - if (scrollToTop > 0 && feedContentState.scrolltoTopPending) { + if (scrollToTop > 0 && feedContentState.scrollToTopPending) { listState.scrollToItem(index = 0) feedContentState.sentToTop() } @@ -82,7 +82,7 @@ fun WatchScrollToTop( val scrollToTop by videoFeedContentState.scrollToTop.collectAsStateWithLifecycle() LaunchedEffect(scrollToTop) { - if (scrollToTop > 0 && videoFeedContentState.scrolltoTopPending) { + if (scrollToTop > 0 && videoFeedContentState.scrollToTopPending) { pagerState.scrollToPage(page = 0) videoFeedContentState.sentToTop() }