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.

Let the dialogs wear what the app is made of

Leloniocc0837227682
diff --git a/app/src/main/java/dev/lelonio/square/ui/components/ConfirmDialog.kt b/app/src/main/java/dev/lelonio/square/ui/components/ConfirmDialog.kt
index 214f1a3..1800460 100644
--- a/app/src/main/java/dev/lelonio/square/ui/components/ConfirmDialog.kt
+++ b/app/src/main/java/dev/lelonio/square/ui/components/ConfirmDialog.kt
@@ -45,8 +45,7 @@ fun ConfirmDialog(
Column(
Modifier
.fillMaxWidth()
- .clip(shape)
- .background(DialogFill)
+ .menuSkin(shape)
.padding(22.dp),
) {
Text(title, style = MaterialTheme.typography.titleMedium, color = Ink)
@@ -83,4 +82,3 @@ private fun DialogAction(label: String, color: Color, onClick: () -> Unit) {
)
}
-private val DialogFill = Color(0xFF1B1B1B)
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 bb7c682..8aa4235 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
@@ -332,6 +332,23 @@ fun BoxScope.GlassChoiceMenu(
* is thickened: at 0.55 and above it adds nothing at all and the menu is purely
* what the settings say.
*/
+/**
+ * The skin a menu wears, for the other things that live in their own window.
+ *
+ * A dialog is a separate window like a popup is, so it cannot sample the layer
+ * behind it and cannot be real glass — see the note on [GlassMenu]. What it can
+ * be is the same surface: the same base, the same film taken from the
+ * listener's own glass settings, the same hairline. Two windows that cannot
+ * refract should at least be one design.
+ */
+@Composable
+fun Modifier.menuSkin(shape: androidx.compose.ui.graphics.Shape): Modifier =
+ this
+ .clip(shape)
+ .background(MenuSurface)
+ .background(menuFilm())
+ .border(1.dp, MenuEdge, shape)
+
@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/components/NameDialog.kt b/app/src/main/java/dev/lelonio/square/ui/components/NameDialog.kt
index c8e8538..fd5337d 100644
--- a/app/src/main/java/dev/lelonio/square/ui/components/NameDialog.kt
+++ b/app/src/main/java/dev/lelonio/square/ui/components/NameDialog.kt
@@ -54,8 +54,7 @@ fun NameDialog(
Column(
Modifier
.fillMaxWidth()
- .clip(shape)
- .background(DialogFill)
+ .menuSkin(shape)
.padding(22.dp),
) {
Text(title, style = MaterialTheme.typography.titleMedium, color = Ink)
@@ -118,7 +117,5 @@ private fun DialogAction(label: String, color: Color, onClick: () -> Unit) {
)
}
-/** Opaque: a dialog floats over its own scrim, with no artwork to refract. */
-private val DialogFill = Color(0xFF1B1B1B)
private val FieldFill = Color.White.copy(alpha = 0.08f)
diff --git a/app/src/main/java/dev/lelonio/square/ui/components/UpdateDialog.kt b/app/src/main/java/dev/lelonio/square/ui/components/UpdateDialog.kt
index c313862..d441c5f 100644
--- a/app/src/main/java/dev/lelonio/square/ui/components/UpdateDialog.kt
+++ b/app/src/main/java/dev/lelonio/square/ui/components/UpdateDialog.kt
@@ -42,8 +42,7 @@ fun UpdateDialog(
Column(
Modifier
.fillMaxWidth()
- .clip(RoundedCornerShape(24.dp))
- .background(DialogFill)
+ .menuSkin(RoundedCornerShape(24.dp))
.padding(22.dp),
) {
Text(
@@ -88,5 +87,3 @@ private fun DialogAction(label: String, color: Color, onClick: () -> Unit) {
)
}
-/** Opaque, like the other dialogs: nothing behind this is worth refracting. */
-private val DialogFill = Color(0xFF1B1B1B)