From 9f394900a725c74034079b0f0676a2085a0f1944 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Thu, 25 May 2023 18:30:15 -0400 Subject: [PATCH] Only scrolls to the top if not at the top --- .../java/com/vitorpamplona/amethyst/ui/screen/CardFeedView.kt | 4 +++- .../java/com/vitorpamplona/amethyst/ui/screen/FeedView.kt | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedView.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedView.kt index 341f93f91..fe85aaa2d 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedView.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedView.kt @@ -104,7 +104,9 @@ private fun FeedLoaded( if (scrollToTop) { LaunchedEffect(Unit) { - listState.scrollToItem(index = 0) + if (listState.firstVisibleItemIndex > 0 || listState.firstVisibleItemScrollOffset > 0) { + listState.scrollToItem(index = 0) + } } } diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedView.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedView.kt index 72a7b3194..08d0fe524 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedView.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedView.kt @@ -119,7 +119,9 @@ private fun FeedLoaded( if (scrollToTop) { LaunchedEffect(Unit) { - listState.scrollToItem(index = 0) + if (listState.firstVisibleItemIndex > 0 || listState.firstVisibleItemScrollOffset > 0) { + listState.scrollToItem(index = 0) + } } }