Native Android client for Spotify, built with Jetpack Compose
Kotlin ad-freeadblockandroidjetpack-composekotlinlyricsmusic-playermusic-videomyspotispotifyspotify-adblockerspotify-clientspotify-connectspotui
Seek bar: a drop is scaled by the length of the song that moves: the gesture kept the first composition's callback, so a drop on a short song landed past its end and skipped to the next one
kota-zo9a366e9ffeee
diff --git a/base/app/src/main/java/com/music/spotui/ui/immersive/player/PlayerBridge.kt b/base/app/src/main/java/com/music/spotui/ui/immersive/player/PlayerBridge.ktindex 8171f954..da0ec3bd 100644--- a/base/app/src/main/java/com/music/spotui/ui/immersive/player/PlayerBridge.kt+++ b/base/app/src/main/java/com/music/spotui/ui/immersive/player/PlayerBridge.kt@@ -58,6 +58,11 @@ data class ImmersivePlayerState(/** The playhead in milliseconds, read per frame (SongPlayer.getCurrentPosition()). */val positionMs: () -> Long = { 0L },val durationMs: Long = 0L,+ /**+ * The length of the song a seek moves, read at the drop. Not [durationMs]: during a mix that is+ * the outgoing song's, and it follows the engine a poll late.+ */+ val seekLengthMs: (() -> Long)? = null,val shuffle: Boolean = false,/** Smart shuffle is on for the list that plays. */val smart: Boolean = false,@@ -159,6 +164,7 @@ fun rememberImmersivePlayer(navController: NavController): ImmersivePlayerBridgebuffering = buffering,positionMs = remember(outgoing) { outgoing?.let { o -> { o.positionMs() } } ?: { SongPlayer.getCurrentPosition() } },durationMs = outgoing?.song?.durationMs ?: duration,+ seekLengthMs = SongPlayer::getDuration,shuffle = shuffle,smart = smart,repeatMode = repeat,diff --git a/base/app/src/main/java/com/music/spotui/ui/immersive/player/PlayerControls.kt b/base/app/src/main/java/com/music/spotui/ui/immersive/player/PlayerControls.ktindex db2882e5..6765f28c 100644--- a/base/app/src/main/java/com/music/spotui/ui/immersive/player/PlayerControls.kt+++ b/base/app/src/main/java/com/music/spotui/ui/immersive/player/PlayerControls.kt@@ -136,7 +136,7 @@ internal fun PlayerScrubber(ThinSlider(value = { frame.value; scrub.shown(state.positionMs(), state.durationMs) },onValueChange = scrub::drag,- onValueChangeFinished = { scrub.release { onSeek((it * state.durationMs).toLong()) } },+ onValueChangeFinished = { scrub.release { onSeek((it * (state.seekLengthMs?.invoke() ?: state.durationMs)).toLong()) } },loading = state.buffering && !scrub.scrubbing,// AutoMix: the mix's stretch in the accent from the moment it is planned, beating while it plays.mixZone = { state.mixCue?.zoneOn(state.durationMs, incomingShown = state.blend?.outgoingWords == false) },diff --git a/base/app/src/main/java/com/music/spotui/ui/look/ThinSlider.kt b/base/app/src/main/java/com/music/spotui/ui/look/ThinSlider.ktindex 08ab16d0..d8f971e6 100644--- a/base/app/src/main/java/com/music/spotui/ui/look/ThinSlider.kt+++ b/base/app/src/main/java/com/music/spotui/ui/look/ThinSlider.kt@@ -36,6 +36,7 @@ import androidx.compose.runtime.LaunchedEffectimport androidx.compose.runtime.getValueimport androidx.compose.runtime.mutableStateOfimport androidx.compose.runtime.remember+import androidx.compose.runtime.rememberUpdatedStateimport androidx.compose.runtime.setValueimport androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifier@@ -109,6 +110,10 @@ fun ThinSlider(mixColor: Color = Color.White,/** The mix's beat, 0..1, read in the draw: the stretch thickens and glows with it. */) {+ // The gesture loop below lives as long as the bar: it calls the latest callbacks, not those of+ // the first composition (a seek bar then scaled every drop by the first song's length).+ val latestChange by rememberUpdatedState(onValueChange)+ val latestFinished by rememberUpdatedState(onValueChangeFinished)var dragging by remember { mutableStateOf(false) }val height by animateDpAsState(targetValue = if (dragging) activeHeight else idleHeight,@@ -154,7 +159,7 @@ fun ThinSlider(awaitEachGesture {val down = awaitFirstDown(requireUnconsumed = false)dragging = true- onValueChange((down.position.x / size.width).coerceIn(0f, 1f))+ latestChange((down.position.x / size.width).coerceIn(0f, 1f))while (true) {val event = awaitPointerEvent()@@ -164,13 +169,13 @@ fun ThinSlider(break}if (pointer.positionChanged()) {- onValueChange((pointer.position.x / size.width).coerceIn(0f, 1f))+ latestChange((pointer.position.x / size.width).coerceIn(0f, 1f))pointer.consume()}}dragging = false- onValueChangeFinished?.invoke()+ latestFinished?.invoke()}},contentAlignment = Alignment.Center,