Skip to content

Add missing scrollbar to Playlists tab #223

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

Open
rivaldi8 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Add missing scrollbar to Playlists tab #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
08143eb
Extract code rendering the actual playlist list into a new composable
rivaldi8 May 1, 2026
b1ae552
Add scrollbar to Playlists tab
rivaldi8 May 1, 2026
5640360
Add convenience noPopupText function to use with NoPopup composable
rivaldi8 May 1, 2026
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
3 changes: 3 additions & 0 deletions android/app/src/main/java/com/simplecityapps/shuttle/ui/common/components/FastScroller.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,9 @@ fun DefaultPopup(
@Composable
fun NoPopup(index: Int) = Unit

/** Pass this to the getPopupText parameter in FastScroller when using [NoPopup]. */
fun noPopupText(index: Int): String? = null

@Preview(showBackground = true)
@Composable
private fun FastScrollPreview() {
Expand Down
127 changes: 87 additions & 40 deletions ...app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/playlists/PlaylistList.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
package com.simplecityapps.shuttle.ui.screens.library.playlists

import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.wrapContentSize
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
Expand All @@ -17,8 +19,13 @@ import com.simplecityapps.shuttle.R
import com.simplecityapps.shuttle.model.Playlist
import com.simplecityapps.shuttle.model.SmartPlaylist
import com.simplecityapps.shuttle.ui.common.components.CircularLoadingState
import com.simplecityapps.shuttle.ui.common.components.FastScroller
import com.simplecityapps.shuttle.ui.common.components.HorizontalLoadingView
import com.simplecityapps.shuttle.ui.common.components.LoadingStatusIndicator
import com.simplecityapps.shuttle.ui.common.components.NoPopup
import com.simplecityapps.shuttle.ui.common.components.noPopupText
import kotlinx.collections.immutable.ImmutableList
import kotlinx.collections.immutable.toImmutableList

@Composable
fun PlaylistList(
Expand Down Expand Up @@ -65,49 +72,89 @@ fun PlaylistList(
}

PlaylistListUiState.LoadingState.Ready -> {
LazyColumn(
modifier = modifier.fillMaxWidth(),
contentPadding = PaddingValues(vertical = 8.dp),
) {
if (uiState.smartPlaylists.isNotEmpty()) {
item {
Text(
text = stringResource(R.string.playlists_title_smart_playlists),
style = MaterialTheme.typography.bodyLarge,
color = MaterialTheme.colorScheme.onBackground,
modifier = Modifier.padding(start = 16.dp, end = 16.dp, top = 8.dp, bottom = 8.dp)
)
}
items(uiState.smartPlaylists) { smartPlaylist ->
SmartPlaylistListItem(
smartPlaylist = smartPlaylist,
onSmartPlaylistClick = onSmartPlaylistClick,
)
}
PlaylistList(
smartPlaylists = uiState.smartPlaylists.toImmutableList(),
playlists = uiState.playlists.toImmutableList(),
onSmartPlaylistClick = onSmartPlaylistClick,
onPlaylistClick = onPlaylistClick,
onPlay = onPlay,
onAddToQueue = onAddToQueue,
onPlayNext = onPlayNext,
onDelete = onDelete,
onClear = onClear,
onRename = onRename,
modifier = modifier,
)
}
}
}

@Composable
private fun PlaylistList(
smartPlaylists: ImmutableList<SmartPlaylist>,
playlists: ImmutableList<Playlist>,
onSmartPlaylistClick: (SmartPlaylist) -> Unit,
onPlaylistClick: (Playlist) -> Unit,
onPlay: (Playlist) -> Unit,
onAddToQueue: (Playlist) -> Unit,
onPlayNext: (Playlist) -> Unit,
onDelete: (Playlist) -> Unit,
onClear: (Playlist) -> Unit,
onRename: (Playlist) -> Unit,
modifier: Modifier = Modifier,
) {
val state = rememberLazyListState()

Box(modifier = modifier.fillMaxSize()) {
LazyColumn(
modifier = Modifier.fillMaxWidth(),
contentPadding = PaddingValues(vertical = 8.dp),
state = state,
) {
if (smartPlaylists.isNotEmpty()) {
item {
Text(
text = stringResource(R.string.playlists_title_smart_playlists),
style = MaterialTheme.typography.bodyLarge,
color = MaterialTheme.colorScheme.onBackground,
modifier = Modifier.padding(start = 16.dp, end = 16.dp, top = 8.dp, bottom = 8.dp)
)
}
items(smartPlaylists) { smartPlaylist ->
SmartPlaylistListItem(
smartPlaylist = smartPlaylist,
onSmartPlaylistClick = onSmartPlaylistClick,
)
}
}
if (playlists.isNotEmpty()) {
item {
Text(
text = stringResource(R.string.playlists_title_playlists),
style = MaterialTheme.typography.bodyLarge,
color = MaterialTheme.colorScheme.onBackground,
modifier = Modifier.padding(start = 16.dp, end = 16.dp, top = 8.dp, bottom = 8.dp)
)
}
if (uiState.playlists.isNotEmpty()) {
item {
Text(
text = stringResource(R.string.playlists_title_playlists),
style = MaterialTheme.typography.bodyLarge,
color = MaterialTheme.colorScheme.onBackground,
modifier = Modifier.padding(start = 16.dp, end = 16.dp, top = 8.dp, bottom = 8.dp)
)
}
items(uiState.playlists) { playlist ->
PlaylistListItem(
playlist = playlist,
onPlaylistClick = onPlaylistClick,
onPlay = onPlay,
onAddToQueue = onAddToQueue,
onPlayNext = onPlayNext,
onDelete = onDelete,
onClear = onClear,
onRename = onRename,
)
}
items(playlists) { playlist ->
PlaylistListItem(
playlist = playlist,
onPlaylistClick = onPlaylistClick,
onPlay = onPlay,
onAddToQueue = onAddToQueue,
onPlayNext = onPlayNext,
onDelete = onDelete,
onClear = onClear,
onRename = onRename,
)
}
}
}
FastScroller(
modifier = Modifier.fillMaxSize().padding(vertical = 8.dp),
state = state,
popup = ::NoPopup,
getPopupText = ::noPopupText,
)
}
}
Loading