Skip to content

Unofficial YouTube Music / Spotify Premium client for Android, built in Liquid Glass. Audio effects, Spotify Connect, listening history, 8 languages. Rust core on librespot.

A hero that actually collapses, and a menu nothing covers

Lelonio564977082446
diff --git a/.claude/settings.local.json b/.claude/settings.local.json
index 93be70e..6dd5195 100644
--- a/.claude/settings.local.json
+++ b/.claude/settings.local.json
@@ -116,7 +116,8 @@
"Bash(git commit -q -m 'Track menus, a page-coloured glass, and a remembered sort *)",
"Bash(git commit -q -m 'Keep the glass out of the layer it samples *)",
"Bash(git commit -q -m 'Glass context menus, with remove-from-playlist *)",
- "Bash(git commit -q -m 'Menus that refract the page, and a hero that collapses into a bar *)"
+ "Bash(git commit -q -m 'Menus that refract the page, and a hero that collapses into a bar *)",
+ "Bash(git commit -q -m 'A hero that actually collapses, and a menu nothing covers *)"
]
}
}
diff --git a/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/configure_fingerprint.bin b/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/configure_fingerprint.bin
index c746769..41fb0e5 100644
--- a/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/configure_fingerprint.bin
+++ b/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/configure_fingerprint.bin
@@ -2,27 +2,27 @@ C/C++ Structured Logl
j
h/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/additional_project_files.txtC
A
-?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ����3  ����3i
+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  �����3  ����3i
g
-e/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/android_gradle_build.json  ����3� ����3n
+e/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/android_gradle_build.json  �����3� ����3n
l
-j/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/android_gradle_build_mini.json  ����3� �����3[
+j/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/android_gradle_build_mini.json  �����3� �����3[
Y
-W/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/build.ninja  ����3�� ����3_
+W/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/build.ninja  �����3�� ����3_
]
-[/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/build.ninja.txt  ����3d
+[/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/build.ninja.txt  �����3d
b
-`/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/build_file_index.txt  ����3 @ ����3e
+`/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/build_file_index.txt  �����3 @ ����3e
c
-a/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/compile_commands.json  ����3�� ����3i
+a/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/compile_commands.json  �����3�� ����3i
g
-e/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/compile_commands.json.bin  ����3 �" ����3o
+e/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/compile_commands.json.bin  �����3 �" ����3o
m
-k/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/metadata_generation_command.txt  ����3
+k/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/metadata_generation_command.txt  �����3
� ����3b
`
-^/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/prefab_config.json  ����3  ( ����3g
+^/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/prefab_config.json  �����3  ( ����3g
e
-c/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/symbol_folder_index.txt  ����3  b ����3D
+c/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/symbol_folder_index.txt  �����3  b ����3D
B
-@/Users/emanuele/Progetto Spotify/app/src/main/cpp/CMakeLists.txt  ����3 � �Ȅ��3
\ No newline at end of file
+@/Users/emanuele/Progetto Spotify/app/src/main/cpp/CMakeLists.txt  �����3 � �Ȅ��3
\ No newline at end of file
diff --git a/app/src/main/java/dev/emanuele/spot/ui/components/GlassMenu.kt b/app/src/main/java/dev/emanuele/spot/ui/components/GlassMenu.kt
index ac2d923..fab9971 100644
--- a/app/src/main/java/dev/emanuele/spot/ui/components/GlassMenu.kt
+++ b/app/src/main/java/dev/emanuele/spot/ui/components/GlassMenu.kt
@@ -6,16 +6,14 @@ import androidx.compose.animation.fadeIn
import androidx.compose.animation.fadeOut
import androidx.compose.animation.scaleIn
import androidx.compose.animation.scaleOut
+import androidx.compose.animation.core.MutableTransitionState
import androidx.compose.foundation.background
+import androidx.compose.foundation.border
import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.BoxScope
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.ColumnScope
import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.offset
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
@@ -24,6 +22,7 @@ import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
@@ -32,74 +31,65 @@ import androidx.compose.ui.graphics.TransformOrigin
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.unit.IntOffset
import androidx.compose.ui.unit.dp
-import com.kyant.backdrop.Backdrop
-import dev.emanuele.spot.ui.player.GlassSurface
+import androidx.compose.ui.window.Popup
+import androidx.compose.ui.window.PopupProperties
/**
- * A context menu made of the same glass as everything else.
+ * A context menu, in a window of its own so nothing can be drawn over it.
*
- * Material's `DropdownMenu` draws an opaque elevated card — the one surface in
- * the app that announces it came from a different design system.
+ * It went through both other options first, and both are worse. Material's
+ * `DropdownMenu` is an opaque elevated card — the one surface in the app that
+ * announces it came from a different design system. Drawing it inside the
+ * screen instead let it refract the page properly, and put it *under* the mini
+ * player and the tab bar, which are drawn above the whole navigation host: a
+ * menu with the now-playing bar across it.
*
- * Drawn inside the screen rather than in a `Popup`, which is what the first
- * version did and is worth explaining because a popup is the obvious choice. A
- * popup is its own window: it cannot refract the list it is covering, because
- * that list is in another window and in no layer the popup can sample. What
- * came out was a pane of glass with nothing behind it — transparent, with the
- * rows legible straight through its own text. As a sibling of the content,
- * [backdrop] can be the layer the page is recorded into and the material
- * behaves like every other pane in the app.
+ * So: a popup. A popup is its own window and cannot sample a layer belonging to
+ * another one, which means no real refraction, which in turn is why this is
+ * opaque rather than a pane of glass with nothing behind it. It keeps the shape,
+ * the corner radius and the hairline of the rest of the app, and gives up the
+ * one property it cannot honestly have.
*
* @param anchor where the menu's top-left corner goes, in pixels from the top
- * left of the box this is placed in. See [MENU_WIDTH] for placing it by its
- * right edge instead.
+ * left of the window. See [MENU_WIDTH] for placing it by its right edge.
*/
@Composable
-fun BoxScope.GlassMenu(
+fun GlassMenu(
visible: Boolean,
anchor: IntOffset,
- backdrop: Backdrop,
onDismiss: () -> Unit,
content: @Composable ColumnScope.() -> Unit,
) {
- // Catches the tap that closes the menu, and stops what is behind it from
- // competing with it.
- AnimatedVisibility(
- visible = visible,
- enter = fadeIn(tween(140)),
- exit = fadeOut(tween(140)),
- modifier = Modifier.fillMaxSize(),
- ) {
- Box(
- Modifier
- .fillMaxSize()
- .background(Color.Black.copy(alpha = 0.32f))
- .clickable(interactionSource = null, indication = null, onClick = onDismiss),
- )
- }
+ // Kept so the exit animation has something to play. `visible` going false
+ // is the *start* of the closing, not the end of it.
+ val open = remember { MutableTransitionState(false) }
+ open.targetState = visible
+ if (!open.currentState && !open.targetState) return
- AnimatedVisibility(
- visible = visible,
- // Grows out of the corner it was opened from, which is the only thing
- // tying it to the button that was tapped.
- enter = scaleIn(tween(170), initialScale = 0.86f, transformOrigin = TopEnd) +
- fadeIn(tween(120)),
- exit = scaleOut(tween(130), targetScale = 0.9f, transformOrigin = TopEnd) +
- fadeOut(tween(110)),
- modifier = Modifier
- .align(Alignment.TopStart)
- .offset { anchor },
+ Popup(
+ onDismissRequest = onDismiss,
+ offset = anchor,
+ properties = PopupProperties(focusable = true),
) {
- val shape = RoundedCornerShape(20.dp)
- GlassSurface(
- backdrop = backdrop,
- shape = shape,
- surfaceColor = MenuFilm,
- modifier = Modifier
- .width(MENU_WIDTH)
- .clip(shape),
+ AnimatedVisibility(
+ visibleState = open,
+ // Grows out of the corner it was opened from, which is the only
+ // thing tying it to the button that was tapped.
+ enter = scaleIn(tween(170), initialScale = 0.86f, transformOrigin = TopEnd) +
+ fadeIn(tween(120)),
+ exit = scaleOut(tween(130), targetScale = 0.9f, transformOrigin = TopEnd) +
+ fadeOut(tween(110)),
) {
- Column(Modifier.padding(vertical = 6.dp), content = content)
+ val shape = RoundedCornerShape(20.dp)
+ Column(
+ Modifier
+ .width(MENU_WIDTH)
+ .clip(shape)
+ .background(MenuSurface)
+ .border(1.dp, MenuEdge, shape)
+ .padding(vertical = 6.dp),
+ content = content,
+ )
}
}
}
@@ -135,11 +125,8 @@ val MENU_WIDTH = 244.dp
private val TopEnd = TransformOrigin(1f, 0f)
-/**
- * The film over the refracted page.
- *
- * Heavier than the app's other panes deliberately: those sit over a backdrop
- * nobody is reading, and this one sits over a list of track titles. At the usual
- * twelve per cent the rows underneath were legible through the menu's own text.
- */
-private val MenuFilm = Color.Black.copy(alpha = 0.62f)
+/** Dark enough that a list of track titles does not read through it. */
+private val MenuSurface = Color(0xFF16161A)
+
+/** The hairline every other surface in the app catches light with. */
+private val MenuEdge = Color.White.copy(alpha = 0.14f)
diff --git a/app/src/main/java/dev/emanuele/spot/ui/library/PlaylistScreen.kt b/app/src/main/java/dev/emanuele/spot/ui/library/PlaylistScreen.kt
index 64e013c..b71c924 100644
--- a/app/src/main/java/dev/emanuele/spot/ui/library/PlaylistScreen.kt
+++ b/app/src/main/java/dev/emanuele/spot/ui/library/PlaylistScreen.kt
@@ -46,6 +46,13 @@ import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
+import androidx.compose.ui.layout.layout
+import androidx.compose.ui.input.nestedscroll.nestedScroll
+import androidx.compose.ui.input.nestedscroll.NestedScrollSource
+import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.draw.clipToBounds
+import androidx.compose.runtime.mutableFloatStateOf
import dev.emanuele.spot.ui.player.GlassSurface
import dev.emanuele.spot.ui.components.MENU_WIDTH
import androidx.compose.ui.unit.IntOffset
@@ -148,11 +155,6 @@ fun PlaylistScreen(
// cover.
val pageBackdrop = rememberLayerBackdrop()
- // The page *including* its list, for the panes that cover it: the context
- // menu and the collapsed bar. Nothing inside this layer samples it — the
- // header's buttons take the plain page colour above — so there is no cycle.
- val contentBackdrop = rememberLayerBackdrop()
-
// Which track's menu is open, and where its button is, so the menu can be
// drawn at the top level rather than inside a row the list may recycle.
var menuTrack by remember { mutableStateOf<CatalogTrack?>(null) }
@@ -162,21 +164,44 @@ fun PlaylistScreen(
val density = LocalDensity.current
val listState = rememberLazyListState()
- // How far the hero has been scrolled away, 0 to 1. Read in a derived state
- // so the bar it drives recomposes when the answer changes rather than on
- // every pixel of the scroll.
- val collapse by remember {
- derivedStateOf {
- if (listState.firstVisibleItemIndex > 0) {
- 1f
- } else {
- (listState.firstVisibleItemScrollOffset / COLLAPSE_DISTANCE_PX).coerceIn(0f, 1f)
+ val topPadding = contentPadding.calculateTopPadding()
+ val collapsedHeight = topPadding + COLLAPSED_BAR_HEIGHT
+
+ // The header is not in the list. It sits above it and shrinks as the list is
+ // dragged upwards, which is the difference between a hero that collapses and
+ // a hero that scrolls away with a bar appearing over it.
+ //
+ // Nested scroll is what makes the two feel like one surface: the drag
+ // reaches the header first and only what the header cannot use scrolls the
+ // list, so a single gesture closes the cover and then carries on into the
+ // tracks.
+ val collapseRange = with(density) { (HERO_HEIGHT - collapsedHeight).toPx() }
+ var collapsed by remember { mutableFloatStateOf(0f) }
+ val collapseFraction = { (collapsed / collapseRange).coerceIn(0f, 1f) }
+
+ val headerScroll = remember(collapseRange) {
+ object : NestedScrollConnection {
+ override fun onPreScroll(available: Offset, source: NestedScrollSource): Offset {
+ if (available.y >= 0f) return Offset.Zero
+ val take = (-available.y).coerceAtMost(collapseRange - collapsed)
+ collapsed += take
+ return Offset(0f, -take)
+ }
+
+ override fun onPostScroll(
+ consumed: Offset,
+ available: Offset,
+ source: NestedScrollSource,
+ ): Offset {
+ if (available.y <= 0f) return Offset.Zero
+ val give = available.y.coerceAtMost(collapsed)
+ collapsed -= give
+ return Offset(0f, give)
}
}
}
Box(Modifier.fillMaxSize()) {
- Box(Modifier.fillMaxSize().layerBackdrop(contentBackdrop)) {
// The page colour, and only the page colour.
//
// The layer has to hold nothing that samples it. Recording the whole
@@ -203,32 +228,33 @@ fun PlaylistScreen(
.layerBackdrop(pageBackdrop),
)
- // No top content padding: the hero runs under the status bar, which is
- // the whole point of the layout — the picture is the top of the screen,
- // not something sitting below a gap.
+ Column(Modifier.fillMaxSize()) {
+ DetailHeader(
+ name = state.name,
+ artworkUrl = state.artworkUrl,
+ kind = state.kind,
+ trackCount = state.tracks.size,
+ totalMs = state.tracks.sumOf { it.durationMs },
+ pageColor = pageColor,
+ backdrop = pageBackdrop,
+ collapse = collapseFraction,
+ collapsedHeight = collapsedHeight,
+ topPadding = topPadding,
+ onBack = onBack,
+ onPlay = { visible.takeIf { it.isNotEmpty() }?.let { onPlay(it, 0) } },
+ onShuffle = { visible.takeIf { it.isNotEmpty() }?.let(onShuffle) },
+ onToggleSearch = {
+ searching = !searching
+ if (!searching) query = ""
+ },
+ searching = searching,
+ )
+
LazyColumn(
state = listState,
+ modifier = Modifier.nestedScroll(headerScroll),
contentPadding = PaddingValues(bottom = contentPadding.calculateBottomPadding()),
) {
- item(contentType = "header") {
- DetailHeader(
- name = state.name,
- artworkUrl = state.artworkUrl,
- kind = state.kind,
- trackCount = state.tracks.size,
- totalMs = state.tracks.sumOf { it.durationMs },
- pageColor = pageColor,
- backdrop = pageBackdrop,
- onPlay = { visible.takeIf { it.isNotEmpty() }?.let { onPlay(it, 0) } },
- onShuffle = { visible.takeIf { it.isNotEmpty() }?.let(onShuffle) },
- onToggleSearch = {
- searching = !searching
- if (!searching) query = ""
- },
- searching = searching,
- )
- }
-
if (state.albums.isNotEmpty()) {
item(contentType = "albums") {
AlbumStrip(albums = state.albums, onOpen = onOpenItem)
@@ -349,8 +375,7 @@ fun PlaylistScreen(
}
}
}
-
- }
+ }
LazyScrollBar(
state = listState,
@@ -373,7 +398,7 @@ fun PlaylistScreen(
.padding(top = contentPadding.calculateTopPadding() + 8.dp, start = 14.dp)
.align(Alignment.TopStart)
.size(42.dp)
- .graphicsLayer { alpha = 1f - collapse },
+ .graphicsLayer { alpha = 1f - collapseFraction() },
contentHeight = 42.dp,
contentPadding = 0.dp,
blurRadius = 8.dp,
@@ -386,27 +411,6 @@ fun PlaylistScreen(
)
}
- // What the hero turns into. The cover, the title and the three controls
- // do not simply scroll away — the title is what tells you which playlist
- // you are in, and the play button is the thing most likely to be wanted
- // after reading a screenful of tracks.
- CollapsedBar(
- title = state.name,
- artworkUrl = state.artworkUrl,
- collapse = collapse,
- backdrop = contentBackdrop,
- topPadding = contentPadding.calculateTopPadding(),
- searching = searching,
- onBack = onBack,
- onPlay = { visible.takeIf { it.isNotEmpty() }?.let { onPlay(it, 0) } },
- onShuffle = { visible.takeIf { it.isNotEmpty() }?.let(onShuffle) },
- onToggleSearch = {
- searching = !searching
- if (!searching) query = ""
- },
- modifier = Modifier.align(Alignment.TopCenter),
- )
-
// Both menus are drawn here rather than beside the buttons that open
// them: a row inside a lazy list can be recycled out from under its own
// popup, and only at this level is there a layer holding the page for
@@ -414,7 +418,6 @@ fun PlaylistScreen(
TrackMenu(
track = menuTrack,
anchor = menuAnchor.leftOf(density),
- backdrop = contentBackdrop,
onDismiss = { menuTrack = null },
onPlay = { track -> visible.indexOf(track).takeIf { it >= 0 }?.let { onPlay(visible, it) } },
onEnqueue = onEnqueue,
@@ -431,7 +434,6 @@ fun PlaylistScreen(
GlassMenu(
visible = sortOpen,
anchor = sortAnchor.leftOf(density),
- backdrop = contentBackdrop,
onDismiss = { sortOpen = false },
) {
TrackSort.entries.forEach { option ->
@@ -464,97 +466,6 @@ private fun IntOffset.leftOf(density: androidx.compose.ui.unit.Density): IntOffs
return IntOffset((x - width + gap).coerceAtLeast(gap), y + gap)
}
-/**
- * The hero, once it has been scrolled away.
- *
- * Fades in over the last of the cover rather than sliding down from nowhere, so
- * the two read as one thing changing size. The controls are the same three, at
- * the size a bar can carry them.
- */
-@Composable
-private fun CollapsedBar(
- title: String,
- artworkUrl: String?,
- collapse: Float,
- backdrop: Backdrop,
- topPadding: Dp,
- searching: Boolean,
- onBack: () -> Unit,
- onPlay: () -> Unit,
- onShuffle: () -> Unit,
- onToggleSearch: () -> Unit,
- modifier: Modifier = Modifier,
-) {
- if (collapse <= 0.01f) return
-
- GlassSurface(
- backdrop = backdrop,
- shape = RoundedCornerShape(0.dp),
- surfaceColor = Color.Black.copy(alpha = 0.34f),
- modifier = modifier
- .fillMaxWidth()
- .graphicsLayer { alpha = collapse },
- ) {
- Row(
- Modifier
- .fillMaxWidth()
- .padding(top = topPadding + 6.dp, bottom = 10.dp)
- .padding(horizontal = 12.dp),
- verticalAlignment = Alignment.CenterVertically,
- ) {
- IconButton(onClick = onBack) {
- Icon(
- PhosphorIcons.Regular.ArrowLeft,
- contentDescription = "Indietro",
- tint = Color.White,
- modifier = Modifier.size(20.dp),
- )
- }
- Artwork(
- url = artworkUrl,
- title = title,
- modifier = Modifier.size(34.dp),
- corner = 8.dp,
- decodeSize = 34.dp,
- )
- Text(
- title,
- style = MaterialTheme.typography.titleMedium,
- color = Color.White,
- maxLines = 1,
- overflow = TextOverflow.Ellipsis,
- modifier = Modifier
- .weight(1f)
- .padding(horizontal = 12.dp),
- )
- IconButton(onClick = onToggleSearch) {
- Icon(
- if (searching) PhosphorIcons.Regular.X else PhosphorIcons.Fill.MagnifyingGlass,
- contentDescription = "Cerca fra i brani",
- tint = Color.White,
- modifier = Modifier.size(18.dp),
- )
- }
- IconButton(onClick = onShuffle) {
- Icon(
- PhosphorIcons.Regular.Shuffle,
- contentDescription = "Casuale",
- tint = Color.White,
- modifier = Modifier.size(18.dp),
- )
- }
- IconButton(onClick = onPlay) {
- Icon(
- PhosphorIcons.Fill.Play,
- contentDescription = "Riproduci",
- tint = Color.White,
- modifier = Modifier.size(20.dp),
- )
- }
- }
- }
-}
-
/**
* The picture-first header: cover full bleed, everything else on top of it.
*
@@ -574,15 +485,39 @@ private fun DetailHeader(
totalMs: Long,
pageColor: Color,
backdrop: Backdrop,
+ /** 0 fully open, 1 collapsed into the bar. A lambda, so reading it costs a
+ * re-layout rather than a recomposition of the header on every frame. */
+ collapse: () -> Float,
+ collapsedHeight: Dp,
+ topPadding: Dp,
searching: Boolean,
+ onBack: () -> Unit,
onPlay: () -> Unit,
onShuffle: () -> Unit,
onToggleSearch: () -> Unit,
) {
+ val density = LocalDensity.current
+ val heroPx = with(density) { HERO_HEIGHT.roundToPx() }
+ val collapsedPx = with(density) { collapsedHeight.roundToPx() }
+
Box(
Modifier
.fillMaxWidth()
- .height(HERO_HEIGHT),
+ // The header genuinely shrinks. Everything inside keeps its full
+ // size and is clipped by it, which is what makes the cover look like
+ // it is being rolled up rather than moved off.
+ .layout { measurable, constraints ->
+ val height = androidx.compose.ui.util.lerp(heroPx, collapsedPx, collapse())
+ val placeable = measurable.measure(
+ constraints.copy(minHeight = heroPx, maxHeight = heroPx),
+ )
+ layout(constraints.maxWidth, height) {
+ // Anchored to the bottom of the picture, so what stays
+ // visible as it closes is the part the title sits on.
+ placeable.place(0, height - heroPx)
+ }
+ }
+ .clipToBounds(),
) {
Artwork(
url = artworkUrl,
@@ -601,8 +536,6 @@ private fun DetailHeader(
.fillMaxSize()
.background(
Brush.verticalGradient(
- // Only there to keep the floating back button legible
- // over a bright cover.
0f to Color.Black.copy(alpha = 0.35f),
0.28f to Color.Transparent,
0.58f to pageColor.copy(alpha = 0.55f),
@@ -616,7 +549,11 @@ private fun DetailHeader(
Modifier
.align(Alignment.BottomCenter)
.fillMaxWidth()
- .padding(horizontal = 24.dp, vertical = 18.dp),
+ .padding(horizontal = 24.dp, vertical = 18.dp)
+ // Gone by the time the header is half closed: below that there
+ // is no room for a 68dp play button and a two-line title, and
+ // watching them be squeezed is worse than watching them leave.
+ .graphicsLayer { alpha = (1f - collapse() * 2f).coerceIn(0f, 1f) },
horizontalAlignment = Alignment.CenterHorizontally,
) {
Text(
@@ -678,6 +615,63 @@ private fun DetailHeader(
)
}
}
+
+ // What the header becomes: the same title and the same three controls,
+ // at the size a bar can carry them. It arrives in the second half of the
+ // travel, as the full-size version finishes leaving.
+ Row(
+ Modifier
+ .align(Alignment.BottomStart)
+ .fillMaxWidth()
+ .height(collapsedHeight)
+ .padding(top = topPadding)
+ .padding(horizontal = 6.dp)
+ .graphicsLayer { alpha = (collapse() * 2f - 1f).coerceIn(0f, 1f) },
+ verticalAlignment = Alignment.CenterVertically,
+ ) {
+ IconButton(onClick = onBack) {
+ Icon(
+ PhosphorIcons.Regular.ArrowLeft,
+ contentDescription = "Indietro",
+ tint = Color.White,
+ modifier = Modifier.size(20.dp),
+ )
+ }
+ Text(
+ name,
+ style = MaterialTheme.typography.titleMedium,
+ color = Color.White,
+ maxLines = 1,
+ overflow = TextOverflow.Ellipsis,
+ modifier = Modifier
+ .weight(1f)
+ .padding(horizontal = 6.dp),
+ )
+ IconButton(onClick = onToggleSearch) {
+ Icon(
+ if (searching) PhosphorIcons.Regular.X else PhosphorIcons.Fill.MagnifyingGlass,
+ contentDescription = "Cerca fra i brani",
+ tint = Color.White,
+ modifier = Modifier.size(18.dp),
+ )
+ }
+ IconButton(onClick = onShuffle) {
+ Icon(
+ PhosphorIcons.Regular.Shuffle,
+ contentDescription = "Casuale",
+ tint = Color.White,
+ modifier = Modifier.size(18.dp),
+ )
+ }
+ IconButton(onClick = onPlay) {
+ Icon(
+ PhosphorIcons.Fill.Play,
+ contentDescription = "Riproduci",
+ tint = Color.White,
+ modifier = Modifier.size(22.dp),
+ )
+ }
+ }
}
}
@@ -706,7 +700,6 @@ private fun CircleAction(
}
}
-/** The artist's albums, which is the one part playlists and albums have no use for. */
@Composable
private fun AlbumStrip(
albums: List<dev.emanuele.spot.data.SearchItem>,
@@ -796,13 +789,8 @@ private fun SectionHeader(
}
}
-/**
- * How much of the hero has to go before the bar has fully taken over.
- *
- * Not the whole cover: the bar should be there by the time the first tracks
- * reach the top of the screen, not once the entire picture has gone.
- */
-private const val COLLAPSE_DISTANCE_PX = 620f
+/** What the hero shrinks to: a bar, under the status bar's own inset. */
+private val COLLAPSED_BAR_HEIGHT = 56.dp
/** Tall enough to be the top of the screen rather than a banner above a list. */
private val HERO_HEIGHT = 420.dp
@@ -933,10 +921,9 @@ private fun TrackRow(
* display and not its URI, so the entry would be there and not work.
*/
@Composable
-private fun BoxScope.TrackMenu(
+private fun TrackMenu(
track: CatalogTrack?,
anchor: IntOffset,
- backdrop: Backdrop,
onDismiss: () -> Unit,
onPlay: (CatalogTrack) -> Unit,
onEnqueue: (CatalogTrack) -> Unit,
@@ -948,12 +935,7 @@ private fun BoxScope.TrackMenu(
// Held so the menu still has something to draw while it animates out.
val shown = remember(track) { track } ?: return
- GlassMenu(
- visible = track != null,
- anchor = anchor,
- backdrop = backdrop,
- onDismiss = onDismiss,
- ) {
+ GlassMenu(visible = track != null, anchor = anchor, onDismiss = onDismiss) {
GlassMenuItem("Riproduci", PhosphorIcons.Fill.Play) { onDismiss(); onPlay(shown) }
GlassMenuItem("Aggiungi alla coda", PhosphorIcons.Regular.Queue) {
onDismiss()