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.

hotfix

Lelonio8f36bcd08a6f
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 0a54fd8..60da5f9 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
@@ -14,6 +14,7 @@ import androidx.compose.ui.util.lerp
import kotlin.math.roundToInt
import kotlin.math.pow
import dev.lelonio.square.ui.glass.morph.liquidGlassGroup
+import dev.lelonio.square.ui.glass.morph.LiquidGlassRenderer
import dev.lelonio.square.ui.glass.toLiquidGlassSettings
import androidx.compose.runtime.derivedStateOf
import androidx.compose.runtime.mutableStateOf
@@ -300,6 +301,12 @@ fun BoxScope.GlassChoiceMenu(
trigger: GlassMenuTrigger? = null,
content: @Composable ColumnScope.() -> Unit,
) {
+ // The morph uses the large multi-shape AGSL program. If this GPU rejected
+ // it, retain the prior glass menu rather than leaving choices unpainted.
+ if (!LiquidGlassRenderer.enabled) {
+ CompatibleGlassChoiceMenu(visible, anchor, backdrop, onDismiss, content)
+ return
+ }
// liquid_glass_widgets' GlassMenu, ported (glass_menu_internal.dart): the
// control's glass (blob A) and the menu's (blob B) in one blend group; B
// travels from the control to its place while growing into it, A shrinks
@@ -468,6 +475,62 @@ fun BoxScope.GlassChoiceMenu(
}
}
+/** The pre-morph pane, kept as the safe renderer fallback for constrained GPUs. */
+@Composable
+private fun BoxScope.CompatibleGlassChoiceMenu(
+ visible: Boolean,
+ anchor: IntRect,
+ backdrop: Backdrop,
+ onDismiss: () -> Unit,
+ content: @Composable ColumnScope.() -> Unit,
+) {
+ val density = LocalDensity.current
+ AnimatedVisibility(
+ visible = visible,
+ enter = fadeIn(tween(120)),
+ exit = fadeOut(tween(120)),
+ modifier = Modifier.fillMaxSize(),
+ ) {
+ Box(Modifier.fillMaxSize().clickable(interactionSource = null, indication = null, onClick = onDismiss))
+ }
+ AnimatedVisibility(
+ visible = visible,
+ enter = scaleIn(tween(180), initialScale = 0.85f, transformOrigin = TopEnd) + fadeIn(tween(120)),
+ exit = scaleOut(tween(130), targetScale = 0.9f, transformOrigin = TopEnd) + fadeOut(tween(110)),
+ modifier = Modifier.align(Alignment.TopStart).offset {
+ val gap = with(density) { 8.dp.roundToPx() }
+ IntOffset(
+ (anchor.right - with(density) { CHOICE_MENU_WIDTH.roundToPx() } + gap).coerceAtLeast(gap),
+ anchor.bottom + gap,
+ )
+ },
+ ) {
+ val shape = RoundedCornerShape(20.dp)
+ val config = dev.lelonio.square.ui.glass.LocalGlassEffectConfig.current
+ Box(
+ Modifier
+ .width(CHOICE_MENU_WIDTH)
+ .softShadow(shape, elevation = 22.dp, spot = 0.35f)
+ .liquidGlass(
+ config = config,
+ shape = shape,
+ blurRadiusDp = config.blurRadius * MENU_BLUR_SCALE,
+ highlightAlpha = 0.3f,
+ ownBackdrop = backdrop,
+ )
+ .background(choiceFilm(), shape)
+ .border(1.dp, MenuEdge, shape)
+ .clip(shape),
+ ) {
+ 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)
+ }
+ }
+ }
+}
+
/**
* The control a [GlassChoiceMenu] grows out of.
*
diff --git a/app/src/main/java/dev/lelonio/square/ui/glass/GlassEffect.kt b/app/src/main/java/dev/lelonio/square/ui/glass/GlassEffect.kt
index d0d9a8f..ef263a3 100644
--- a/app/src/main/java/dev/lelonio/square/ui/glass/GlassEffect.kt
+++ b/app/src/main/java/dev/lelonio/square/ui/glass/GlassEffect.kt
@@ -6,6 +6,7 @@
package dev.lelonio.square.ui.glass
import dev.lelonio.square.ui.glass.morph.liquidGlassMaterial
+import dev.lelonio.square.ui.glass.morph.LiquidGlassRenderer
import android.app.ActivityManager
import android.os.Build
import androidx.compose.foundation.shape.CornerBasedShape
@@ -459,7 +460,7 @@ fun Modifier.liquidGlass(
// in the shader, at the layer's own resolution: recorded at a fraction
// and stretched back up, the rim came out soft and doubled. It is drawn
// at full resolution, as upstream draws it.
- val upstreamCapable = Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU &&
+ val upstreamCapable = LiquidGlassRenderer.enabled &&
config.style != GlassStyle.BLUR && applyEdgeEffects
val resolutionScale = if (upstreamCapable) 1f else backdropScale.coerceIn(0.05f, 1f)
// A surface that names its own condition (the tab bar, mid-fold) still
diff --git a/app/src/main/java/dev/lelonio/square/ui/glass/morph/LiquidGlassEffect.kt b/app/src/main/java/dev/lelonio/square/ui/glass/morph/LiquidGlassEffect.kt
index 43ab929..5f9415a 100644
--- a/app/src/main/java/dev/lelonio/square/ui/glass/morph/LiquidGlassEffect.kt
+++ b/app/src/main/java/dev/lelonio/square/ui/glass/morph/LiquidGlassEffect.kt
@@ -28,7 +28,7 @@ fun BackdropEffectScope.liquidGlassMaterial(
/** Upstream's touch intensity: 0 at rest, 1 pressed. */
touchIntensity: Float = 0f,
) {
- if (!isRuntimeShaderSupported()) return
+ if (!isRuntimeShaderSupported() || !LiquidGlassRenderer.enabled) return
if (size.width <= 0f || size.height <= 0f) return
// The recorded layer's pixels per logical pixel.
@@ -42,7 +42,9 @@ fun BackdropEffectScope.liquidGlassMaterial(
?.fastCoerceAtMost(size.minDimension / 2f)
?: (size.minDimension / 2f)
- val shader = obtainRuntimeShader("LiquidGlassSingle", LiquidGlassShader.SOURCE_SINGLE)
+ val shader = runCatching {
+ obtainRuntimeShader("LiquidGlassSingle", LiquidGlassShader.SOURCE_SINGLE)
+ }.onFailure(LiquidGlassRenderer::unavailable).getOrNull() ?: return
// The surface, as it sits in the recorded layer: inset by the padding
// the blur asked for.
diff --git a/app/src/main/java/dev/lelonio/square/ui/glass/morph/MorphGlass.kt b/app/src/main/java/dev/lelonio/square/ui/glass/morph/MorphGlass.kt
index e0a40e4..c1fb4f3 100644
--- a/app/src/main/java/dev/lelonio/square/ui/glass/morph/MorphGlass.kt
+++ b/app/src/main/java/dev/lelonio/square/ui/glass/morph/MorphGlass.kt
@@ -39,6 +39,38 @@ import dev.lelonio.square.ui.glass.backdrop.Backdrop
import kotlin.math.cos
import kotlin.math.sin
+/**
+ * The AGSL material is an optional enhancement, not a prerequisite for the
+ * interface. A few GPU drivers reject its large program at compile time (for
+ * example the Adreno driver in Xiaomi M2012K11G on Android 14). Remember that
+ * result for this process so a failed compile cannot take the app down again.
+ */
+object LiquidGlassRenderer {
+ private var available by mutableStateOf(true)
+
+ val enabled: Boolean
+ get() = available && Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU
+
+ fun groupShader(): android.graphics.RuntimeShader? = create("blend group") {
+ android.graphics.RuntimeShader(LiquidGlassShader.SOURCE)
+ }
+
+ fun unavailable(error: Throwable) {
+ if (available) {
+ android.util.Log.w("SquareGlass", "Liquid Glass is unavailable on this GPU; using compatible glass", error)
+ available = false
+ }
+ }
+
+ private inline fun create(label: String, factory: () -> android.graphics.RuntimeShader): android.graphics.RuntimeShader? {
+ if (!enabled) return null
+ return runCatching(factory).onFailure {
+ android.util.Log.w("SquareGlass", "could not compile Liquid Glass $label", it)
+ available = false
+ }.getOrNull()
+ }
+}
+
/** Upstream's `GlassLensModel`. */
enum class GlassLensModel { Spherical, Paraxial }
@@ -159,12 +191,7 @@ class LiquidGlassCapture internal constructor(
internal var sharpShader: android.graphics.Shader? = null
internal var blurredShader: android.graphics.Shader? = null
- internal val shader: android.graphics.RuntimeShader? =
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
- android.graphics.RuntimeShader(LiquidGlassShader.SOURCE)
- } else {
- null
- }
+ internal val shader: android.graphics.RuntimeShader? = LiquidGlassRenderer.groupShader()
internal val paint = android.graphics.Paint()
internal val shapeData = FloatArray(LiquidGlassShader.MAX_SHAPES * LiquidGlassShader.SHAPE_STRIDE)