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.

The sort menu on a playlist page reads the same on every cover

Lelonioc3acd41c3800
diff --git a/app/src/main/java/dev/lelonio/square/ui/components/GlassMenu.kt b/app/src/main/java/dev/lelonio/square/ui/components/GlassMenu.kt
index d353e45..6012d37 100644
--- a/app/src/main/java/dev/lelonio/square/ui/components/GlassMenu.kt
+++ b/app/src/main/java/dev/lelonio/square/ui/components/GlassMenu.kt
@@ -302,21 +302,16 @@ fun BoxScope.GlassChoiceMenu(
.offset { anchor },
) {
val shape = RoundedCornerShape(20.dp)
- // The bottom bar's material, from the same recipe and the same
- // settings: liquidGlass with the listener's configuration, which paints
- // the surface tint at the opacity they chose and lights the same rim.
- // No film of its own on top — that was a dark card wearing glass, and
- // the one surface in the app that ignored what the settings said.
- //
- // The single thing it chooses for itself is how far it blurs, which is
- // what a pane is allowed to differ in: this one covers a page of covers
- // rather than sitting in a pill, and the depth is what lifts its rows
- // off them.
+ // Real glass, refracting the page it opens over, as the page's own
+ // controls do — but thick: blurred far enough that the titles below
+ // are colour and not words, and filmed in the app's own surface colour
+ // so the rows read the same on any cover. A flat opaque pane looked
+ // like a hole in the page rather than something above it.
val config = dev.lelonio.square.ui.glass.LocalGlassEffectConfig.current
Box(
Modifier
.width(CHOICE_MENU_WIDTH)
- .softShadow(shape, elevation = 18.dp, spot = 0.3f)
+ .softShadow(shape, elevation = 22.dp, spot = 0.35f)
.liquidGlass(
config = config,
shape = shape,
@@ -324,13 +319,18 @@ fun BoxScope.GlassChoiceMenu(
highlightAlpha = 0.3f,
ownBackdrop = backdrop,
)
- // Over the pane rather than under its rows: a background on the
- // column only covers where the rows are, and the point of this
- // is that the whole pane stops the page showing through.
- .background(menuFilm(), shape)
+ .background(choiceFilm(), shape)
+ .border(1.dp, MenuEdge, shape)
.clip(shape),
) {
- Column(Modifier.padding(vertical = 4.dp), content = content)
+ // The app's own ink: a playlist's page rebuilds the theme from its
+ // cover, and its ink — white on a dark red page — is not the ink
+ // for a pale pane.
+ androidx.compose.runtime.CompositionLocalProvider(
+ dev.lelonio.square.ui.theme.LocalInkOverride provides dev.lelonio.square.ui.theme.AppInk,
+ ) {
+ Column(Modifier.padding(vertical = 4.dp), content = content)
+ }
}
}
}
@@ -367,6 +367,17 @@ fun Modifier.menuSkin(shape: androidx.compose.ui.graphics.Shape): Modifier =
.background(menuFilm())
.border(1.dp, MenuEdge, shape)
+/**
+ * The film of the in-page menu: the app's surface colour, thick enough that
+ * the titles of the songs under it do not show through its rows — at 0.72
+ * they did, sharp, over a playlist's own coloured page — and still short of
+ * opaque, so the glass's rim and the page's tint stay at its edges.
+ */
+@Composable
+private fun choiceFilm(): Color =
+ if (dev.lelonio.square.ui.theme.lightPage()) Color(0xFFF6F6FA).copy(alpha = 0.9f)
+ else Color(0xFF16161A).copy(alpha = 0.88f)
+
@Composable
private fun menuFilm(): Color {
val config = dev.lelonio.square.ui.glass.LocalGlassEffectConfig.current
diff --git a/app/src/main/java/dev/lelonio/square/ui/library/PlaylistScreen.kt b/app/src/main/java/dev/lelonio/square/ui/library/PlaylistScreen.kt
index a5d6ba1..f2e8fb8 100644
--- a/app/src/main/java/dev/lelonio/square/ui/library/PlaylistScreen.kt
+++ b/app/src/main/java/dev/lelonio/square/ui/library/PlaylistScreen.kt
@@ -102,6 +102,7 @@ import dev.lelonio.square.ui.glass.backdrop.Backdrop
import dev.lelonio.square.ui.glass.backdrop.backdrops.layerBackdrop
import dev.lelonio.square.ui.glass.backdrop.backdrops.rememberCombinedBackdrop
import dev.lelonio.square.ui.glass.backdrop.backdrops.rememberLayerBackdrop
+import dev.lelonio.square.ui.glass.backdrop.backdrops.rememberCombinedBackdrop
import dev.lelonio.square.ui.glass.backdrop.backdrops.rememberBackdropFreeze
import dev.lelonio.square.ui.components.Artwork
import dev.lelonio.square.ui.components.CHOICE_MENU_WIDTH
@@ -1402,7 +1403,10 @@ fun PlaylistScreen(
GlassChoiceMenu(
visible = sortOpen,
anchor = sortAnchor.leftOf(density),
- backdrop = listBackdrop,
+ // The page and the rows together, as the library's menu does: the
+ // rows' layer alone is transparent between them, and the glass had
+ // nothing but empty space to bend.
+ backdrop = rememberCombinedBackdrop(pageBackdrop, listBackdrop),
onDismiss = { sortOpen = false },
) {
TrackSort.entries.forEach { option ->
diff --git a/app/src/main/java/dev/lelonio/square/ui/theme/Theme.kt b/app/src/main/java/dev/lelonio/square/ui/theme/Theme.kt
index 7766145..5bfaf4b 100644
--- a/app/src/main/java/dev/lelonio/square/ui/theme/Theme.kt
+++ b/app/src/main/java/dev/lelonio/square/ui/theme/Theme.kt
@@ -176,6 +176,14 @@ private val LightInk = Color(0xFF15161A)
val Ink: Color
@Composable get() = LocalInkOverride.current ?: MaterialTheme.colorScheme.onSurface
+/**
+ * The app's own ink, whatever the page around it has done to the theme: for a
+ * surface that keeps the app's colours on a page coloured by its cover — a
+ * menu, which is a light pane on the light side and a dark one on the dark.
+ */
+val AppInk: Color
+ @Composable get() = if (lightPage()) LightInk else DarkInk
+
/** The same, for what is said quietly. */
val InkDim: Color
@Composable get() = Ink.copy(alpha = 0.66f)