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.

Keep the karaoke badge off the lyrics, where it covered the source credit (#79)

Lelonio6d1ee8fdff95
diff --git a/app/src/main/java/dev/lelonio/square/ui/player/PlayerScreen.kt b/app/src/main/java/dev/lelonio/square/ui/player/PlayerScreen.kt
index 16d4282..4bb5af4 100644
--- a/app/src/main/java/dev/lelonio/square/ui/player/PlayerScreen.kt
+++ b/app/src/main/java/dev/lelonio/square/ui/player/PlayerScreen.kt
@@ -1242,8 +1242,12 @@ fun PlayerScreen(
// already has all the room it needs.
val karaokeAmount by dev.lelonio.square.playback.AudioEffects.karaoke
.collectAsStateWithLifecycle()
+ // Not over the lyrics, where the karaoke's own
+ // control is on screen and the source's credit
+ // takes this same line: the two were drawn on top
+ // of each other (#79).
androidx.compose.animation.AnimatedVisibility(
- visible = karaokeAmount > 0f && !sdkPlayback,
+ visible = karaokeAmount > 0f && !sdkPlayback && panel != PlayerPanel.LYRICS,
enter = fadeIn(tween(220)),
exit = fadeOut(tween(180)),
modifier = Modifier