Makussu/subtracks
1
0
Fork 0
mirror of https://github.com/austinried/subtracks.git synced 2026-11-11 07:29:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

make the artwork theme transition duration caller-supplied

Browse Source
This commit is contained in:
austinried
2026-10-04 00:29:53 +00:00
parent 9fe316d5ba
commit eaa119cc39
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/com/subtracks/ui/library/AlbumDetailScreen.kt
+2 -1
View File
@@ -91,6 +91,7 @@ import kotlin.math.roundToInt
private const val DOT = "\u00B7" private const val DOT = "\u00B7"
private const val GRADIENT_SCREENS = 2.0f private const val GRADIENT_SCREENS = 2.0f
private const val FADE_DISTANCE_DP = 64 private const val FADE_DISTANCE_DP = 64
private const val THEME_TRANSITION_MS = 350
@Composable @Composable
fun AlbumDetailRoute( fun AlbumDetailRoute(
@@ -107,7 +108,7 @@ fun AlbumDetailRoute(
album = album, album = album,
songs = songs, songs = songs,
coverArt = viewModel::coverArt, coverArt = viewModel::coverArt,
artwork = rememberArtworkColors(viewModel.coverArt(album?.coverArt, true)), artwork = rememberArtworkColors(viewModel.coverArt(album?.coverArt, true), THEME_TRANSITION_MS),
onBack = onBack, onBack = onBack,
onSongClick = viewModel::play, onSongClick = viewModel::play,
playingSongId = playback.item?.id.takeIf { context?.kind == QueueKind.Album && context.refId == albumId }, playingSongId = playback.item?.id.takeIf { context?.kind == QueueKind.Album && context.refId == albumId },
app/src/main/kotlin/com/subtracks/ui/theme/AnimatedArtworkColors.kt
+6 -3
View File
@@ -12,7 +12,7 @@ import androidx.compose.runtime.setValue
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.lerp import androidx.compose.ui.graphics.lerp
private const val THEME_TRANSITION_MS = 600 const val ARTWORK_THEME_TRANSITION_MS = 600
fun baseArtworkColors(): ArtworkColors = fun baseArtworkColors(): ArtworkColors =
ArtworkColors( ArtworkColors(
@@ -25,7 +25,10 @@ fun baseArtworkColors(): ArtworkColors =
) )
@Composable @Composable
fun rememberAnimatedArtworkColors(target: ArtworkColors?): ArtworkColors { fun rememberAnimatedArtworkColors(
target: ArtworkColors?,
durationMillis: Int = ARTWORK_THEME_TRANSITION_MS,
): ArtworkColors {
val base = remember { baseArtworkColors() } val base = remember { baseArtworkColors() }
var from by remember { mutableStateOf(target ?: base) } var from by remember { mutableStateOf(target ?: base) }
var to by remember { mutableStateOf(target ?: base) } var to by remember { mutableStateOf(target ?: base) }
@@ -37,7 +40,7 @@ fun rememberAnimatedArtworkColors(target: ArtworkColors?): ArtworkColors {
from = to from = to
to = next to = next
progress.snapTo(0f) progress.snapTo(0f)
progress.animateTo(1f, tween(durationMillis = THEME_TRANSITION_MS)) progress.animateTo(1f, tween(durationMillis = durationMillis))
} }
} }
app/src/main/kotlin/com/subtracks/ui/theme/ArtworkTheme.kt
+5 -2
View File
@@ -158,10 +158,13 @@ private fun blendHue(
} }
@Composable @Composable
fun rememberArtworkColors(ref: CoverArtRef?): ArtworkColors { fun rememberArtworkColors(
ref: CoverArtRef?,
durationMillis: Int = ARTWORK_THEME_TRANSITION_MS,
): ArtworkColors {
val seeds by rememberArtworkSeed(ref) val seeds by rememberArtworkSeed(ref)
val target = remember(seeds) { seeds?.let { (primary, secondary) -> artworkColorsFromSeeds(primary, secondary) } } val target = remember(seeds) { seeds?.let { (primary, secondary) -> artworkColorsFromSeeds(primary, secondary) } }
return rememberAnimatedArtworkColors(target) return rememberAnimatedArtworkColors(target, durationMillis)
} }
@Composable @Composable