Skip to content

fix: preserve scroll position when returning to library tabs #2576

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
stamchry wants to merge 1 commit into from
+22 −14
Closed

fix: preserve scroll position when returning to library tabs #2576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions app/src/main/java/com/theveloper/pixelplay/presentation/screens/LibraryMediaTabs.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,18 +92,18 @@ fun LibraryAlbumsTab(
onAlbumLongPress: (Album) -> Unit = {},
onAlbumSelectionToggle: (Album) -> Unit = {},
getSelectionIndex: (Long) -> Int? = { null },
storageFilter: StorageFilter = StorageFilter.ALL
storageFilter: StorageFilter = StorageFilter.ALL,
listState: androidx.compose.foundation.lazy.LazyListState = androidx.compose.foundation.lazy.rememberLazyListState(),
gridState: androidx.compose.foundation.lazy.grid.LazyGridState = androidx.compose.foundation.lazy.grid.rememberLazyGridState()
) {
val hasCurrentSong by remember(playerViewModel) {
playerViewModel.stablePlayerState
.map { it.currentSong != null && it.currentSong != Song.emptySong() }
.distinctUntilChanged()
}.collectAsStateWithLifecycle(initialValue = false)

val gridState = rememberLazyGridState()
val listState = rememberLazyListState()
val dummyListState = rememberLazyListState()
val dummyGridState = rememberLazyGridState()
val dummyListState = androidx.compose.foundation.lazy.rememberLazyListState()
val dummyGridState = androidx.compose.foundation.lazy.grid.rememberLazyGridState()
val context = LocalContext.current
val imageLoader = context.imageLoader

Expand Down Expand Up @@ -481,16 +481,16 @@ fun LibraryArtistsTab(
onArtistClick: (Long) -> Unit,
isRefreshing: Boolean,
onRefresh: () -> Unit,
storageFilter: StorageFilter = StorageFilter.ALL
storageFilter: StorageFilter = StorageFilter.ALL,
listState: androidx.compose.foundation.lazy.LazyListState = androidx.compose.foundation.lazy.rememberLazyListState()
) {
val hasCurrentSong by remember(playerViewModel) {
playerViewModel.stablePlayerState
.map { it.currentSong != null && it.currentSong != Song.emptySong() }
.distinctUntilChanged()
}.collectAsStateWithLifecycle(initialValue = false)

val listState = rememberLazyListState()
val dummyListState = rememberLazyListState()
val dummyListState = androidx.compose.foundation.lazy.rememberLazyListState()
val artistFastScrollLabelProvider = remember(artists, currentArtistSortOption) {
{ index: Int ->
artistFastScrollLabel(
Expand Down
14 changes: 11 additions & 3 deletions app/src/main/java/com/theveloper/pixelplay/presentation/screens/LibraryScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,6 +438,10 @@ fun LibraryScreen(
songInfoBottomSheetViewModel: SongInfoBottomSheetViewModel = hiltViewModel()
) {
// La recolección de estados de alto nivel se mantiene mínima.
val albumsListState = androidx.compose.foundation.lazy.rememberLazyListState()
val albumsGridState = androidx.compose.foundation.lazy.grid.rememberLazyGridState()
val songsListState = androidx.compose.foundation.lazy.rememberLazyListState()
val artistsListState = androidx.compose.foundation.lazy.rememberLazyListState()
val context = LocalContext.current // Added context
val haptic = LocalHapticFeedback.current
val lastTabIndex by playerViewModel.lastLibraryTabIndexFlow.collectAsStateWithLifecycle()
Expand Down Expand Up @@ -1533,7 +1537,8 @@ fun LibraryScreen(
onRegisterLocateCurrentSongAction = { songsLocateAction = it },
sortOption = playerUiState.currentSongSortOption,
storageFilter = playerUiState.currentStorageFilter,
hasCurrentSong = hasCurrentSong
hasCurrentSong = hasCurrentSong,
listState = songsListState
)
}
LibraryTabId.ALBUMS -> {
Expand Down Expand Up @@ -1563,7 +1568,9 @@ fun LibraryScreen(
onAlbumLongPress = onAlbumLongPress,
onAlbumSelectionToggle = onAlbumSelectionToggle,
getSelectionIndex = getAlbumSelectionIndex,
storageFilter = playerUiState.currentStorageFilter
storageFilter = playerUiState.currentStorageFilter,
listState = albumsListState,
gridState = albumsGridState
)
}

Expand All @@ -1585,7 +1592,8 @@ fun LibraryScreen(
},
isRefreshing = isRefreshing,
onRefresh = onRefresh,
storageFilter = playerUiState.currentStorageFilter
storageFilter = playerUiState.currentStorageFilter,
listState = artistsListState
)
}

Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/com/theveloper/pixelplay/presentation/screens/LibrarySongsTab.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,10 @@ fun LibrarySongsTab(
onLocateCurrentSongVisibilityChanged: (Boolean) -> Unit = {},
onRegisterLocateCurrentSongAction: ((() -> Unit)?) -> Unit = {},
storageFilter: StorageFilter = StorageFilter.ALL,
hasCurrentSong: Boolean = false
hasCurrentSong: Boolean = false,
listState: androidx.compose.foundation.lazy.LazyListState = androidx.compose.foundation.lazy.rememberLazyListState()
) {
val listState = rememberLazyListState()
val dummyListState = rememberLazyListState()
val dummyListState = androidx.compose.foundation.lazy.rememberLazyListState()
val pullToRefreshState = rememberPullToRefreshState()
val coroutineScope = rememberCoroutineScope()
val visibilityCallback by rememberUpdatedState(onLocateCurrentSongVisibilityChanged)
Expand Down