Skip to content

[Feature] Show Rating When Playlist is Visible #612

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

Merged
davidvedvick merged 2 commits into from
Mar 15, 2026
Merged

[Feature] Show Rating When Playlist is Visible #612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7cf4ba0
Show rating when playlist is partially open
davidvedvick Mar 15, 2026
5ab3cde
Always auto-scroll in horizontal views
davidvedvick Mar 15, 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
16 changes: 11 additions & 5 deletions ...com/lasthopesoftware/bluewater/client/playback/nowplaying/view/NowPlayingTvApplication.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,11 +415,17 @@ fun BrowserLibraryDestination.NowPlayingTvView(browserViewDependencies: ScopedVi
)
}

DisposableEffect(key1 = Unit) {
if (!isPlaylistOpen)
DisposableEffect(key1 = playlistDrawerState.currentValue) {
if (playlistDrawerState.currentValue == SlideOutState.Closed) {
nowPlayingPlaylistViewModel.enableSystemAutoScrolling()
} else {
nowPlayingPlaylistViewModel.disableSystemAutoScrolling()
nowPlayingPlaylistViewModel.enableUserAutoScrolling()
}

onDispose { }
onDispose {
nowPlayingPlaylistViewModel.disableSystemAutoScrolling()
}
}

if (isPlaylistOpen) {
Expand All @@ -431,9 +437,9 @@ fun BrowserLibraryDestination.NowPlayingTvView(browserViewDependencies: ScopedVi
.background(SharedColors.overlayDark)
.onFocusChanged { state ->
if (state.hasFocus)
nowPlayingPlaylistViewModel.disableSystemAutoScrolling()
nowPlayingPlaylistViewModel.lockOutAutoScroll()
else
nowPlayingPlaylistViewModel.enableSystemAutoScrolling()
nowPlayingPlaylistViewModel.releaseAutoScroll()
}
.focusGroup(),
horizontalAlignment = Alignment.CenterHorizontally,
Expand Down
34 changes: 22 additions & 12 deletions ...ain/java/com/lasthopesoftware/bluewater/client/playback/nowplaying/view/NowPlayingView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ import com.lasthopesoftware.bluewater.android.ui.components.dragging.rememberDra
import com.lasthopesoftware.bluewater.android.ui.findWindow
import com.lasthopesoftware.bluewater.android.ui.linearInterpolation
import com.lasthopesoftware.bluewater.android.ui.navigable
import com.lasthopesoftware.bluewater.android.ui.remember
import com.lasthopesoftware.bluewater.android.ui.theme.ControlSurface
import com.lasthopesoftware.bluewater.android.ui.theme.Dimensions
import com.lasthopesoftware.bluewater.android.ui.theme.LocalControlColor
Expand Down Expand Up @@ -876,6 +877,21 @@ private fun ScreenDimensionsScope.NowPlayingWideView(
snapshotFlow { playlistDrawerState.currentValue }.collect { draggableState = it }
}

val playlistOpenProgress by remember(playlistDrawerState) {
derivedStateOf { playlistDrawerState.progress(SlideOutState.Closed, SlideOutState.Open) }
}

val isDrawerFullyClosed by remember { derivedStateOf { playlistOpenProgress == 0f } }

DisposableEffect(isDrawerFullyClosed) {
if (isDrawerFullyClosed) {
playlistViewModel.hidePlaylist()
} else {
playlistViewModel.showPlaylist()
}
onDispose { }
}

Box(
modifier = Modifier
.fillMaxSize()
Expand All @@ -885,15 +901,6 @@ private fun ScreenDimensionsScope.NowPlayingWideView(
this@NowPlayingWideView.maxWidth - playlistDrawerState.requireOffset().toDp()
}

val playlistOpenProgress by remember(playlistDrawerState) {
derivedStateOf {
playlistDrawerState.progress(
SlideOutState.Closed,
SlideOutState.Open
)
}
}

Box(
modifier = Modifier
.fillMaxHeight()
Expand Down Expand Up @@ -933,7 +940,9 @@ private fun ScreenDimensionsScope.NowPlayingWideView(
.align(Alignment.BottomCenter)
.fillMaxWidth()
) {
if (isScreenControlsVisible) {
val isPlaylistShown by playlistViewModel.isPlaylistShown.subscribeAsState()
val isTopControlsShown by remember { derivedStateOf { isScreenControlsVisible || isPlaylistShown } }
if (isTopControlsShown) {
Row(
verticalAlignment = Alignment.CenterVertically,
modifier = Modifier
Expand Down Expand Up @@ -1005,11 +1014,12 @@ private fun ScreenDimensionsScope.NowPlayingWideView(
.background(SharedColors.overlayDark),
horizontalAlignment = Alignment.CenterHorizontally,
) {
DisposableEffect(key1 = playlistDrawerState.currentValue) {
if (playlistDrawerState.currentValue == SlideOutState.Closed) {
DisposableEffect(key1 = isDrawerFullyClosed) {
if (isDrawerFullyClosed) {
playlistViewModel.enableSystemAutoScrolling()
} else {
playlistViewModel.disableSystemAutoScrolling()
playlistViewModel.enableUserAutoScrolling()
}

onDispose {
Expand Down
Loading