custom seek bar, don't play on seek, trim CJK line height, fix icon aspect

This commit is contained in:
austinried
2026-10-04 00:29:54 +00:00
parent 5e114f6edc
commit c145fe51f0
3 changed files with 78 additions and 46 deletions
@@ -376,10 +376,7 @@ class PlaybackController(
fun previous() = skip(-1)
fun seekTo(positionMs: Long) {
val player = player ?: return
player.ensurePrepared()
player.seekTo(positionMs)
player.play()
player?.seekTo(positionMs)
}
fun coverArt(
@@ -3,6 +3,8 @@ package com.subtracks.ui.playback
import android.content.Context
import androidx.compose.foundation.background
import androidx.compose.foundation.basicMarquee
import androidx.compose.foundation.gestures.detectHorizontalDragGestures
import androidx.compose.foundation.gestures.detectTapGestures
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
@@ -30,8 +32,6 @@ import androidx.compose.material3.IconButton
import androidx.compose.material3.LocalContentColor
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Slider
import androidx.compose.material3.SliderDefaults
import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBar
import androidx.compose.material3.TopAppBarDefaults
@@ -40,6 +40,7 @@ import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableFloatStateOf
import androidx.compose.runtime.mutableIntStateOf
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
@@ -47,8 +48,11 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.input.pointer.pointerInput
import androidx.compose.ui.layout.onSizeChanged
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.text.PlatformTextStyle
import androidx.compose.ui.text.style.LineHeightStyle
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -131,10 +135,12 @@ fun NowPlayingScreen(
val titleStyle =
MaterialTheme.typography.headlineSmall.copy(
platformStyle = PlatformTextStyle(includeFontPadding = false),
lineHeightStyle = LineHeightStyle(LineHeightStyle.Alignment.Center, LineHeightStyle.Trim.Both),
)
val subtitleStyle =
MaterialTheme.typography.bodyMedium.copy(
platformStyle = PlatformTextStyle(includeFontPadding = false),
lineHeightStyle = LineHeightStyle(LineHeightStyle.Alignment.Center, LineHeightStyle.Trim.Both),
)
CompositionLocalProvider(LocalContentColor provides MaterialTheme.colorScheme.onBackground) {
@@ -218,26 +224,9 @@ fun NowPlayingScreen(
modifier = Modifier.padding(top = 6.dp).basicMarquee(),
)
}
var dragging by remember { mutableStateOf(false) }
var dragPosition by remember { mutableFloatStateOf(0f) }
Slider(
value = if (dragging) dragPosition else state.positionMs.toFloat(),
onValueChange = {
dragging = true
dragPosition = it
},
onValueChangeFinished = {
onSeek(dragPosition.toLong())
dragging = false
},
valueRange = 0f..state.durationMs.toFloat().coerceAtLeast(1f),
track = { sliderState ->
SliderDefaults.Track(
sliderState = sliderState,
thumbTrackGapSize = 0.dp,
drawStopIndicator = {},
)
},
SeekBar(
progress = if (state.durationMs > 0) (state.positionMs.toFloat() / state.durationMs).coerceIn(0f, 1f) else 0f,
onSeek = { fraction -> onSeek((fraction * state.durationMs).toLong()) },
modifier = Modifier.padding(top = 28.dp),
)
Row(
@@ -317,6 +306,50 @@ fun NowPlayingScreen(
}
}
@Composable
private fun SeekBar(
progress: Float,
onSeek: (Float) -> Unit,
modifier: Modifier = Modifier,
) {
var widthPx by remember { mutableIntStateOf(0) }
var dragging by remember { mutableStateOf(false) }
var dragFraction by remember { mutableFloatStateOf(0f) }
val active = MaterialTheme.colorScheme.primary
val track = active.copy(alpha = 0.24f)
val shown = if (dragging) dragFraction else progress
Box(
modifier =
modifier
.fillMaxWidth()
.height(32.dp)
.onSizeChanged { widthPx = it.width }
.pointerInput(widthPx) {
detectHorizontalDragGestures(
onDragStart = { offset ->
dragging = true
dragFraction = if (widthPx > 0) (offset.x / widthPx).coerceIn(0f, 1f) else 0f
},
onDragEnd = {
dragging = false
onSeek(dragFraction)
},
onDragCancel = { dragging = false },
) { change, _ ->
dragFraction = if (widthPx > 0) (change.position.x / widthPx).coerceIn(0f, 1f) else 0f
}
}.pointerInput(widthPx) {
detectTapGestures { offset ->
if (widthPx > 0) onSeek((offset.x / widthPx).coerceIn(0f, 1f))
}
},
contentAlignment = Alignment.CenterStart,
) {
Box(Modifier.fillMaxWidth().height(4.dp).background(track))
Box(Modifier.fillMaxWidth(shown).height(4.dp).background(active))
}
}
private fun formatTime(milliseconds: Long): String {
val totalSeconds = (milliseconds / 1000).coerceAtLeast(0)
val minutes = totalSeconds / 60