Native Android client for Spotify, built with Jetpack Compose
Kotlin ad-freeadblockandroidjetpack-composekotlinlyricsmusic-playermusic-videomyspotispotifyspotify-adblockerspotify-clientspotify-connectspotui
Lyric translation in the Immersive player: a round translate button at the top corner of the lyrics (lit while the translation shows, a spinner while it is fetched, hidden when the song is already in the reader's language) puts each line in the reader's language under it, with the Classic screen's language setting, service and state; the lyrics are only sent when the button is tapped [skip ci]
kota-zocf73790db08e
diff --git a/base/app/src/main/java/com/music/spotui/ui/immersive/lyrics/ImmersiveLyricsPanel.kt b/base/app/src/main/java/com/music/spotui/ui/immersive/lyrics/ImmersiveLyricsPanel.ktindex 03e0a65a..66de1617 100644--- a/base/app/src/main/java/com/music/spotui/ui/immersive/lyrics/ImmersiveLyricsPanel.kt+++ b/base/app/src/main/java/com/music/spotui/ui/immersive/lyrics/ImmersiveLyricsPanel.kt@@ -6,8 +6,9 @@* Changes: LyricsPanel's list, PanelVoice, the gap dots, the loading skeleton and the* scroll lead / stagger, fed by Myspoti's LyricsViewModel. Myspoti's lyrics are mostly* line-synced, so a line lights whole (BitChord's line-level path) and the word sweep runs- * only where a line has words. Translation, romanization, particles, duets, backing vocals,- * line picking and the player-controls hand-off are left out for now.+ * only where a line has words. Romanization, particles, duets, backing vocals,+ * line picking and the player-controls hand-off are left out for now. The translation is+ * Myspoti's own: the Classic screen's, shown under the lines.*/package com.music.spotui.ui.immersive.lyrics@@ -38,6 +39,7 @@ import androidx.compose.foundation.layout.PaddingValuesimport androidx.compose.foundation.layout.Spacerimport androidx.compose.foundation.layout.calculateEndPaddingimport androidx.compose.foundation.layout.calculateStartPadding+import androidx.compose.foundation.layout.fillMaxSizeimport androidx.compose.foundation.layout.fillMaxWidthimport androidx.compose.foundation.layout.heightimport androidx.compose.foundation.layout.padding@@ -118,6 +120,14 @@ import kotlin.math.absimport androidx.compose.foundation.shape.CircleShapeimport androidx.compose.material.icons.Iconsimport androidx.compose.material.icons.rounded.FormatQuote+import androidx.compose.material.icons.rounded.Translate+import androidx.compose.material3.CircularProgressIndicator+import androidx.compose.animation.AnimatedVisibility+import androidx.compose.animation.expandVertically+import androidx.compose.animation.fadeIn+import androidx.compose.animation.fadeOut+import androidx.compose.animation.shrinkVertically+import androidx.compose.ui.text.font.FontWeightimport androidx.compose.material3.Iconimport androidx.compose.ui.geometry.CornerRadiusimport androidx.compose.ui.geometry.Rect@@ -170,13 +180,59 @@ fun ImmersiveLyricsPanel(modifier: Modifier = Modifier, contentPadding: PaddingVis LyricsViewModel.State.Loaded -> {// A new track, or new lyrics for it, starts the list over: its scroll position and// handover state belong to the lines they were made for.- key(trackKey, System.identityHashCode(current.lyrics)) {- LyricsList(current.lyrics, trackKey, modifier, contentPadding)+ val target = com.music.spotui.ui.components.readerLanguage()+ Box(modifier) {+ key(trackKey, System.identityHashCode(current.lyrics)) {+ LyricsList(+ current.lyrics, trackKey, Modifier.fillMaxSize(), contentPadding,+ translations = if (current.showTranslation) current.translations else null,+ )+ }+ // The Classic screen's translation, with its language setting and its service: the+ // lyrics are only sent when it is tapped. Not offered for a song already in that language.+ if (!LyricsViewModel.sameLanguage(current.sourceLanguage, target)) {+ val layoutDirection = LocalLayoutDirection.current+ TranslateToggle(+ on = current.showTranslation,+ loading = current.translating && current.translationRequested,+ onClick = { vm.toggleTranslation(target) },+ modifier = Modifier+ .align(Alignment.TopEnd)+ .padding(+ top = contentPadding.calculateTopPadding(),+ end = Immersive.Gutter + contentPadding.calculateEndPadding(layoutDirection),+ ),+ )+ }}}}}+/** A round toggle over the lyrics, lit white while the translation is showing; a spinner while it is fetched. */+@Composable+private fun TranslateToggle(on: Boolean, loading: Boolean, onClick: () -> Unit, modifier: Modifier = Modifier) {+ Box(+ contentAlignment = Alignment.Center,+ modifier = modifier+ .size(36.dp)+ .clip(CircleShape)+ .background(if (on) Color.White else Color.White.copy(alpha = 0.14f))+ .immersiveClickable(onClick = onClick, enabled = !loading, pressedScale = 0.9f),+ ) {+ if (loading) {+ CircularProgressIndicator(color = Color.White, strokeWidth = 2.dp, modifier = Modifier.size(18.dp))+ } else {+ Icon(+ Icons.Rounded.Translate,+ contentDescription = stringResource(R.string.lyrics_fullscreen_chip_label_translate),+ tint = if (on) Color.Black else Color.White,+ modifier = Modifier.size(20.dp),+ )+ }+ }+}+// ─── Rows ────────────────────────────────────────────────────────────────────────────────/**@@ -190,6 +246,8 @@ private class PanelLine(/** Where a break ends; unused for a sung line. */val untilMs: Long,val swept: SweptLine,+ /** The line's place in the source lyrics, which the translation is indexed by; -1 for a break the panel adds. */+ val source: Int = -1,) {val isWordSynced: Boolean get() = !isGap && swept.isWordSynced@@ -218,9 +276,9 @@ private fun panelLines(lyrics: Lyrics, synced: Boolean): List<PanelLine> {source.forEachIndexed { index, line ->val next = source.getOrNull(index + 1)?.timeMsif (synced && isGapText(line.text)) {- out += PanelLine(line.timeMs, "", true, next ?: (line.timeMs + TRAILING_GAP_MS), SweptLine(line.timeMs, ""))+ out += PanelLine(line.timeMs, "", true, next ?: (line.timeMs + TRAILING_GAP_MS), SweptLine(line.timeMs, ""), index)} else {- out += PanelLine(line.timeMs, line.text, false, 0L, line.toSwept(next))+ out += PanelLine(line.timeMs, line.text, false, 0L, line.toSwept(next), index)}}return out@@ -288,6 +346,8 @@ private fun LyricsList(trackKey: String,modifier: Modifier,contentPadding: PaddingValues,+ /** The lines in the reader's language, one per line of the lyrics; null while they are not shown. */+ translations: List<String>?,) {val isSynced = remember(lyrics) { lyrics.synced && lyrics.lines.any { it.timeMs > 0L } }val rows = remember(lyrics, isSynced) { panelLines(lyrics, isSynced) }@@ -455,6 +515,7 @@ private fun LyricsList(glowing = blurOk,clock = clock,noteMeasurer = noteMeasurer,+ translation = translations?.getOrNull(row.source)?.takeIf { row.source >= 0 },onNote = notes[index]?.let { n -> { noteOpen = n } },onHold = notes[index]?.let { n ->{@@ -490,6 +551,8 @@ private fun PanelRow(glowing: Boolean,clock: MutableLongState,noteMeasurer: TextMeasurer,+ /** The line in the reader's language, under it. */+ translation: String?,/** Opens the Genius note on this line; null when Genius has none. */onNote: (() -> Unit)?,onHold: (() -> Unit)?,@@ -628,25 +691,40 @@ private fun PanelRow(},)- CompositionLocalProvider(LocalLayoutDirection provides LayoutDirection.Ltr) {- NoteLayout(- text = row.text,- style = lineStyle,- measurer = noteMeasurer,- onNote = onNote,- modifier = shape,- ) {- PanelVoice(- row = row,- clock = clock,+ // The words, and under them the same line in the reader's language: one row to the press, the+ // dimming and the blur.+ Column(shape) {+ CompositionLocalProvider(LocalLayoutDirection provides LayoutDirection.Ltr) {+ NoteLayout(+ text = row.text,style = lineStyle,- isActive = isActive,- sung = sung,- synced = synced,- browsing = browsing,- glowAlpha = glow,- room = GLOW_ROOM,- modifier = Modifier.fillMaxWidth(),+ measurer = noteMeasurer,+ onNote = onNote,+ ) {+ PanelVoice(+ row = row,+ clock = clock,+ style = lineStyle,+ isActive = isActive,+ sung = sung,+ synced = synced,+ browsing = browsing,+ glowAlpha = glow,+ room = GLOW_ROOM,+ modifier = Modifier.fillMaxWidth(),+ )+ }+ }+ AnimatedVisibility(+ visible = !translation.isNullOrBlank(),+ enter = expandVertically(tween(260)) + fadeIn(tween(260)),+ exit = shrinkVertically(tween(260)) + fadeOut(tween(260)),+ ) {+ Text(+ text = translation.orEmpty(),+ style = Immersive.Headline.copy(fontWeight = FontWeight.Medium),+ color = Immersive.TextSecondary,+ modifier = Modifier.padding(horizontal = GLOW_ROOM).padding(bottom = 8.dp),)}}diff --git a/base/app/src/main/java/com/music/spotui/ui/screens/LyricsScreen.kt b/base/app/src/main/java/com/music/spotui/ui/screens/LyricsScreen.ktindex 744aa30a..d54b7a56 100644--- a/base/app/src/main/java/com/music/spotui/ui/screens/LyricsScreen.kt+++ b/base/app/src/main/java/com/music/spotui/ui/screens/LyricsScreen.kt@@ -569,8 +569,7 @@ fun LyricsScreen(}}}- val sameLanguage = state.sourceLanguage?.substringBefore('-')- ?.equals(targetLanguage.substringBefore('-'), ignoreCase = true) == true+ val sameLanguage = LyricsViewModel.sameLanguage(state.sourceLanguage, targetLanguage)LyricsControls(palette = palette,position = position,diff --git a/base/app/src/main/java/com/music/spotui/ui/viewmodel/LyricsViewModel.kt b/base/app/src/main/java/com/music/spotui/ui/viewmodel/LyricsViewModel.ktindex 9be3855d..2a781714 100644--- a/base/app/src/main/java/com/music/spotui/ui/viewmodel/LyricsViewModel.kt+++ b/base/app/src/main/java/com/music/spotui/ui/viewmodel/LyricsViewModel.kt@@ -145,7 +145,10 @@ class LyricsViewModel constructor() : ViewModel() {}}- private fun sameLanguage(source: String?, target: String): Boolean =- source?.substringBefore('-')- ?.equals(target.substringBefore('-'), ignoreCase = true) == true+ companion object {+ /** Whether [source] is [target]'s language, regions apart: nothing to translate then. */+ fun sameLanguage(source: String?, target: String): Boolean =+ source?.substringBefore('-')+ ?.equals(target.substringBefore('-'), ignoreCase = true) == true+ }}