From 7fe522307af5e47ab3ade716aee03f4426195db5 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Fri, 29 Nov 2024 15:12:54 -0500 Subject: [PATCH] Fixes the bug on not having the video feed at the top when loading the app from scratch. --- .../ui/feeds/RememberForeverStates.kt | 24 +++++++++---------- .../amethyst/ui/feeds/WatchScrollToTop.kt | 2 -- .../ui/screen/loggedIn/video/VideoScreen.kt | 2 +- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/feeds/RememberForeverStates.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/feeds/RememberForeverStates.kt index a164733ce..5dcff2e06 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/feeds/RememberForeverStates.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/feeds/RememberForeverStates.kt @@ -38,21 +38,19 @@ private data class ScrollState( ) object ScrollStateKeys { - const val GLOBAL_SCREEN = "Global" - const val NOTIFICATION_SCREEN = "Notifications" - const val VIDEO_SCREEN = "Video" - const val DISCOVER_SCREEN = "Discover" - val HOME_FOLLOWS = Route.Home.base + "Follows" - val HOME_REPLIES = Route.Home.base + "FollowsReplies" - val PROFILE_GALLERY = Route.Home.base + "ProfileGallery" + const val NOTIFICATION_SCREEN = "NotificationsFeed" + const val VIDEO_SCREEN = "VideoFeed" + val HOME_FOLLOWS = Route.Home.base + "FollowsFeed" + val HOME_REPLIES = Route.Home.base + "FollowsRepliesFeed" + val PROFILE_GALLERY = Route.Home.base + "ProfileGalleryFeed" - val DRAFTS = Route.Home.base + "Drafts" + val DRAFTS = Route.Home.base + "DraftsFeed" - val DISCOVER_CONTENT = Route.Home.base + "DiscoverContent" - val DISCOVER_MARKETPLACE = Route.Home.base + "Marketplace" - val DISCOVER_LIVE = Route.Home.base + "Live" - val DISCOVER_COMMUNITY = Route.Home.base + "Communities" - val DISCOVER_CHATS = Route.Home.base + "Chats" + val DISCOVER_CONTENT = Route.Home.base + "DiscoverContentFeed" + val DISCOVER_MARKETPLACE = Route.Home.base + "MarketplaceFeed" + val DISCOVER_LIVE = Route.Home.base + "LiveFeed" + val DISCOVER_COMMUNITY = Route.Home.base + "CommunitiesFeed" + val DISCOVER_CHATS = Route.Home.base + "ChatsFeed" } object PagerStateKeys { 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 d1965e062..04b1a8d79 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 @@ -20,7 +20,6 @@ */ package com.vitorpamplona.amethyst.ui.feeds -import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.lazy.LazyListState import androidx.compose.foundation.lazy.grid.LazyGridState import androidx.compose.foundation.pager.PagerState @@ -75,7 +74,6 @@ fun WatchScrollToTop( } } -@OptIn(ExperimentalFoundationApi::class) @Composable fun WatchScrollToTop( videoFeedContentState: FeedContentState, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/video/VideoScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/video/VideoScreen.kt index 6e6b48726..66e272c3c 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/video/VideoScreen.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/video/VideoScreen.kt @@ -249,7 +249,7 @@ fun SlidingCarousel( val pagerState = if (pagerStateKey != null) { - rememberForeverPagerState(pagerStateKey, items.list.size) { items.list.size } + rememberForeverPagerState(pagerStateKey) { items.list.size } } else { rememberPagerState(items.list.size) { items.list.size } }