Native Android client for Spotify, built with Jetpack Compose
Kotlin ad-freeadblockandroidjetpack-composekotlinlyricsmusic-playermusic-videomyspotispotifyspotify-adblockerspotify-clientspotify-connectspotui
Onboarding drawn in the look picked in it and ending on the extensions store; the Download action points to the store when no download extension is installed; the source line of the player shows Spotify's own quality and the format of downloads
kota-zo813d05fb5f8b
diff --git a/base/app/src/main/java/com/music/spotui/App.kt b/base/app/src/main/java/com/music/spotui/App.ktindex 1b56555a..2094ad1c 100644--- a/base/app/src/main/java/com/music/spotui/App.kt+++ b/base/app/src/main/java/com/music/spotui/App.kt@@ -52,6 +52,9 @@ fun App() {com.music.spotui.ui.screens.Setup.openAfter?.let { r -> com.music.spotui.ui.screens.Setup.openAfter = null; runCatching { navController.navigate(r) } }}+ // "See the extensions" in the dialog a download shows when no download extension is installed.+ LaunchedEffect(Unit) { com.music.spotui.ui.components.DownloadAsk.openRoute.collect { r -> runCatching { navController.navigateSingleTop(r) } } }+UpdatePrompt()SupportPrompt()// The playlists at the top of the library, fetched ahead on Wi-Fi (see PagePrefetch).diff --git a/base/app/src/main/java/com/music/spotui/extensions/ExtensionAudio.kt b/base/app/src/main/java/com/music/spotui/extensions/ExtensionAudio.ktindex 953c7084..a58e5c43 100644--- a/base/app/src/main/java/com/music/spotui/extensions/ExtensionAudio.kt+++ b/base/app/src/main/java/com/music/spotui/extensions/ExtensionAudio.kt@@ -47,12 +47,12 @@ object ExtensionAudio {/*** Where the sound of [t] comes from, for the player: "<extension> · FLAC · 24-bit · 96 kHz" for* a stream (the name in its manifest, then the quality it announced, nothing it did not say),- * "Downloaded · <source> · <extension>" for a download; "" for the phone's own files and while+ * "Downloaded · <FLAC, MP3…> · <source> · <extension>" for a download; "" for the phone's own files and while* the stream's answer is not known yet.*/fun sourceLabel(t: LocalTrack, downloaded: String): String {OfflineStore.byLocalId(t.id)?.takeIf { t.uri.scheme == "file" }?.let { o ->- return listOfNotNull(downloaded, o.source.ifBlank { null }, extensionName(o.providerId)).distinct().joinToString(" · ")+ return listOfNotNull(downloaded, o.file.substringAfterLast('.', "").uppercase().ifBlank { null }, o.source.ifBlank { null }, extensionName(o.providerId)).distinct().joinToString(" · ")}if (t.uri.scheme != SCHEME) return ""val s = known[t.uri.lastPathSegment.orEmpty()]?.stream ?: return ""diff --git a/base/app/src/main/java/com/music/spotui/ui/components/PlayerSheets.kt b/base/app/src/main/java/com/music/spotui/ui/components/PlayerSheets.ktindex bd1049ae..742bb1fc 100644--- a/base/app/src/main/java/com/music/spotui/ui/components/PlayerSheets.kt+++ b/base/app/src/main/java/com/music/spotui/ui/components/PlayerSheets.kt@@ -128,20 +128,40 @@ fun activeDeviceIcon(): ImageVector {/*** Where the sound comes from while Myspoti's own player plays a song (an extension's stream: its- * name and the quality it announced; a download), shown under the output device; "" when Spotify- * plays (a song it plays for want of the extensions included) or while a song is being asked for.+ * name and the quality it announced; a download; Spotify's codec and bitrate), shown under the+ * output device; "" while a song is being asked for or on another device.*/@Composablefun playingSourceLabel(): String {val uri = SongPlayer.nowPlaying.value.urival answers = com.music.spotui.extensions.ExtensionAudio.answers.intValueval downloaded = stringResource(R.string.player_source_downloaded)- if (!com.music.spotui.di.LocalPlayer.active.value || SongPlayer.routing) return ""+ if (SongPlayer.routing) return ""+ if (!com.music.spotui.di.LocalPlayer.active.value) return spotifyQualityLabel(uri)return remember(uri, answers, downloaded) {com.music.spotui.di.LocalPlayer.current()?.let { com.music.spotui.extensions.ExtensionAudio.sourceLabel(it, downloaded) }.orEmpty()}}+/**+ * What Spotify streams while its own player plays here: "Spotify · AAC · 160 kbit/s", read from the+ * page once the song has loaded (it reports the stream a moment after the start); "" on another+ * device or while it is not known. Same line, same tap (the quality sheet) as an extension's source.+ */+@Composable+private fun spotifyQualityLabel(uri: String): String {+ if (SongPlayer.activeDevice.value != null || uri.isBlank()) return ""+ val label by androidx.compose.runtime.produceState("", uri) {+ value = ""+ for (wait in longArrayOf(1500, 3500)) {+ kotlinx.coroutines.delay(wait)+ val (bitrate, mime) = app.myspoti.host.android.MyspotiRuntime.spotify.player.audioInfo()+ if (bitrate > 0) { value = "${codecName(mime)} · ${bitrate / 1000} kbit/s"; return@produceState }+ }+ }+ return if (label.isBlank()) "" else stringResource(R.string.player_source_spotify, label)+}+/** The name of the extension streaming the song playing, for the mini player; null otherwise (see [playingSourceLabel]). */@Composablefun playingExtensionName(): String? {diff --git a/base/app/src/main/java/com/music/spotui/ui/components/QualityPickers.kt b/base/app/src/main/java/com/music/spotui/ui/components/QualityPickers.ktindex 12d5059e..d2f637b9 100644--- a/base/app/src/main/java/com/music/spotui/ui/components/QualityPickers.kt+++ b/base/app/src/main/java/com/music/spotui/ui/components/QualityPickers.kt@@ -5,6 +5,12 @@ import com.music.spotui.ui.theme.AppTextimport com.music.spotui.ui.theme.AppMutedimport com.music.spotui.ui.theme.AppAccent+import androidx.compose.foundation.background+import androidx.compose.foundation.layout.Box+import androidx.compose.foundation.layout.height+import androidx.compose.ui.draw.clip+import com.music.spotui.ui.immersive.Immersive+import com.music.spotui.ui.immersive.pages.ImmersiveChoiceRowimport androidx.compose.foundation.layout.Columnimport androidx.compose.foundation.layout.Rowimport androidx.compose.foundation.layout.fillMaxWidth@@ -85,6 +91,20 @@ private fun <T> QualityGroup(title: String, detail: String, options: List<Option<T>>, selected: T,onSelect: (T) -> Unit, modifier: Modifier = Modifier,) {+ // Immersive: the same choices as its Settings pages, a grouped list with a check.+ if (com.music.spotui.ui.navigation.isImmersive()) {+ Column(modifier.fillMaxWidth().padding(horizontal = 20.dp).selectableGroup()) {+ Text(title, style = Immersive.Headline, modifier = Modifier.padding(top = 4.dp))+ Text(detail, style = Immersive.Caption.copy(color = Color.White.copy(alpha = 0.72f)), modifier = Modifier.padding(top = 2.dp, bottom = 10.dp))+ Column(Modifier.fillMaxWidth().clip(Immersive.Card).background(Immersive.Raised.copy(alpha = 0.92f))) {+ options.forEachIndexed { i, o ->+ ImmersiveChoiceRow(stringResource(o.label), selected = o.value == selected, detail = stringResource(o.detail), onClick = { onSelect(o.value) })+ if (i < options.lastIndex) Box(Modifier.padding(start = 16.dp).fillMaxWidth().height(0.5.dp).background(Immersive.Separator))+ }+ }+ }+ return+ }Column(modifier.fillMaxWidth().selectableGroup()) {Text(title, color = AppText, fontSize = 17.sp, fontWeight = FontWeight.Bold,modifier = Modifier.padding(horizontal = 20.dp, vertical = 4.dp))@@ -116,15 +136,24 @@ private fun <T> QualityGroup(*/object DownloadAsk {internal var pending by mutableStateOf<((DownloadQuality) -> Unit)?>(null)+ /** No download extension is installed: the pointer to the Extensions store is shown instead of a download that cannot run. */+ internal var needSource by mutableStateOf(false)+ /** Route the pointer's button asks the app to open (taken by [com.music.spotui.App]). */+ val openRoute = kotlinx.coroutines.flow.MutableSharedFlow<String>(extraBufferCapacity = 1)/** Runs [start] now with the Settings quality (null), or after the user picked one. */fun start(context: android.content.Context, start: (DownloadQuality?) -> Unit) {+ if (com.music.spotui.data.preferences.isDownloadsEnabled(context) && !com.music.spotui.extensions.Extensions.hasDownloadSource()) {+ needSource = true+ return+ }if (getDownloadQuality(context) == DownloadQuality.ASK) pending = { start(it) } else start(null)}}@Composablefun DownloadAskHost() {+ if (DownloadAsk.needSource) NeedSourceDialog()val action = DownloadAsk.pending ?: returnval choices = listOf(Option(DownloadQuality.SMALL, R.string.quality_download_small, R.string.quality_download_small_detail),@@ -160,3 +189,28 @@ fun DownloadAskHost() {},)}++/** Downloads come from extensions: say so where the tap happened, and lead to the store. */+@Composable+private fun NeedSourceDialog() {+ val immersive = com.music.spotui.ui.navigation.isImmersive()+ val close = { DownloadAsk.needSource = false }+ val ink = if (immersive) Immersive.Text else AppText+ val accent = if (immersive) Immersive.Accent else AppAccent+ androidx.compose.material3.AlertDialog(+ onDismissRequest = close,+ containerColor = if (immersive) Color(0xFF2C2C2E) else tone(0xFF282828),+ shape = if (immersive) androidx.compose.foundation.shape.RoundedCornerShape(20.dp) else androidx.compose.material3.AlertDialogDefaults.shape,+ title = { Text(stringResource(R.string.downloads_need_source_title), color = ink) },+ text = { Text(stringResource(R.string.downloads_need_source_detail), color = if (immersive) Immersive.TextSecondary else AppMuted, fontSize = 14.sp) },+ confirmButton = {+ androidx.compose.material3.TextButton(onClick = {+ close()+ DownloadAsk.openRoute.tryEmit(com.music.spotui.ui.navigation.Routes.Extensions.route)+ }) { Text(stringResource(R.string.setup_ext_browse), color = accent, fontWeight = FontWeight.Bold) }+ },+ dismissButton = {+ androidx.compose.material3.TextButton(onClick = close) { Text(stringResource(R.string.add_to_playlist_button_cancel), color = ink) }+ },+ )+}diff --git a/base/app/src/main/java/com/music/spotui/ui/screens/SetupScreen.kt b/base/app/src/main/java/com/music/spotui/ui/screens/SetupScreen.ktindex dd5be2a3..5296c56c 100644--- a/base/app/src/main/java/com/music/spotui/ui/screens/SetupScreen.kt+++ b/base/app/src/main/java/com/music/spotui/ui/screens/SetupScreen.kt@@ -81,6 +81,8 @@ import app.myspoti.engine.Rimport app.myspoti.power.BatteryExemptionimport com.music.spotui.data.local.LocalMusicimport com.music.spotui.ui.theme.AppBackground+import com.music.spotui.ui.immersive.Immersive+import com.music.spotui.ui.navigation.isImmersive/*** Shown once after signing in: what Myspoti needs from the phone, each with its own button.@@ -108,8 +110,9 @@ private fun granted(context: Context, permission: String) =@Composablefun SetupScreen(onDone: () -> Unit) {val context = LocalContext.current- // How Myspoti works (first setup only), the look, the sound quality, the extensions, then the- // permissions; each skipped when done before an update.+ // How Myspoti works (first setup only), the look, the sound quality, the permissions, then the+ // extensions (last, so the end of the setup leads straight to their page); each skipped when+ // done before an update. Every step after the look is drawn in the look chosen there.val needPerms = remember { !Setup.permissionsDone(context) }val needQuality = remember { !com.music.spotui.data.preferences.isQualityChosen(context) }val needLook = remember { !com.music.spotui.data.preferences.LookPref.isChosen(context) }@@ -117,15 +120,24 @@ fun SetupScreen(onDone: () -> Unit) {val order = remember {listOfNotNull(STEP_INTRO.takeIf { needPerms }, STEP_LOOK.takeIf { needLook }, STEP_QUALITY.takeIf { needQuality },- STEP_EXTENSIONS.takeIf { needExtensions }, STEP_PERMISSIONS.takeIf { needPerms },+ STEP_PERMISSIONS.takeIf { needPerms }, STEP_EXTENSIONS.takeIf { needExtensions },).ifEmpty { listOf(STEP_PERMISSIONS) }}var index by remember { mutableIntStateOf(0) }val steps = order.sizefun next() { if (index + 1 < order.size) index++ else onDone() }val reduce = com.music.spotui.ui.look.rememberReduceMotion()- Box(Modifier.fillMaxSize().background(AppBackground)) {- Glow(Modifier.fillMaxSize(), alpha = 0.16f)+ // Back goes to the previous step (the look can be changed again from there).+ androidx.activity.compose.BackHandler(enabled = index > 0) { index-- }+ val immersive = isImmersive()+ Box(Modifier.fillMaxSize().background(if (immersive) Immersive.Page else AppBackground)) {+ // The page takes the look picked in the look step, live.+ androidx.compose.animation.Crossfade(immersive, animationSpec = tween(350), label = "setupBackdrop") { imm ->+ if (imm) Box(Modifier.fillMaxSize()) {+ com.music.spotui.ui.look.MeshGradientBackground(com.music.spotui.ui.look.LookMeshPalettes.first(), animated = false)+ Box(Modifier.fillMaxSize().background(Color.Black.copy(alpha = 0.35f)))+ } else Glow(Modifier.fillMaxSize(), alpha = 0.16f)+ }Column(Modifier.fillMaxSize().statusBarsPadding().navigationBarsPadding()) {// Several steps to go through: dots say where the user is.if (steps > 1) StepDots(count = steps, current = index, Modifier.padding(start = 20.dp, top = 16.dp))@@ -158,7 +170,7 @@ fun SetupScreen(onDone: () -> Unit) {},onLater = { Setup.setExtensionsSeen(context); next() },)- else -> PermissionsStep(onDone)+ else -> PermissionsStep(onNext = { Setup.done(context); next() })}}}@@ -178,7 +190,8 @@ private fun StepDots(count: Int, current: Int, modifier: Modifier = Modifier) {for (i in 0 until count) {val reduce = com.music.spotui.ui.look.rememberReduceMotion()val w by animateDpAsState(if (i == current) 22.dp else 8.dp, if (reduce) snap() else tween(350), label = "dot")- val c by animateColorAsState(if (i == current) AppAccent else AppText.copy(alpha = 0.25f), if (reduce) snap() else tween(350), label = "dotColor")+ val on = if (isImmersive()) Color.White else AppAccent+ val c by animateColorAsState(if (i == current) on else AppText.copy(alpha = 0.25f), if (reduce) snap() else tween(350), label = "dotColor")Box(Modifier.height(6.dp).width(w).clip(RoundedCornerShape(50)).background(c))}}@@ -194,7 +207,7 @@ private fun Modifier.riseIn(index: Int): Modifier {}@Composable-private fun PermissionsStep(onDone: () -> Unit) {+private fun PermissionsStep(onNext: () -> Unit) {val context = LocalContext.current// Re-read when coming back from a system dialog or the settings.var tick by remember { mutableIntStateOf(0) }@@ -205,8 +218,8 @@ private fun PermissionsStep(onDone: () -> Unit) {verticalArrangement = Arrangement.spacedBy(12.dp),) {var row = 0- Text(stringResource(R.string.setup_title), color = AppText, fontSize = 26.sp, fontWeight = FontWeight.Bold, modifier = Modifier.riseIn(row++))- Text(stringResource(R.string.setup_subtitle), color = AppMuted, fontSize = 14.sp, modifier = Modifier.riseIn(row++))+ SetupTitle(stringResource(R.string.setup_title), Modifier.riseIn(row++))+ SetupSubtitle(stringResource(R.string.setup_subtitle), Modifier.riseIn(row++))Spacer(Modifier.height(8.dp))@Suppress("UNUSED_EXPRESSION") tickif (Build.VERSION.SDK_INT >= 33) SetupRow(@@ -227,11 +240,7 @@ private fun PermissionsStep(onDone: () -> Unit) {) { BatteryExemption.request(context) }Spacer(Modifier.height(12.dp))Box(Modifier.riseIn(row)) {- Button(- onClick = { Setup.done(context); onDone() },- colors = ButtonDefaults.buttonColors(containerColor = AppAccent, contentColor = Color.Black),- modifier = Modifier.fillMaxWidth().height(50.dp),- ) { Text(stringResource(R.string.setup_continue), fontWeight = FontWeight.Bold, fontSize = 16.sp) }+ SetupButton(stringResource(R.string.setup_continue), onNext)}}}@@ -243,17 +252,11 @@ private fun QualityStep(onNext: () -> Unit) {Modifier.fillMaxSize().verticalScroll(rememberScrollState()).padding(vertical = 24.dp),verticalArrangement = Arrangement.spacedBy(12.dp),) {- Text(stringResource(R.string.setup_quality_title), color = AppText, fontSize = 26.sp, fontWeight = FontWeight.Bold,- modifier = Modifier.padding(horizontal = 20.dp).riseIn(0))- Text(stringResource(R.string.setup_quality_subtitle), color = AppMuted, fontSize = 14.sp,- modifier = Modifier.padding(horizontal = 20.dp).riseIn(1))+ SetupTitle(stringResource(R.string.setup_quality_title), Modifier.padding(horizontal = 20.dp).riseIn(0))+ SetupSubtitle(stringResource(R.string.setup_quality_subtitle), Modifier.padding(horizontal = 20.dp).riseIn(1))Box(Modifier.riseIn(2)) { com.music.spotui.ui.components.StreamingQualityPicker(Modifier.padding(top = 8.dp)) }Box(Modifier.riseIn(3)) { com.music.spotui.ui.components.DownloadQualityPicker() }- Button(- onClick = onNext,- colors = ButtonDefaults.buttonColors(containerColor = AppAccent, contentColor = Color.Black),- modifier = Modifier.fillMaxWidth().padding(horizontal = 20.dp).height(50.dp).riseIn(4),- ) { Text(stringResource(R.string.setup_continue), fontWeight = FontWeight.Bold, fontSize = 16.sp) }+ SetupButton(stringResource(R.string.setup_continue), onNext, Modifier.fillMaxWidth().padding(horizontal = 20.dp).height(50.dp).riseIn(4))}}@@ -265,27 +268,24 @@ private fun IntroStep(onNext: () -> Unit) {verticalArrangement = Arrangement.spacedBy(12.dp),) {var row = 0- Text(stringResource(R.string.setup_intro_title), color = AppText, fontSize = 26.sp, fontWeight = FontWeight.Bold, modifier = Modifier.riseIn(row++))- Text(stringResource(R.string.setup_intro_subtitle), color = AppMuted, fontSize = 14.sp, modifier = Modifier.riseIn(row++))+ SetupTitle(stringResource(R.string.setup_intro_title), Modifier.riseIn(row++))+ SetupSubtitle(stringResource(R.string.setup_intro_subtitle), Modifier.riseIn(row++))Spacer(Modifier.height(8.dp))InfoRow(Icons.Rounded.GraphicEq, stringResource(R.string.setup_intro_spotify_title), stringResource(R.string.setup_intro_spotify_detail), Modifier.riseIn(row++))InfoRow(Icons.Rounded.AutoAwesome, stringResource(R.string.setup_intro_more_title), stringResource(R.string.setup_intro_more_detail), Modifier.riseIn(row++))InfoRow(Icons.Rounded.Extension, stringResource(R.string.setup_intro_ext_title), stringResource(R.string.setup_intro_ext_detail), Modifier.riseIn(row++))Spacer(Modifier.height(12.dp))Box(Modifier.riseIn(row)) {- Button(- onClick = onNext,- colors = ButtonDefaults.buttonColors(containerColor = AppAccent, contentColor = Color.Black),- modifier = Modifier.fillMaxWidth().height(50.dp),- ) { Text(stringResource(R.string.setup_continue), fontWeight = FontWeight.Bold, fontSize = 16.sp) }+ SetupButton(stringResource(R.string.setup_continue), onNext, Modifier.fillMaxWidth().height(50.dp))}}}/**- * What extensions are, shown once to everyone (new installs and updates): optional, written by- * the community, permission-checked, where to find them. "See the extensions" opens their page- * once the setup is over.+ * What extensions are, shown once to everyone (new installs and updates) as the last step: optional,+ * written by the community, permission-checked, and where downloads come from (Mornye is the one+ * most people install). "See the extensions" ends the setup on their page (the Store, in the chosen+ * look); "Skip to Home" ends it on Home.*/@Composableprivate fun ExtensionsStep(onBrowse: () -> Unit, onLater: () -> Unit) {@@ -294,55 +294,94 @@ private fun ExtensionsStep(onBrowse: () -> Unit, onLater: () -> Unit) {verticalArrangement = Arrangement.spacedBy(12.dp),) {var row = 0- Text(stringResource(R.string.setup_ext_title), color = AppText, fontSize = 26.sp, fontWeight = FontWeight.Bold, modifier = Modifier.riseIn(row++))- Text(stringResource(R.string.setup_ext_subtitle), color = AppMuted, fontSize = 14.sp, modifier = Modifier.riseIn(row++))+ SetupTitle(stringResource(R.string.setup_ext_title), Modifier.riseIn(row++))+ SetupSubtitle(stringResource(R.string.setup_ext_subtitle), Modifier.riseIn(row++))Spacer(Modifier.height(8.dp))+ InfoRow(Icons.Rounded.Download, stringResource(R.string.setup_ext_download_title), stringResource(R.string.setup_ext_download_mornye_detail), Modifier.riseIn(row++))InfoRow(Icons.Rounded.Headphones, stringResource(R.string.setup_ext_audio_title), stringResource(R.string.setup_ext_audio_detail), Modifier.riseIn(row++))- InfoRow(Icons.Rounded.Download, stringResource(R.string.setup_ext_download_title), stringResource(R.string.setup_ext_download_detail), Modifier.riseIn(row++))InfoRow(Icons.Rounded.Widgets, stringResource(R.string.setup_ext_more_title), stringResource(R.string.setup_ext_more_detail), Modifier.riseIn(row++))InfoRow(Icons.Rounded.VerifiedUser, stringResource(R.string.setup_ext_safe_title), stringResource(R.string.setup_ext_safe_detail), Modifier.riseIn(row++))- Text(stringResource(R.string.setup_ext_where), color = AppMuted, fontSize = 13.sp, modifier = Modifier.padding(horizontal = 4.dp).riseIn(row++))+ SetupSubtitle(stringResource(R.string.setup_ext_where), Modifier.padding(horizontal = 4.dp).riseIn(row++), size = 13.sp)Spacer(Modifier.height(4.dp))Column(Modifier.riseIn(row), horizontalAlignment = Alignment.CenterHorizontally) {- Button(- onClick = onBrowse,- colors = ButtonDefaults.buttonColors(containerColor = AppAccent, contentColor = Color.Black),- modifier = Modifier.fillMaxWidth().height(50.dp),- ) { Text(stringResource(R.string.setup_ext_browse), fontWeight = FontWeight.Bold, fontSize = 16.sp) }- TextButton(onClick = onLater, modifier = Modifier.fillMaxWidth().height(48.dp)) {- Text(stringResource(R.string.setup_ext_later), color = AppText, fontWeight = FontWeight.SemiBold, fontSize = 15.sp)- }+ SetupButton(stringResource(R.string.setup_ext_browse), onBrowse, Modifier.fillMaxWidth().height(50.dp))+ SetupLinkButton(stringResource(R.string.setup_ext_home), onLater, Modifier.fillMaxWidth().height(48.dp))}}}+/** The setup's title, drawn in the chosen look. */+@Composable+private fun SetupTitle(text: String, modifier: Modifier = Modifier) {+ if (isImmersive()) Text(text, style = Immersive.Title.copy(fontSize = 26.sp, fontWeight = FontWeight.SemiBold), modifier = modifier)+ else Text(text, color = AppText, fontSize = 26.sp, fontWeight = FontWeight.Bold, modifier = modifier)+}++@Composable+private fun SetupSubtitle(text: String, modifier: Modifier = Modifier, size: androidx.compose.ui.unit.TextUnit = 14.sp) {+ if (isImmersive()) Text(text, style = Immersive.Subhead.copy(fontSize = size, color = Color.White.copy(alpha = 0.72f)), modifier = modifier)+ else Text(text, color = AppMuted, fontSize = size, modifier = modifier)+}++/** The step's main button: green and square-ish in Classic, white and rounded in Immersive (as the look step's). */+@Composable+private fun SetupButton(text: String, onClick: () -> Unit, modifier: Modifier = Modifier.fillMaxWidth().height(50.dp)) {+ val immersive = isImmersive()+ Button(+ onClick = onClick,+ shape = if (immersive) Immersive.Button else ButtonDefaults.shape,+ colors = ButtonDefaults.buttonColors(containerColor = if (immersive) Color.White else AppAccent, contentColor = Color.Black),+ modifier = modifier,+ ) {+ Text(text, fontFamily = if (immersive) com.music.spotui.ui.look.ImmersiveSans else null, fontSize = 16.sp,+ fontWeight = if (immersive) FontWeight.SemiBold else FontWeight.Bold)+ }+}++@Composable+private fun SetupLinkButton(text: String, onClick: () -> Unit, modifier: Modifier = Modifier) {+ TextButton(onClick = onClick, modifier = modifier) {+ Text(text, color = if (isImmersive()) Color.White else AppText, fontSize = 15.sp, fontWeight = FontWeight.SemiBold,+ fontFamily = if (isImmersive()) com.music.spotui.ui.look.ImmersiveSans else null)+ }+}++/** A card of the setup: Classic's dark grey, Immersive's raised grouped-list fill. */+@Composable+private fun Modifier.setupCard(): Modifier =+ if (isImmersive()) this.fillMaxWidth().clip(Immersive.Card).background(Immersive.Raised.copy(alpha = 0.92f))+ else this.fillMaxWidth().background(tone(0xFF1E1E1E), RoundedCornerShape(12.dp))+/** A card of the intro and extensions steps: an accent icon, a title and a line of detail. */@Composableprivate fun InfoRow(icon: androidx.compose.ui.graphics.vector.ImageVector, title: String, detail: String, modifier: Modifier = Modifier) {+ val immersive = isImmersive()+ val accent = if (immersive) Immersive.Accent else AppAccentRow(verticalAlignment = Alignment.CenterVertically,- modifier = modifier.fillMaxWidth().background(tone(0xFF1E1E1E), RoundedCornerShape(12.dp)).padding(16.dp),+ modifier = modifier.setupCard().padding(16.dp),) {Box(contentAlignment = Alignment.Center,- modifier = Modifier.size(40.dp).background(AppAccent.copy(alpha = 0.15f), RoundedCornerShape(10.dp)),- ) { Icon(icon, contentDescription = null, tint = AppAccent, modifier = Modifier.size(22.dp)) }+ modifier = Modifier.size(40.dp).background(accent.copy(alpha = 0.15f), RoundedCornerShape(10.dp)),+ ) { Icon(icon, contentDescription = null, tint = accent, modifier = Modifier.size(22.dp)) }Column(Modifier.weight(1f).padding(start = 14.dp)) {- Text(title, color = AppText, fontSize = 16.sp, fontWeight = FontWeight.SemiBold)- Text(detail, color = AppMuted, fontSize = 13.sp, lineHeight = 18.sp)+ CardTitle(title)+ CardDetail(detail)}}}@Composableprivate fun SetupRow(title: String, detail: String, on: Boolean, modifier: Modifier = Modifier, onEnable: () -> Unit) {+ val accent = if (isImmersive()) Immersive.Accent else AppAccentRow(verticalAlignment = Alignment.CenterVertically,- modifier = modifier.fillMaxWidth().background(tone(0xFF1E1E1E), RoundedCornerShape(12.dp)).padding(16.dp),+ modifier = modifier.setupCard().padding(16.dp),) {Column(Modifier.weight(1f)) {- Text(title, color = AppText, fontSize = 16.sp, fontWeight = FontWeight.SemiBold)- Text(detail, color = AppMuted, fontSize = 13.sp)+ CardTitle(title)+ CardDetail(detail, lineHeight = 17.sp)}// Allowed: the button gives way to a green check that pops in.AnimatedContent(@@ -350,8 +389,20 @@ private fun SetupRow(title: String, detail: String, on: Boolean, modifier: ModiftransitionSpec = { (scaleIn(spring(dampingRatio = 0.5f)) + fadeIn()) togetherWith (scaleOut() + fadeOut()) },label = "allowed",) { allowed ->- if (allowed) Icon(Icons.Default.CheckCircle, contentDescription = null, tint = AppAccent, modifier = Modifier.padding(start = 12.dp).size(28.dp))- else TextButton(onClick = onEnable) { Text(stringResource(R.string.setup_enable), color = AppAccent, fontWeight = FontWeight.Bold) }+ if (allowed) Icon(Icons.Default.CheckCircle, contentDescription = null, tint = accent, modifier = Modifier.padding(start = 12.dp).size(28.dp))+ else TextButton(onClick = onEnable) { Text(stringResource(R.string.setup_enable), color = accent, fontWeight = FontWeight.Bold) }}}}++@Composable+private fun CardTitle(text: String) {+ if (isImmersive()) Text(text, style = Immersive.BodyStrong)+ else Text(text, color = AppText, fontSize = 16.sp, fontWeight = FontWeight.SemiBold)+}++@Composable+private fun CardDetail(text: String, lineHeight: androidx.compose.ui.unit.TextUnit = 18.sp) {+ if (isImmersive()) Text(text, style = Immersive.Caption.copy(fontSize = 13.sp, lineHeight = lineHeight))+ else Text(text, color = AppMuted, fontSize = 13.sp, lineHeight = lineHeight)+}diff --git a/base/app/src/main/res/values/myspoti_strings.xml b/base/app/src/main/res/values/myspoti_strings.xmlindex d394c0f5..d9160624 100644--- a/base/app/src/main/res/values/myspoti_strings.xml+++ b/base/app/src/main/res/values/myspoti_strings.xml@@ -213,6 +213,11 @@<string name="setup_ext_audio_title">Other audio sources</string><string name="setup_ext_audio_detail">An extension can play your songs from another source, in the quality it offers.</string><string name="setup_ext_download_title">Downloads</string>+ <string name="setup_ext_download_mornye_detail">Downloads and other audio sources come from extensions. Install Mornye on the next page to download songs and listen offline. Songs stay encrypted in Myspoti.</string>+ <string name="setup_ext_home">Skip to Home</string>+ <string name="player_source_spotify">Spotify · %1$s</string>+ <string name="downloads_need_source_title">Downloads need an extension</string>+ <string name="downloads_need_source_detail">Songs are downloaded by extensions. None is installed yet: open the Extensions store and install Mornye to download.</string><string name="setup_ext_download_detail">To listen offline, install a download-source extension. Songs stay encrypted in Myspoti.</string><string name="setup_ext_more_title">And more</string><string name="setup_ext_more_detail">Home sections, pages and tools added by their authors.</string>@@ -396,6 +401,11 @@<string name="show_tab_about">About</string><string name="show_sort_newest">All episodes • Newest</string><string name="show_sort_oldest">All episodes • Oldest</string>+ <string name="show_filter_all">Default order</string>+ <string name="show_filter_unplayed_first">Unplayed first</string>+ <string name="show_filter_hide_played">Hide played</string>+ <string name="show_filter_all_played">Every episode is played.</string>+ <string name="episode_new">New</string><string name="show_sort_chapters_newest">All chapters • Newest</string><string name="show_sort_chapters_oldest">All chapters • Oldest</string><string name="show_empty">Nothing to play here yet</string>@@ -561,4 +571,12 @@<string name="settings_connect_mirror_detail">Plays the Spotify song muted in the background, so it counts and your devices can control it. Uses a little more data and battery: turn it off if you don\'t need it.</string><string name="explicit_badge">E</string><string name="spotify_plan">Spotify %1$s</string>+ <string name="aa_recent">Recently played</string>+ <string name="aa_songs">Songs</string>+ <string name="aa_start_radio">Start radio</string>+ <string name="aa_downloaded_lists">Downloaded playlists and albums</string>+ <string name="aa_downloaded_songs">Downloaded songs</string>+ <string name="aa_home">Home</string>+ <string name="aa_library">Library</string>+ <string name="aa_downloads">Downloads</string></resources>