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.

Menus and sheets are written in the app's ink, readable on the light side

Lelonio346d16d3660d
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 abebe29..d353e45 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
@@ -1,5 +1,6 @@
package dev.lelonio.square.ui.components
+import dev.lelonio.square.ui.player.GlassInk
import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.core.tween
import androidx.compose.animation.fadeIn
@@ -123,7 +124,9 @@ fun GlassMenuItem(
destructive: Boolean = false,
onClick: () -> Unit,
) {
- val tint = if (destructive) MaterialTheme.colorScheme.error else Color.White
+ // The app's ink, not white: on the light side the menu is pale, and
+ // white rows on it could not be read.
+ val tint = if (destructive) MaterialTheme.colorScheme.error else GlassInk
Row(
Modifier
.fillMaxWidth()
@@ -245,7 +248,7 @@ fun GlassIconMenuItem(
Icon(
icon,
contentDescription = description,
- tint = if (destructive) MaterialTheme.colorScheme.error else Color.White,
+ tint = if (destructive) MaterialTheme.colorScheme.error else GlassInk,
modifier = Modifier.size(21.dp),
)
}
@@ -397,7 +400,7 @@ fun GlassMenuRule() {
.fillMaxWidth()
.padding(horizontal = 14.dp, vertical = 5.dp)
.height(1.dp)
- .background(Color.White.copy(alpha = 0.10f)),
+ .background(GlassInk.copy(alpha = 0.10f)),
)
}
@@ -417,7 +420,7 @@ fun GlassChoiceItem(
Text(
label,
style = MaterialTheme.typography.bodyMedium,
- color = if (selected) Color.White else Color.White.copy(alpha = 0.72f),
+ color = if (selected) GlassInk else GlassInk.copy(alpha = 0.72f),
maxLines = 1,
modifier = Modifier.weight(1f),
)
@@ -427,7 +430,7 @@ fun GlassChoiceItem(
Icon(
CheckIcon,
contentDescription = null,
- tint = Color.White,
+ tint = GlassInk,
modifier = Modifier.size(15.dp),
)
}
diff --git a/app/src/main/java/dev/lelonio/square/ui/components/TrackSheet.kt b/app/src/main/java/dev/lelonio/square/ui/components/TrackSheet.kt
index 9699977..e253d1b 100644
--- a/app/src/main/java/dev/lelonio/square/ui/components/TrackSheet.kt
+++ b/app/src/main/java/dev/lelonio/square/ui/components/TrackSheet.kt
@@ -1,5 +1,7 @@
package dev.lelonio.square.ui.components
+import dev.lelonio.square.ui.player.GlassInk
+import dev.lelonio.square.ui.player.GlassInkDim
import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.core.tween
import androidx.compose.animation.fadeIn
@@ -132,14 +134,14 @@ fun BoxScope.TrackSheet(
Text(
title,
style = MaterialTheme.typography.titleMedium,
- color = Color.White,
+ color = GlassInk,
maxLines = 2,
overflow = TextOverflow.Ellipsis,
)
Text(
subtitle,
style = MaterialTheme.typography.bodySmall,
- color = Color.White.copy(alpha = 0.66f),
+ color = GlassInkDim,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
)
@@ -152,7 +154,7 @@ fun BoxScope.TrackSheet(
.fillMaxWidth()
.padding(horizontal = 22.dp)
.size(width = 0.dp, height = 1.dp)
- .background(Color.White.copy(alpha = 0.12f)),
+ .background(GlassInk.copy(alpha = 0.12f)),
)
actions()
@@ -168,7 +170,9 @@ fun TrackSheetAction(
destructive: Boolean = false,
onClick: () -> Unit,
) {
- val tint = if (destructive) MaterialTheme.colorScheme.error else Color.White
+ // The app's ink, not white: on the light side the glass is pale, and
+ // white rows on it could not be read.
+ val tint = if (destructive) MaterialTheme.colorScheme.error else GlassInk
Row(
Modifier
.fillMaxWidth()