highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-09-28 03:36:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes the bug on not having the video feed at the top when loading the app from scratch.

Browse Source
This commit is contained in:
Vitor Pamplona
2024-11-29 15:12:54 -05:00
parent 9660c739f3
commit 7fe522307a
3 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/feeds/RememberForeverStates.kt
View File

@@ -38,21 +38,19 @@ private data class ScrollState(
) )
object ScrollStateKeys { object ScrollStateKeys {
const val GLOBAL_SCREEN = "Global" const val NOTIFICATION_SCREEN = "NotificationsFeed"
const val NOTIFICATION_SCREEN = "Notifications" const val VIDEO_SCREEN = "VideoFeed"
const val VIDEO_SCREEN = "Video" val HOME_FOLLOWS = Route.Home.base + "FollowsFeed"
const val DISCOVER_SCREEN = "Discover" val HOME_REPLIES = Route.Home.base + "FollowsRepliesFeed"
val HOME_FOLLOWS = Route.Home.base + "Follows" val PROFILE_GALLERY = Route.Home.base + "ProfileGalleryFeed"
val HOME_REPLIES = Route.Home.base + "FollowsReplies"
val PROFILE_GALLERY = Route.Home.base + "ProfileGallery"
val DRAFTS = Route.Home.base + "Drafts" val DRAFTS = Route.Home.base + "DraftsFeed"
val DISCOVER_CONTENT = Route.Home.base + "DiscoverContent" val DISCOVER_CONTENT = Route.Home.base + "DiscoverContentFeed"
val DISCOVER_MARKETPLACE = Route.Home.base + "Marketplace" val DISCOVER_MARKETPLACE = Route.Home.base + "MarketplaceFeed"
val DISCOVER_LIVE = Route.Home.base + "Live" val DISCOVER_LIVE = Route.Home.base + "LiveFeed"
val DISCOVER_COMMUNITY = Route.Home.base + "Communities" val DISCOVER_COMMUNITY = Route.Home.base + "CommunitiesFeed"
val DISCOVER_CHATS = Route.Home.base + "Chats" val DISCOVER_CHATS = Route.Home.base + "ChatsFeed"
} }
object PagerStateKeys { object PagerStateKeys {

2
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/feeds/WatchScrollToTop.kt
View File

@@ -20,7 +20,6 @@
*/ */
package com.vitorpamplona.amethyst.ui.feeds package com.vitorpamplona.amethyst.ui.feeds
import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.lazy.LazyListState import androidx.compose.foundation.lazy.LazyListState
import androidx.compose.foundation.lazy.grid.LazyGridState import androidx.compose.foundation.lazy.grid.LazyGridState
import androidx.compose.foundation.pager.PagerState import androidx.compose.foundation.pager.PagerState
@@ -75,7 +74,6 @@ fun WatchScrollToTop(
} }
} }
@OptIn(ExperimentalFoundationApi::class)
@Composable @Composable
fun WatchScrollToTop( fun WatchScrollToTop(
videoFeedContentState: FeedContentState, videoFeedContentState: FeedContentState,

2
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/video/VideoScreen.kt
View File

@@ -249,7 +249,7 @@ fun SlidingCarousel(
val pagerState = val pagerState =
if (pagerStateKey != null) { if (pagerStateKey != null) {
rememberForeverPagerState(pagerStateKey, items.list.size) { items.list.size } rememberForeverPagerState(pagerStateKey) { items.list.size }
} else { } else {
rememberPagerState(items.list.size) { items.list.size } rememberPagerState(items.list.size) { items.list.size }
} }