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.

A setup in ink, on the page it opens over

Lelonio2b5522f230fe
diff --git a/app/src/main/java/dev/lelonio/square/ui/SquareApp.kt b/app/src/main/java/dev/lelonio/square/ui/SquareApp.kt
index 34380b6..e61fe6f 100644
--- a/app/src/main/java/dev/lelonio/square/ui/SquareApp.kt
+++ b/app/src/main/java/dev/lelonio/square/ui/SquareApp.kt
@@ -3463,7 +3463,6 @@ fun SquareApp(
OnboardingScreen(
state = state,
webApi = webApi,
- backdrop = artBackdrop,
onLogIn = viewModel::logIn,
onClientIdChange = viewModel::onWebApiClientIdChange,
onConnectWebApi = { viewModel.connectWebApi() },
diff --git a/app/src/main/java/dev/lelonio/square/ui/onboarding/BackendChoiceScreen.kt b/app/src/main/java/dev/lelonio/square/ui/onboarding/BackendChoiceScreen.kt
index 02a4474..e0fdfa6 100644
--- a/app/src/main/java/dev/lelonio/square/ui/onboarding/BackendChoiceScreen.kt
+++ b/app/src/main/java/dev/lelonio/square/ui/onboarding/BackendChoiceScreen.kt
@@ -1,34 +1,43 @@
package dev.lelonio.square.ui.onboarding
import androidx.compose.foundation.background
-import androidx.compose.foundation.border
-import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxWithConstraints
import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.asPaddingValues
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.navigationBars
+import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.statusBars
-import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
+import com.adamglin.PhosphorIcons
+import com.adamglin.phosphoricons.Fill
+import com.adamglin.phosphoricons.Regular
+import com.adamglin.phosphoricons.fill.SpotifyLogo
+import com.adamglin.phosphoricons.fill.YoutubeLogo
+import com.adamglin.phosphoricons.regular.CaretRight
import dev.lelonio.square.R
import dev.lelonio.square.backend.BackendId
+import dev.lelonio.square.ui.components.AppIcon
import dev.lelonio.square.ui.components.SquareWordmark
+import dev.lelonio.square.ui.glass.pressable
import dev.lelonio.square.ui.theme.Ink
import dev.lelonio.square.ui.theme.InkDim
@@ -36,104 +45,133 @@ import dev.lelonio.square.ui.theme.InkDim
* The first question a fresh install asks: where the music comes from.
*
* Ahead of the tutorial, and that order is the point. The whole setup the
- * tutorial walks through — the Spotify login, the registered Web API
- * application, the redirect URI — exists only for Spotify. Asking someone to
+ * tutorial walks through (the Spotify login, the registered Web API
+ * application, the redirect URI) exists only for Spotify. Asking someone to
* do all of it and *then* telling them there was another option that needs none
* of it would be asking them to redo the decision after paying for it.
*
* Shown once. Changing the answer later lives in the settings, where a choice
- * that restarts playback belongs.
+ * that restarts playback belongs. Drawn like the guide that follows it, so the
+ * two read as one setup; and as the first thing a new install shows, it opens
+ * with the app's own mark, with the question under it and the two answers
+ * lower down, where the thumb is.
*/
@Composable
fun BackendChoiceScreen(onChoose: (BackendId) -> Unit) {
- val statusBar = WindowInsets.statusBars.asPaddingValues().calculateTopPadding()
- val navBar = WindowInsets.navigationBars.asPaddingValues().calculateBottomPadding()
+ SetupScaffold(top = {}) {
+ BoxWithConstraints(Modifier.fillMaxSize()) {
+ // At least the height of the page, so the question and the answers
+ // sit at its two ends; taller only on a screen too short for both,
+ // which then scrolls.
+ val page = maxHeight
+ Column(
+ Modifier
+ .fillMaxWidth()
+ .verticalScroll(rememberScrollState())
+ .heightIn(min = page)
+ .padding(horizontal = PAGE_MARGIN),
+ verticalArrangement = Arrangement.SpaceBetween,
+ ) {
+ Column {
+ Spacer(Modifier.height(8.dp))
+ AppIcon(72.dp)
+ Spacer(Modifier.height(20.dp))
+ SquareWordmark(height = 24.dp)
+ StepHeader(stringResource(R.string.backend_choice_title))
+ ProseText(stringResource(R.string.backend_choice_subtitle))
+ }
- Box(
+ // A card each rather than a radio row: there is no "confirm".
+ // Tapping one is the answer, so each says what picking it means,
+ // and what it asks for, before it is picked.
+ Column(
+ Modifier.padding(top = 32.dp, bottom = 16.dp),
+ verticalArrangement = Arrangement.spacedBy(12.dp),
+ ) {
+ SourceCard(
+ logo = PhosphorIcons.Fill.SpotifyLogo,
+ title = stringResource(R.string.backend_spotify),
+ description = stringResource(R.string.backend_choice_spotify_note),
+ needs = stringResource(R.string.backend_choice_spotify_needs),
+ onClick = { onChoose(BackendId.SPOTIFY) },
+ )
+ SourceCard(
+ logo = PhosphorIcons.Fill.YoutubeLogo,
+ title = stringResource(R.string.backend_youtube),
+ description = stringResource(R.string.backend_choice_youtube_note),
+ needs = stringResource(R.string.backend_choice_youtube_needs),
+ onClick = { onChoose(BackendId.YOUTUBE_MUSIC) },
+ )
+ }
+ }
+ }
+ }
+}
+
+/**
+ * One of the two answers: the service's mark, what it brings, what it asks.
+ *
+ * The mark in ink like everything else on the page. It says which service at
+ * a glance, and in the brand's own colour it would be the one loud thing on a
+ * screen that is otherwise asking a quiet question.
+ */
+@Composable
+private fun SourceCard(
+ logo: ImageVector,
+ title: String,
+ description: String,
+ needs: String,
+ onClick: () -> Unit,
+) {
+ Row(
Modifier
- .fillMaxSize()
- // Opaque, like the tutorial it precedes: there is nothing behind
- // this worth showing through, and glass over an unconfigured home
- // page would be showing the user the problem, not the choice.
- .background(Color(0xFF101012))
- .clickable(interactionSource = null, indication = null) {},
+ .pressable(onClick, pressedScale = 0.98f)
+ .fillMaxWidth()
+ .setupCard()
+ .padding(16.dp),
) {
+ Box(
+ Modifier
+ .size(44.dp)
+ .clip(CircleShape)
+ .background(Ink.copy(alpha = 0.06f)),
+ contentAlignment = Alignment.Center,
+ ) {
+ Icon(logo, contentDescription = null, tint = Ink, modifier = Modifier.size(26.dp))
+ }
Column(
Modifier
- .fillMaxSize()
- .padding(top = statusBar + 24.dp, bottom = navBar + 24.dp)
- .padding(horizontal = 24.dp),
- verticalArrangement = Arrangement.Center,
+ .weight(1f)
+ .padding(start = 14.dp),
) {
- SquareWordmark(height = 22.dp, modifier = Modifier.padding(bottom = 28.dp))
-
Text(
- stringResource(R.string.backend_choice_title),
- style = MaterialTheme.typography.displayLarge,
+ title,
+ style = MaterialTheme.typography.titleMedium,
+ fontWeight = FontWeight.SemiBold,
color = Ink,
+ modifier = Modifier.padding(top = 1.dp),
)
- Spacer(Modifier.height(10.dp))
Text(
- stringResource(R.string.backend_choice_subtitle),
+ description,
style = MaterialTheme.typography.bodyMedium,
- color = InkDim,
- )
-
- Spacer(Modifier.height(32.dp))
-
- SourceCard(
- title = stringResource(R.string.backend_spotify),
- description = stringResource(R.string.backend_choice_spotify_note),
- onClick = { onChoose(BackendId.SPOTIFY) },
+ color = Prose,
+ modifier = Modifier.padding(top = 3.dp),
)
- Spacer(Modifier.height(14.dp))
- SourceCard(
- title = stringResource(R.string.backend_youtube),
- description = stringResource(R.string.backend_choice_youtube_note),
- onClick = { onChoose(BackendId.YOUTUBE_MUSIC) },
- )
-
- Spacer(Modifier.height(24.dp))
Text(
- stringResource(R.string.backend_choice_changeable),
+ needs,
style = MaterialTheme.typography.bodySmall,
color = InkDim,
- modifier = Modifier.fillMaxWidth(),
+ modifier = Modifier.padding(top = 8.dp),
)
}
- }
-}
-
-/**
- * One of the two answers.
- *
- * A card rather than a radio row: this is the only thing on screen and there is
- * no "confirm" — tapping one *is* the answer, so each needs enough room to say
- * what picking it means before it is picked.
- */
-@Composable
-private fun SourceCard(title: String, description: String, onClick: () -> Unit) {
- val shape = RoundedCornerShape(20.dp)
- Column(
- Modifier
- .fillMaxWidth()
- .clip(shape)
- .background(Color(0xFF1A1A1E))
- .border(1.dp, Color(0x1AFFFFFF), shape)
- .clickable(onClick = onClick)
- .padding(horizontal = 20.dp, vertical = 18.dp),
- ) {
- Text(
- title,
- style = MaterialTheme.typography.titleMedium,
- fontWeight = FontWeight.Bold,
- color = Ink,
- )
- Spacer(Modifier.height(6.dp))
- Text(
- description,
- style = MaterialTheme.typography.bodySmall,
- color = InkDim,
+ Icon(
+ PhosphorIcons.Regular.CaretRight,
+ contentDescription = null,
+ tint = InkDim,
+ modifier = Modifier
+ .align(Alignment.CenterVertically)
+ .padding(start = 8.dp)
+ .size(18.dp),
)
}
}
diff --git a/app/src/main/java/dev/lelonio/square/ui/onboarding/OnboardingScreen.kt b/app/src/main/java/dev/lelonio/square/ui/onboarding/OnboardingScreen.kt
index d17e372..9e05571 100644
--- a/app/src/main/java/dev/lelonio/square/ui/onboarding/OnboardingScreen.kt
+++ b/app/src/main/java/dev/lelonio/square/ui/onboarding/OnboardingScreen.kt
@@ -7,33 +7,23 @@ import androidx.compose.animation.fadeOut
import androidx.compose.animation.slideInHorizontally
import androidx.compose.animation.slideOutHorizontally
import androidx.compose.animation.togetherWith
-import dev.lelonio.square.data.AppLanguages
-import androidx.compose.foundation.horizontalScroll
import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
+import androidx.compose.foundation.horizontalScroll
import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.asPaddingValues
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.navigationBars
import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.statusBars
import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.OutlinedTextFieldDefaults
import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableIntStateOf
@@ -41,26 +31,23 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalClipboardManager
import androidx.compose.ui.platform.LocalUriHandler
+import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.AnnotatedString
-import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import com.adamglin.PhosphorIcons
import com.adamglin.phosphoricons.Regular
import com.adamglin.phosphoricons.regular.ArrowLeft
import com.adamglin.phosphoricons.regular.ArrowUpRight
-import com.adamglin.phosphoricons.regular.Check
-import dev.lelonio.square.ui.glass.backdrop.Backdrop
import dev.lelonio.square.R
+import dev.lelonio.square.data.AppLanguages
import dev.lelonio.square.ui.MainViewModel
import dev.lelonio.square.ui.components.AppIcon
+import dev.lelonio.square.ui.components.FilterChip
import dev.lelonio.square.ui.components.SquareWordmark
-import dev.lelonio.square.ui.glass.LiquidButton
-import dev.lelonio.square.ui.settings.WebApiSetupInline
import dev.lelonio.square.ui.theme.Ink
import dev.lelonio.square.ui.theme.InkDim
@@ -73,22 +60,22 @@ import dev.lelonio.square.ui.theme.InkDim
* librespot-based client on earth, so search and everything else that reads the
* Web API needs an application the *user* registers. That is a trip to a
* developer dashboard, a redirect URI that must match to the character, and a
- * client id pasted back — steps nobody would guess, and each of which fails
+ * client id pasted back: steps nobody would guess, and each of which fails
* silently and differently when got wrong.
*
* So it is a tutorial rather than a form: one instruction per screen, in the
* order the work has to be done, with the exact strings to type made copyable
* instead of described.
*
- * Shown once, over everything, on the first run. It is dismissable at any point
- * — the app still works, badly, without a Web API application — and remains
- * reachable from the settings afterwards.
+ * Shown once, over everything, on the first run. It can be left at any point,
+ * since the app still works, badly, without a Web API application, and it stays
+ * reachable from the settings afterwards. Drawn in ink on the page's ground;
+ * see SetupPieces for why.
*/
@Composable
fun OnboardingScreen(
state: MainViewModel.UiState,
webApi: MainViewModel.WebApiState,
- backdrop: Backdrop,
onLogIn: () -> Unit,
onClientIdChange: (String) -> Unit,
onConnectWebApi: () -> Unit,
@@ -101,111 +88,58 @@ fun OnboardingScreen(
val loggedIn = state is MainViewModel.UiState.Ready
val last = STEP_COUNT - 1
- val statusBar = WindowInsets.statusBars.asPaddingValues().calculateTopPadding()
- val navBar = WindowInsets.navigationBars.asPaddingValues().calculateBottomPadding()
-
- Box(
- Modifier
- .fillMaxSize()
- // Opaque, unlike every other surface in this app. The tutorial is
- // the only thing on screen that is not about listening, and glass
- // over a home page the user has not configured yet would be showing
- // them the thing the tutorial exists to explain.
- .background(Color(0xFF101012))
- // Nothing behind this is meant to be reachable while it is up.
- .clickable(interactionSource = null, indication = null) {},
- ) {
- Column(
- Modifier
- .fillMaxSize()
- .padding(top = statusBar, bottom = navBar),
- ) {
- Row(
- Modifier
- .fillMaxWidth()
- .padding(start = 16.dp, end = 16.dp, top = 8.dp),
- verticalAlignment = Alignment.CenterVertically,
- ) {
- if (step > 0) {
- LiquidButton(onClick = { step-- }, backdrop = backdrop) {
- Icon(PhosphorIcons.Regular.ArrowLeft, contentDescription = stringResource(R.string.back))
- }
- }
- Spacer(Modifier.weight(1f))
- TextButton(onClick = onFinish) {
- Text(stringResource(if (step == last) R.string.close else R.string.skip), color = InkDim)
- }
- }
-
- AnimatedContent(
- targetState = step,
- transitionSpec = {
- val forward = targetState > initialState
- val width = { w: Int -> if (forward) w / 5 else -w / 5 }
- (slideInHorizontally(tween(260), width) + fadeIn(tween(200)))
- .togetherWith(
- slideOutHorizontally(tween(200)) { w -> -width(w) } +
- fadeOut(tween(140)),
- )
- },
- label = "onboarding",
- modifier = Modifier
- .weight(1f)
- .fillMaxWidth(),
- ) { current ->
- Column(
- Modifier
- .fillMaxSize()
- .verticalScroll(rememberScrollState())
- .padding(horizontal = 26.dp),
- ) {
- when (current) {
- 0 -> Welcome(language, onLanguage)
- 1 -> LogIn(
- loggedIn = loggedIn,
- connecting = state is MainViewModel.UiState.Loading,
- backdrop = backdrop,
- onLogIn = onLogIn,
- )
- 2 -> Dashboard(redirectUri = webApi.redirectUri)
- 3 -> ClientId(webApi, backdrop, onClientIdChange, onConnectWebApi)
- else -> Done()
- }
- Spacer(Modifier.height(28.dp))
- }
+ SetupScaffold(
+ top = {
+ if (step > 0) {
+ RoundButton(PhosphorIcons.Regular.ArrowLeft, stringResource(R.string.back)) { step-- }
}
-
- Row(
+ Spacer(Modifier.weight(1f))
+ QuietButton(
+ stringResource(if (step == last) R.string.close else R.string.skip),
+ onClick = onFinish,
+ )
+ },
+ bottom = {
+ StepDots(STEP_COUNT, step)
+ Spacer(Modifier.weight(1f))
+ PrimaryButton(
+ stringResource(if (step == last) R.string.onboarding_start else R.string.next_step),
+ onClick = { if (step == last) onFinish() else step++ },
+ )
+ },
+ ) {
+ AnimatedContent(
+ targetState = step,
+ transitionSpec = {
+ val forward = targetState > initialState
+ val width = { w: Int -> if (forward) w / 5 else -w / 5 }
+ (slideInHorizontally(tween(260), width) + fadeIn(tween(200)))
+ .togetherWith(
+ slideOutHorizontally(tween(200)) { w -> -width(w) } +
+ fadeOut(tween(140)),
+ )
+ },
+ label = "onboarding",
+ modifier = Modifier.fillMaxSize(),
+ ) { current ->
+ Column(
Modifier
- .fillMaxWidth()
- .padding(horizontal = 26.dp, vertical = 16.dp),
- verticalAlignment = Alignment.CenterVertically,
+ .fillMaxSize()
+ .verticalScroll(rememberScrollState())
+ .padding(horizontal = PAGE_MARGIN),
) {
- Row(horizontalArrangement = Arrangement.spacedBy(6.dp)) {
- repeat(STEP_COUNT) { index ->
- Box(
- Modifier
- .size(if (index == step) 9.dp else 7.dp)
- .clip(CircleShape)
- .background(
- if (index == step) Ink else Ink.copy(alpha = 0.28f),
- ),
- )
- }
- }
- Spacer(Modifier.weight(1f))
- LiquidButton(
- onClick = { if (step == last) onFinish() else step++ },
- backdrop = backdrop,
- tint = MaterialTheme.colorScheme.primary,
- contentHeight = 52.dp,
- contentPadding = 26.dp,
- ) {
- Text(
- stringResource(if (step == last) R.string.onboarding_start else R.string.next_step),
- style = MaterialTheme.typography.titleMedium,
+ when (current) {
+ 0 -> Welcome(language, onLanguage)
+ 1 -> LogIn(
+ loggedIn = loggedIn,
+ connecting = state is MainViewModel.UiState.Loading,
+ onLogIn = onLogIn,
)
+ 2 -> Dashboard(redirectUri = webApi.redirectUri)
+ 3 -> ClientId(webApi, onClientIdChange, onConnectWebApi)
+ else -> Done()
}
+ Spacer(Modifier.height(28.dp))
}
}
}
@@ -213,15 +147,21 @@ fun OnboardingScreen(
private const val STEP_COUNT = 5
+/** The steps that are work, as the header counts them: the first and last are not. */
+private const val WORK_STEPS = 3
+
+@Composable
+private fun stepOf(index: Int): String = stringResource(R.string.onboarding_step_of, index, WORK_STEPS)
+
@Composable
private fun Welcome(language: String, onLanguage: (String) -> Unit) {
- Spacer(Modifier.height(24.dp))
- AppIcon(104.dp)
+ Spacer(Modifier.height(20.dp))
+ AppIcon(88.dp)
Spacer(Modifier.height(22.dp))
- SquareWordmark(height = 34.dp)
- Body(stringResource(R.string.onboarding_welcome_1))
+ SquareWordmark(height = 28.dp)
+ ProseText(stringResource(R.string.onboarding_welcome_1))
Note(stringResource(R.string.onboarding_welcome_2))
- Body(stringResource(R.string.onboarding_welcome_3))
+ ProseText(stringResource(R.string.onboarding_welcome_3))
// First screen, before a word of the setup: someone who cannot read this
// page is exactly the person who needs the picker, and asking them to
@@ -233,33 +173,21 @@ private fun Welcome(language: String, onLanguage: (String) -> Unit) {
private fun LogIn(
loggedIn: Boolean,
connecting: Boolean,
- backdrop: Backdrop,
onLogIn: () -> Unit,
) {
- StepTitle(stringResource(R.string.onboarding_login_title))
- Body(stringResource(R.string.onboarding_login_1))
+ StepHeader(stringResource(R.string.onboarding_login_title), stepOf(1))
+ ProseText(stringResource(R.string.onboarding_login_1))
Note(stringResource(R.string.onboarding_login_2))
- Spacer(Modifier.height(20.dp))
+ Spacer(Modifier.height(22.dp))
if (loggedIn) {
DoneRow(stringResource(R.string.onboarding_login_done))
} else {
- LiquidButton(
- onClick = { if (!connecting) onLogIn() },
- backdrop = backdrop,
- tint = MaterialTheme.colorScheme.primary,
- contentHeight = 52.dp,
- ) {
- if (connecting) {
- CircularProgressIndicator(
- strokeWidth = 2.dp,
- modifier = Modifier.size(18.dp),
- color = MaterialTheme.colorScheme.onPrimary,
- )
- } else {
- Text(stringResource(R.string.log_in_with_spotify), style = MaterialTheme.typography.titleMedium)
- }
- }
+ SecondaryButton(
+ stringResource(R.string.log_in_with_spotify),
+ onClick = onLogIn,
+ busy = connecting,
+ )
}
}
@@ -268,100 +196,134 @@ private fun Dashboard(redirectUri: String) {
val uriHandler = LocalUriHandler.current
val clipboard = LocalClipboardManager.current
- StepTitle(stringResource(R.string.onboarding_key_title))
- Body(stringResource(R.string.onboarding_key_intro))
+ StepHeader(stringResource(R.string.onboarding_key_title), stepOf(2))
+ ProseText(stringResource(R.string.onboarding_key_intro))
- Row(
- Modifier
- .padding(top = 16.dp)
- .fillMaxWidth()
- .clip(RoundedCornerShape(18.dp))
- .background(Ink.copy(alpha = 0.08f))
- .clickable { uriHandler.openUri(DASHBOARD_URL) }
- .padding(horizontal = 18.dp, vertical = 16.dp),
- verticalAlignment = Alignment.CenterVertically,
- ) {
- Column(Modifier.weight(1f)) {
- Text(stringResource(R.string.onboarding_open_dashboard), style = MaterialTheme.typography.titleMedium)
- Text(
- DASHBOARD_URL.removePrefix("https://"),
- style = MaterialTheme.typography.bodySmall,
- color = InkDim,
- )
- }
- Icon(
- PhosphorIcons.Regular.ArrowUpRight,
- contentDescription = null,
- tint = InkDim,
- modifier = Modifier.size(18.dp),
- )
- }
-
- Numbered(1, stringResource(R.string.onboarding_step_login))
- Numbered(2, stringResource(R.string.onboarding_step_create))
- Numbered(3, stringResource(R.string.onboarding_step_names))
- Numbered(4, stringResource(R.string.onboarding_step_redirect))
+ CardButton(
+ title = stringResource(R.string.onboarding_open_dashboard),
+ detail = DASHBOARD_URL.removePrefix("https://"),
+ icon = PhosphorIcons.Regular.ArrowUpRight,
+ onClick = { uriHandler.openUri(DASHBOARD_URL) },
+ modifier = Modifier.padding(top = 18.dp),
+ )
- Row(
+ // The seven things to do there, as one list in one card rather than seven
+ // paragraphs down the page: it is a checklist, and it reads as one when
+ // the numbers line up and the address to copy sits in its own line.
+ Column(
Modifier
- .padding(top = 10.dp, start = 34.dp)
+ .padding(top = 12.dp)
.fillMaxWidth()
- .clip(RoundedCornerShape(14.dp))
- .background(Ink.copy(alpha = 0.08f))
- .padding(start = 14.dp),
- verticalAlignment = Alignment.CenterVertically,
+ .setupCard()
+ .padding(vertical = 4.dp),
) {
- Text(
- redirectUri,
- style = MaterialTheme.typography.titleSmall,
- modifier = Modifier.weight(1f),
- )
- TextButton(onClick = { clipboard.setText(AnnotatedString(redirectUri)) }) {
- Text(stringResource(R.string.copy))
+ ListStep(1, stringResource(R.string.onboarding_step_login))
+ ListDivider()
+ ListStep(2, stringResource(R.string.onboarding_step_create))
+ ListDivider()
+ ListStep(3, stringResource(R.string.onboarding_step_names))
+ ListDivider()
+ ListStep(4, stringResource(R.string.onboarding_step_redirect)) {
+ Row(
+ Modifier
+ .padding(top = 10.dp)
+ .fillMaxWidth()
+ .clip(RoundedCornerShape(12.dp))
+ .background(Ink.copy(alpha = 0.06f))
+ .padding(start = 12.dp),
+ verticalAlignment = Alignment.CenterVertically,
+ ) {
+ Text(
+ redirectUri,
+ style = MaterialTheme.typography.bodyMedium,
+ color = Ink,
+ maxLines = 1,
+ overflow = TextOverflow.Ellipsis,
+ modifier = Modifier.weight(1f),
+ )
+ QuietButton(
+ stringResource(R.string.copy),
+ onClick = { clipboard.setText(AnnotatedString(redirectUri)) },
+ )
+ }
}
+ ListDivider()
+ ListStep(5, stringResource(R.string.onboarding_step_api))
+ ListDivider()
+ ListStep(6, stringResource(R.string.onboarding_step_terms))
+ ListDivider()
+ ListStep(7, stringResource(R.string.onboarding_step_client_id))
}
-
- Numbered(5, stringResource(R.string.onboarding_step_api))
- Numbered(6, stringResource(R.string.onboarding_step_terms))
- Numbered(7, stringResource(R.string.onboarding_step_client_id))
Note(stringResource(R.string.onboarding_step_secret))
}
@Composable
private fun ClientId(
webApi: MainViewModel.WebApiState,
- backdrop: Backdrop,
onClientIdChange: (String) -> Unit,
onConnectWebApi: () -> Unit,
) {
- StepTitle(stringResource(R.string.onboarding_paste_title))
+ StepHeader(stringResource(R.string.onboarding_paste_title), stepOf(3))
if (webApi.connected) {
- Body(stringResource(R.string.onboarding_paste_done))
- Spacer(Modifier.height(16.dp))
+ ProseText(stringResource(R.string.onboarding_paste_done))
+ Spacer(Modifier.height(18.dp))
DoneRow(stringResource(R.string.onboarding_key_linked))
} else {
- Body(stringResource(R.string.onboarding_paste_hint))
- // The same form the settings screen shows, so what is learned here is
- // where it stays.
- Box(Modifier.padding(top = 8.dp, start = 0.dp)) {
- WebApiSetupInline(webApi, backdrop, onClientIdChange, onConnectWebApi)
+ ProseText(stringResource(R.string.onboarding_paste_hint))
+ // The field and the button the settings show, in the guide's ink: the
+ // same value and the same action, so what is linked here is linked
+ // there. The settings' own form is drawn in the accent, and here the
+ // accent would be whatever record is playing.
+ OutlinedTextField(
+ value = webApi.clientId,
+ onValueChange = onClientIdChange,
+ label = { Text(stringResource(R.string.client_id)) },
+ singleLine = true,
+ enabled = !webApi.connecting,
+ shape = RoundedCornerShape(16.dp),
+ colors = OutlinedTextFieldDefaults.colors(
+ focusedTextColor = Ink,
+ unfocusedTextColor = Ink,
+ focusedBorderColor = Ink,
+ unfocusedBorderColor = Ink.copy(alpha = 0.22f),
+ focusedLabelColor = Ink,
+ unfocusedLabelColor = InkDim,
+ cursorColor = Ink,
+ ),
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(top = 18.dp),
+ )
+ if (webApi.error != null) {
+ Text(
+ webApi.error,
+ style = MaterialTheme.typography.bodySmall,
+ color = MaterialTheme.colorScheme.error,
+ modifier = Modifier.padding(top = 8.dp),
+ )
}
+ SecondaryButton(
+ stringResource(R.string.connect),
+ onClick = onConnectWebApi,
+ busy = webApi.connecting,
+ modifier = Modifier.padding(top = 14.dp),
+ )
Note(stringResource(R.string.onboarding_paste_error))
}
}
@Composable
private fun Done() {
- Spacer(Modifier.height(16.dp))
+ Spacer(Modifier.height(20.dp))
AppIcon(72.dp)
- StepTitle(stringResource(R.string.onboarding_done_title))
- Body(stringResource(R.string.onboarding_done_1))
- Body(stringResource(R.string.onboarding_done_2))
+ StepHeader(stringResource(R.string.onboarding_done_title))
+ ProseText(stringResource(R.string.onboarding_done_1))
+ ProseText(stringResource(R.string.onboarding_done_2))
Note(stringResource(R.string.onboarding_done_3))
}
/**
- * The languages, as a row of pills.
+ * The languages, as a row of the app's own chips.
*
* Chips rather than the list the settings screen uses: this is one line of a
* page that is mostly prose, and a seven-row list here would read as the first
@@ -371,101 +333,18 @@ private fun Done() {
private fun LanguageChips(language: String, onLanguage: (String) -> Unit) {
Row(
Modifier
- .padding(top = 22.dp)
+ .padding(top = 24.dp)
.horizontalScroll(rememberScrollState()),
horizontalArrangement = Arrangement.spacedBy(8.dp),
) {
AppLanguages.forEach { (tag, name) ->
- val selected = tag == language
- Text(
- name.ifEmpty { stringResource(R.string.system_language) },
- style = MaterialTheme.typography.bodyMedium,
- color = if (selected) Ink else InkDim,
- modifier = Modifier
- .clip(RoundedCornerShape(50))
- .background(Ink.copy(alpha = if (selected) 0.18f else 0.07f))
- .clickable { onLanguage(tag) }
- .padding(horizontal = 14.dp, vertical = 8.dp),
+ FilterChip(
+ label = name.ifEmpty { stringResource(R.string.system_language) },
+ selected = tag == language,
+ onClick = { onLanguage(tag) },
)
}
}
}
-/* ---- pieces ---- */
-
-@Composable
-private fun StepTitle(text: String) {
- Text(
- text,
- style = MaterialTheme.typography.displayLarge,
- modifier = Modifier.padding(top = 16.dp, bottom = 4.dp),
- )
-}
-
-@Composable
-private fun Body(text: String) {
- Text(
- text,
- style = MaterialTheme.typography.bodyLarge,
- color = InkDim,
- modifier = Modifier.padding(top = 12.dp),
- )
-}
-
-/** A step of the dashboard walkthrough: the number stays out of the text column. */
-@Composable
-private fun Numbered(index: Int, text: String) {
- Row(Modifier.padding(top = 14.dp)) {
- Text(
- "$index",
- style = MaterialTheme.typography.titleMedium,
- color = MaterialTheme.colorScheme.primary,
- fontWeight = FontWeight.Bold,
- modifier = Modifier
- .size(24.dp)
- .clip(CircleShape)
- .background(Ink.copy(alpha = 0.10f))
- .padding(top = 1.dp),
- )
- Text(
- text,
- style = MaterialTheme.typography.bodyLarge,
- color = InkDim,
- modifier = Modifier.padding(start = 12.dp),
- )
- }
-}
-
-/** Something that will cost the user time if skipped, rather than mere prose. */
-@Composable
-private fun Note(text: String) {
- Row(
- Modifier
- .padding(top = 16.dp)
- .fillMaxWidth()
- .clip(RoundedCornerShape(16.dp))
- .background(MaterialTheme.colorScheme.primary.copy(alpha = 0.12f))
- .padding(horizontal = 16.dp, vertical = 14.dp),
- ) {
- Text(text, style = MaterialTheme.typography.bodyMedium, color = Ink)
- }
-}
-
-@Composable
-private fun DoneRow(label: String) {
- Row(verticalAlignment = Alignment.CenterVertically) {
- Icon(
- PhosphorIcons.Regular.Check,
- contentDescription = null,
- tint = MaterialTheme.colorScheme.primary,
- modifier = Modifier.padding(end = 10.dp).size(20.dp),
- )
- Text(
- label,
- style = MaterialTheme.typography.titleMedium,
- color = MaterialTheme.colorScheme.primary,
- )
- }
-}
-
private const val DASHBOARD_URL = "https://developer.spotify.com/dashboard"
diff --git a/app/src/main/java/dev/lelonio/square/ui/onboarding/SetupPieces.kt b/app/src/main/java/dev/lelonio/square/ui/onboarding/SetupPieces.kt
new file mode 100644
index 0000000..3f3b55a
--- /dev/null
+++ b/app/src/main/java/dev/lelonio/square/ui/onboarding/SetupPieces.kt
@@ -0,0 +1,424 @@
+package dev.lelonio.square.ui.onboarding
+
+import androidx.compose.animation.core.animateDpAsState
+import androidx.compose.animation.core.tween
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.RowScope
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.asPaddingValues
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.navigationBars
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.statusBars
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.Shape
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import com.adamglin.PhosphorIcons
+import com.adamglin.phosphoricons.Regular
+import com.adamglin.phosphoricons.regular.Check
+import com.adamglin.phosphoricons.regular.Info
+import dev.lelonio.square.ui.glass.pressable
+import dev.lelonio.square.ui.theme.Ink
+import dev.lelonio.square.ui.theme.InkDim
+import dev.lelonio.square.ui.theme.lightPage
+import dev.lelonio.square.ui.theme.pageGround
+
+/*
+ * What the setup is drawn with: the first question and the guide after it.
+ *
+ * In ink, on the page's own ground, and nothing else. These screens used to
+ * sit on a fixed near-black while their writing followed the phone, so in the
+ * light setting they were dark words on a dark page; and every mark on them
+ * was the accent, which is the colour of whatever record happens to be
+ * playing, so the same guide was salmon one day and green the next.
+ *
+ * The app's neutral pages already say how a control looks without a colour
+ * of its own, and this follows them. A card is a shade off the ground with a
+ * hairline round it, white on the light side, as an unlit filter chip is. The
+ * one control that moves the guide on is the ink itself, with the ground for
+ * a label, as a lit chip is. Both hold in either theme without a value
+ * changing side.
+ */
+
+/** The page every screen of the setup is laid on. */
+@Composable
+internal fun SetupScaffold(
+ top: @Composable RowScope.() -> Unit,
+ bottom: (@Composable RowScope.() -> Unit)? = null,
+ content: @Composable ColumnScope.() -> Unit,
+) {
+ val statusBar = WindowInsets.statusBars.asPaddingValues().calculateTopPadding()
+ val navBar = WindowInsets.navigationBars.asPaddingValues().calculateBottomPadding()
+
+ Box(
+ Modifier
+ .fillMaxSize()
+ // Opaque: nothing behind the setup is meant to show or be reached
+ // while it is up, and a home page the user has not configured yet
+ // would be showing them the problem rather than the way through it.
+ .background(pageGround())
+ .clickable(interactionSource = null, indication = null) {},
+ ) {
+ Column(
+ Modifier
+ .fillMaxSize()
+ .padding(top = statusBar, bottom = navBar),
+ ) {
+ Row(
+ Modifier
+ .fillMaxWidth()
+ .height(TOP_BAR)
+ .padding(horizontal = 16.dp),
+ verticalAlignment = Alignment.CenterVertically,
+ content = top,
+ )
+ Column(
+ Modifier
+ .weight(1f)
+ .fillMaxWidth(),
+ content = content,
+ )
+ if (bottom != null) {
+ Row(
+ Modifier
+ .fillMaxWidth()
+ .padding(horizontal = PAGE_MARGIN, vertical = 16.dp),
+ verticalAlignment = Alignment.CenterVertically,
+ content = bottom,
+ )
+ }
+ }
+ }
+}
+
+/** A shade off the ground: white on the light side, a lift out of the dark. */
+@Composable
+private fun cardFill(): Color = if (lightPage()) Color.White else Ink.copy(alpha = 0.07f)
+
+@Composable
+private fun cardEdge(): Color = Ink.copy(alpha = if (lightPage()) 0.07f else 0.09f)
+
+@Composable
+internal fun Modifier.setupCard(shape: Shape = CardShape): Modifier =
+ this
+ .clip(shape)
+ .background(cardFill())
+ .border(1.dp, cardEdge(), shape)
+
+/** Running text: a step down from the ink, and still meant to be read. */
+internal val Prose: Color
+ @Composable get() = Ink.copy(alpha = 0.76f)
+
+/** The control that moves the setup on: the ink, with the ground for a label. */
+@Composable
+internal fun PrimaryButton(
+ text: String,
+ onClick: () -> Unit,
+ modifier: Modifier = Modifier,
+) {
+ Box(
+ modifier
+ .pressable(onClick, pressedScale = 0.96f)
+ .height(52.dp)
+ .clip(CircleShape)
+ .background(Ink)
+ .padding(horizontal = 26.dp),
+ contentAlignment = Alignment.Center,
+ ) {
+ Text(
+ text,
+ style = MaterialTheme.typography.titleMedium,
+ fontWeight = FontWeight.SemiBold,
+ color = pageGround(),
+ maxLines = 1,
+ )
+ }
+}
+
+/**
+ * An action inside a step: logging in, linking the key.
+ *
+ * A card rather than a second filled button, so the page has one thing that
+ * is plainly the way on and the rest reads as what to do on the way.
+ */
+@Composable
+internal fun SecondaryButton(
+ text: String,
+ onClick: () -> Unit,
+ modifier: Modifier = Modifier,
+ busy: Boolean = false,
+) {
+ Box(
+ modifier
+ .pressable({ if (!busy) onClick() }, pressedScale = 0.97f)
+ .fillMaxWidth()
+ .height(52.dp)
+ .setupCard(CircleShape),
+ contentAlignment = Alignment.Center,
+ ) {
+ if (busy) {
+ CircularProgressIndicator(
+ strokeWidth = 2.dp,
+ color = Ink,
+ modifier = Modifier.size(18.dp),
+ )
+ } else {
+ Text(
+ text,
+ style = MaterialTheme.typography.titleMedium,
+ fontWeight = FontWeight.SemiBold,
+ color = Ink,
+ maxLines = 1,
+ )
+ }
+ }
+}
+
+/** A card that goes somewhere: a title, a line about it, and where it points. */
+@Composable
+internal fun CardButton(
+ title: String,
+ onClick: () -> Unit,
+ icon: ImageVector,
+ modifier: Modifier = Modifier,
+ detail: String? = null,
+) {
+ Row(
+ modifier
+ .pressable(onClick, pressedScale = 0.98f)
+ .fillMaxWidth()
+ .setupCard()
+ .padding(horizontal = 18.dp, vertical = 16.dp),
+ verticalAlignment = Alignment.CenterVertically,
+ ) {
+ Column(Modifier.weight(1f)) {
+ Text(
+ title,
+ style = MaterialTheme.typography.titleMedium,
+ fontWeight = FontWeight.SemiBold,
+ color = Ink,
+ )
+ if (detail != null) {
+ Text(
+ detail,
+ style = MaterialTheme.typography.bodyMedium,
+ color = InkDim,
+ modifier = Modifier.padding(top = 3.dp),
+ )
+ }
+ }
+ Icon(
+ icon,
+ contentDescription = null,
+ tint = InkDim,
+ modifier = Modifier
+ .padding(start = 12.dp)
+ .size(18.dp),
+ )
+ }
+}
+
+/** The way back, at the top: a small round card with the arrow in it. */
+@Composable
+internal fun RoundButton(icon: ImageVector, contentDescription: String, onClick: () -> Unit) {
+ Box(
+ Modifier
+ .pressable(onClick, pressedScale = 0.92f)
+ .size(42.dp)
+ .setupCard(CircleShape),
+ contentAlignment = Alignment.Center,
+ ) {
+ Icon(icon, contentDescription = contentDescription, tint = Ink, modifier = Modifier.size(19.dp))
+ }
+}
+
+/** Words that can be tapped and are not the point: skipping, copying. */
+@Composable
+internal fun QuietButton(text: String, onClick: () -> Unit, modifier: Modifier = Modifier) {
+ Text(
+ text,
+ style = MaterialTheme.typography.bodyMedium,
+ fontWeight = FontWeight.SemiBold,
+ color = InkDim,
+ modifier = modifier
+ .clip(CircleShape)
+ .pressable(onClick, shape = CircleShape)
+ .padding(horizontal = 14.dp, vertical = 9.dp),
+ )
+}
+
+/** Where a step is in the guide, over what it asks. */
+@Composable
+internal fun StepHeader(title: String, overline: String? = null) {
+ Column(Modifier.padding(top = 18.dp)) {
+ if (overline != null) {
+ Text(
+ overline.uppercase(),
+ style = MaterialTheme.typography.labelLarge,
+ color = InkDim,
+ modifier = Modifier.padding(bottom = 8.dp),
+ )
+ }
+ Text(title, style = MaterialTheme.typography.headlineLarge, color = Ink)
+ }
+}
+
+@Composable
+internal fun ProseText(text: String) {
+ Text(
+ text,
+ style = MaterialTheme.typography.bodyLarge,
+ color = Prose,
+ modifier = Modifier.padding(top = 12.dp),
+ )
+}
+
+/**
+ * Something that will cost the user time if skipped, rather than mere prose.
+ *
+ * Marked by the card and a small sign, not by a colour: the accent it used to
+ * be tinted with was the record's, and said nothing about the warning.
+ */
+@Composable
+internal fun Note(text: String) {
+ Row(
+ Modifier
+ .padding(top = 16.dp)
+ .fillMaxWidth()
+ .setupCard(RoundedCornerShape(18.dp))
+ .padding(horizontal = 16.dp, vertical = 14.dp),
+ ) {
+ Icon(
+ PhosphorIcons.Regular.Info,
+ contentDescription = null,
+ tint = InkDim,
+ modifier = Modifier
+ .padding(top = 1.dp, end = 12.dp)
+ .size(18.dp),
+ )
+ Text(text, style = MaterialTheme.typography.bodyMedium, color = Ink)
+ }
+}
+
+/** A step already done, said with the ink turned over, as a lit chip is. */
+@Composable
+internal fun DoneRow(label: String) {
+ Row(verticalAlignment = Alignment.CenterVertically) {
+ Box(
+ Modifier
+ .size(24.dp)
+ .clip(CircleShape)
+ .background(Ink),
+ contentAlignment = Alignment.Center,
+ ) {
+ Icon(
+ PhosphorIcons.Regular.Check,
+ contentDescription = null,
+ tint = pageGround(),
+ modifier = Modifier.size(14.dp),
+ )
+ }
+ Text(
+ label,
+ style = MaterialTheme.typography.titleMedium,
+ fontWeight = FontWeight.SemiBold,
+ color = Ink,
+ modifier = Modifier.padding(start = 10.dp),
+ )
+ }
+}
+
+/** How far through the guide: the current step drawn long, the rest as dots. */
+@Composable
+internal fun StepDots(count: Int, current: Int) {
+ Row(horizontalArrangement = Arrangement.spacedBy(6.dp)) {
+ repeat(count) { index ->
+ val here = index == current
+ val width by animateDpAsState(
+ targetValue = if (here) 18.dp else 6.dp,
+ animationSpec = tween(220),
+ label = "stepDot",
+ )
+ Box(
+ Modifier
+ .height(6.dp)
+ .width(width)
+ .clip(CircleShape)
+ .background(if (here) Ink else Ink.copy(alpha = 0.2f)),
+ )
+ }
+ }
+}
+
+/** A numbered line of a list inside a card, with room under it for more. */
+@Composable
+internal fun ListStep(
+ index: Int,
+ text: String,
+ extra: (@Composable () -> Unit)? = null,
+) {
+ Row(Modifier.padding(horizontal = 16.dp, vertical = 12.dp)) {
+ Box(
+ Modifier
+ .size(24.dp)
+ .clip(CircleShape)
+ .border(1.dp, Ink.copy(alpha = 0.22f), CircleShape),
+ contentAlignment = Alignment.Center,
+ ) {
+ Text(
+ "$index",
+ style = MaterialTheme.typography.labelLarge,
+ fontWeight = FontWeight.SemiBold,
+ color = Ink,
+ )
+ }
+ Column(
+ Modifier
+ .weight(1f)
+ .padding(start = 12.dp, top = 2.dp),
+ ) {
+ Text(text, style = MaterialTheme.typography.bodyMedium, color = Prose)
+ extra?.invoke()
+ }
+ }
+}
+
+/** The line between two of those, starting where their text does. */
+@Composable
+internal fun ListDivider() {
+ Box(
+ Modifier
+ .padding(start = 52.dp, end = 16.dp)
+ .fillMaxWidth()
+ .height(1.dp)
+ .background(Ink.copy(alpha = 0.07f)),
+ )
+}
+
+internal val PAGE_MARGIN = 24.dp
+private val TOP_BAR = 60.dp
+private val CardShape = RoundedCornerShape(20.dp)
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 20eeb5d..e0d3030 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -203,12 +203,13 @@
<string name="onboarding_start">Los geht\'s</string>
<string name="onboarding_welcome_1">Deine Spotify-Musik, mit Songtexten, Canvas und Audioeffekten.</string>
<string name="onboarding_welcome_2">Ein Spotify-Premium-Konto ist nötig.</string>
- <string name="onboarding_welcome_3">Zwei Schritte, dann läuft es. Fünf Minuten, ein einziges Mal.</string>
- <string name="onboarding_login_title">1. Bei Spotify anmelden</string>
+ <string name="onboarding_welcome_3">Drei Schritte, dann läuft es. Fünf Minuten, ein einziges Mal.</string>
+ <string name="onboarding_step_of">Schritt %1$d von %2$d</string>
+ <string name="onboarding_login_title">Bei Spotify anmelden</string>
<string name="onboarding_login_1">Der Browser öffnet die Seite von Spotify. Du bestätigst und landest von selbst wieder hier.</string>
<string name="onboarding_login_2">Das Passwort tippst du nur auf Spotifys eigener Seite: Square sieht es nie.</string>
<string name="onboarding_login_done">Anmeldung abgeschlossen</string>
- <string name="onboarding_key_title">2. Eigenen Schlüssel anlegen</string>
+ <string name="onboarding_key_title">Eigenen Schlüssel anlegen</string>
<string name="onboarding_key_intro">Suche und Empfehlungen laufen über Spotifys API, die einen persönlichen Schlüssel braucht. Das dauert eine Minute, ist kostenlos, und eine Karte wird nicht verlangt.</string>
<string name="onboarding_open_dashboard">Dashboard öffnen</string>
<string name="onboarding_step_login">Melde dich mit demselben Spotify-Konto an.</string>
@@ -219,7 +220,7 @@
<string name="onboarding_step_terms">Bedingungen annehmen und «Save» drücken.</string>
<string name="onboarding_step_client_id">Auf der Seite der App «Settings» drücken: unter «Basic Information» steht die Client ID. Kopiere sie.</string>
<string name="onboarding_step_secret">Das Client secret wird nicht gebraucht: nicht kopieren und nirgends eintragen.</string>
- <string name="onboarding_paste_title">3. Client ID einfügen</string>
+ <string name="onboarding_paste_title">Client ID einfügen</string>
<string name="onboarding_paste_done">Fertig: Suche und Empfehlungen sind aktiv.</string>
<string name="onboarding_key_linked">Schlüssel verbunden</string>
<string name="onboarding_paste_hint">Füge hier die Client ID ein und drücke Verbinden. Der Browser öffnet sich ein letztes Mal zur Bestätigung.</string>
@@ -250,9 +251,10 @@
<string name="backend_note">Spotify spielt dein eigenes Konto: dessen Bibliothek, Playlists und Geräte. YouTube Music ist hier anonym — Suche und Wiedergabe funktionieren, eine Kontobibliothek nicht. Diese Änderung startet die Wiedergabe neu.</string>
<string name="backend_choice_title">Woher möchtest du hören?</string>
<string name="backend_choice_subtitle">Die andere Quelle lässt sich später in den Einstellungen wählen.</string>
- <string name="backend_choice_spotify_note">Dein eigenes Konto: deine Bibliothek, deine Playlists, deine Connect-Geräte. Erfordert Anmeldung und etwas Einrichtung.</string>
- <string name="backend_choice_youtube_note">Der ganze Katalog, sofort durchsuchbar und abspielbar. Kein Konto, also auch keine eigene Bibliothek.</string>
- <string name="backend_choice_changeable">Jederzeit in den Einstellungen änderbar.</string>
+ <string name="backend_choice_spotify_note">Deine Bibliothek, deine Playlists und deine Connect-Geräte.</string>
+ <string name="backend_choice_youtube_note">Der ganze Katalog und die Musikvideos. Mit Google-Konto kommen auch deine Playlists, Alben und gefolgten Künstler dazu.</string>
+ <string name="backend_choice_spotify_needs">Braucht Spotify Premium und ein paar Minuten Einrichtung.</string>
+ <string name="backend_choice_youtube_needs">Google-Konto optional: Es läuft auch ohne.</string>
<string name="youtube_home_empty">Suche etwas, um loszuhören. Was du abspielst, erscheint hier.</string>
<string name="trending_now">Trends</string>
<string name="popular_playlists">Beliebte Playlists</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 85c6950..4aed557 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -203,12 +203,13 @@
<string name="onboarding_start">Empieza a escuchar</string>
<string name="onboarding_welcome_1">Tu música de Spotify, con letras, canvas y efectos de audio.</string>
<string name="onboarding_welcome_2">Hace falta una cuenta Spotify Premium.</string>
- <string name="onboarding_welcome_3">Dos pasos y listo. Cinco minutos, una sola vez.</string>
- <string name="onboarding_login_title">1. Entra en Spotify</string>
+ <string name="onboarding_welcome_3">Tres pasos y listo. Cinco minutos, una sola vez.</string>
+ <string name="onboarding_step_of">Paso %1$d de %2$d</string>
+ <string name="onboarding_login_title">Entra en Spotify</string>
<string name="onboarding_login_1">Se abre el navegador en la página de Spotify. Autorizas y vuelves aquí solo.</string>
<string name="onboarding_login_2">La contraseña solo la escribes en la página de Spotify: Square no la ve.</string>
<string name="onboarding_login_done">Sesión iniciada</string>
- <string name="onboarding_key_title">2. Crea tu clave</string>
+ <string name="onboarding_key_title">Crea tu clave</string>
<string name="onboarding_key_intro">La búsqueda y las recomendaciones pasan por la API de Spotify, que debe usarse con una clave personal. Se crea en un minuto, es gratis y no hace falta ninguna tarjeta.</string>
<string name="onboarding_open_dashboard">Abrir el panel</string>
<string name="onboarding_step_login">Entra con la misma cuenta de Spotify.</string>
@@ -219,7 +220,7 @@
<string name="onboarding_step_terms">Acepta los términos y pulsa «Save».</string>
<string name="onboarding_step_client_id">En la página de la app pulsa «Settings»: bajo «Basic Information» está el Client ID. Cópialo.</string>
<string name="onboarding_step_secret">El Client secret no hace falta: no lo copies ni lo introduzcas en ningún sitio.</string>
- <string name="onboarding_paste_title">3. Pega el Client ID</string>
+ <string name="onboarding_paste_title">Pega el Client ID</string>
<string name="onboarding_paste_done">Listo: búsqueda y recomendaciones activas.</string>
<string name="onboarding_key_linked">Clave conectada</string>
<string name="onboarding_paste_hint">Pega aquí el Client ID y pulsa Conectar. El navegador se abre una última vez para confirmar.</string>
@@ -250,9 +251,10 @@
<string name="backend_note">Spotify reproduce tu cuenta: su biblioteca, sus listas, sus dispositivos. YouTube Music aquí es anónimo: la búsqueda y la reproducción funcionan, la biblioteca de una cuenta no. Cambiarlo reinicia la reproducción.</string>
<string name="backend_choice_title">¿Desde dónde quieres escuchar?</string>
<string name="backend_choice_subtitle">Puedes elegir la otra más adelante, en los ajustes.</string>
- <string name="backend_choice_spotify_note">Tu cuenta: tu biblioteca, tus listas, tus dispositivos Connect. Requiere iniciar sesión y algo de configuración.</string>
- <string name="backend_choice_youtube_note">Todo el catálogo, buscable y reproducible al instante. Sin cuenta, así que no hay una biblioteca tuya que leer.</string>
- <string name="backend_choice_changeable">Se puede cambiar en cualquier momento en los ajustes.</string>
+ <string name="backend_choice_spotify_note">Tu biblioteca, tus listas y tus dispositivos Connect.</string>
+ <string name="backend_choice_youtube_note">Todo el catálogo y los videoclips. Con tu cuenta de Google llegan también tus listas, tus álbumes y los artistas que sigues.</string>
+ <string name="backend_choice_spotify_needs">Necesita Spotify Premium y unos minutos de configuración.</string>
+ <string name="backend_choice_youtube_needs">Cuenta de Google opcional: suena también sin ella.</string>
<string name="youtube_home_empty">Busca algo para empezar a escuchar. Lo que reproduzcas aparecerá aquí.</string>
<string name="trending_now">Tendencias</string>
<string name="popular_playlists">Listas populares</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 2cb030d..5d827d7 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -203,12 +203,13 @@
<string name="onboarding_start">Commencer à écouter</string>
<string name="onboarding_welcome_1">Votre musique Spotify, avec paroles, canvas et effets audio.</string>
<string name="onboarding_welcome_2">Un compte Spotify Premium est nécessaire.</string>
- <string name="onboarding_welcome_3">Deux étapes et c\'est prêt. Cinq minutes, une seule fois.</string>
- <string name="onboarding_login_title">1. Connectez-vous à Spotify</string>
+ <string name="onboarding_welcome_3">Trois étapes et c\'est prêt. Cinq minutes, une seule fois.</string>
+ <string name="onboarding_step_of">Étape %1$d sur %2$d</string>
+ <string name="onboarding_login_title">Connectez-vous à Spotify</string>
<string name="onboarding_login_1">Le navigateur s\'ouvre sur la page de Spotify. Vous autorisez et vous revenez ici tout seul.</string>
<string name="onboarding_login_2">Le mot de passe ne s\'écrit que sur la page de Spotify : Square ne le voit pas.</string>
<string name="onboarding_login_done">Connexion effectuée</string>
- <string name="onboarding_key_title">2. Créez votre clé</string>
+ <string name="onboarding_key_title">Créez votre clé</string>
<string name="onboarding_key_intro">La recherche et les recommandations passent par l\'API de Spotify, qui s\'utilise avec une clé personnelle. Cela prend une minute, c\'est gratuit et aucune carte n\'est demandée.</string>
<string name="onboarding_open_dashboard">Ouvrir le tableau de bord</string>
<string name="onboarding_step_login">Connectez-vous avec le même compte Spotify.</string>
@@ -219,7 +220,7 @@
<string name="onboarding_step_terms">Acceptez les conditions et appuyez sur « Save ».</string>
<string name="onboarding_step_client_id">Sur la page de l\'app, appuyez sur « Settings » : le Client ID est sous « Basic Information ». Copiez-le.</string>
<string name="onboarding_step_secret">Le Client secret ne sert à rien : ne le copiez pas et ne le saisissez nulle part.</string>
- <string name="onboarding_paste_title">3. Collez le Client ID</string>
+ <string name="onboarding_paste_title">Collez le Client ID</string>
<string name="onboarding_paste_done">C\'est fait : recherche et recommandations sont actives.</string>
<string name="onboarding_key_linked">Clé connectée</string>
<string name="onboarding_paste_hint">Collez ici le Client ID et appuyez sur Connecter. Le navigateur s\'ouvre une dernière fois pour confirmer.</string>
@@ -250,9 +251,10 @@
<string name="backend_note">Spotify lit votre compte : sa bibliothèque, ses playlists, ses appareils. YouTube Music est ici anonyme — la recherche et la lecture fonctionnent, la bibliothèque d\'un compte non. Changer ceci redémarre la lecture.</string>
<string name="backend_choice_title">D\'où voulez-vous écouter ?</string>
<string name="backend_choice_subtitle">Vous pourrez choisir l\'autre plus tard, dans les réglages.</string>
- <string name="backend_choice_spotify_note">Votre compte : votre bibliothèque, vos playlists, vos appareils Connect. Nécessite une connexion et un peu de configuration.</string>
- <string name="backend_choice_youtube_note">Tout le catalogue, cherchable et lisible immédiatement. Pas de compte, donc pas de bibliothèque personnelle à lire.</string>
- <string name="backend_choice_changeable">Modifiable à tout moment dans les réglages.</string>
+ <string name="backend_choice_spotify_note">Votre bibliothèque, vos playlists et vos appareils Connect.</string>
+ <string name="backend_choice_youtube_note">Tout le catalogue et les clips. Avec votre compte Google, vos playlists, vos albums et les artistes que vous suivez arrivent aussi.</string>
+ <string name="backend_choice_spotify_needs">Nécessite Spotify Premium et quelques minutes de configuration.</string>
+ <string name="backend_choice_youtube_needs">Compte Google facultatif : la musique joue aussi sans.</string>
<string name="youtube_home_empty">Cherchez quelque chose pour commencer à écouter. Ce que vous lisez apparaîtra ici.</string>
<string name="trending_now">Tendances</string>
<string name="popular_playlists">Playlists populaires</string>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 8abd042..3f389a2 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -217,12 +217,13 @@
<string name="onboarding_start">सुनना शुरू करें</string>
<string name="onboarding_welcome_1">आपका Spotify संगीत, बोल, canvas और ऑडियो इफ़ेक्ट के साथ।</string>
<string name="onboarding_welcome_2">Spotify Premium खाता ज़रूरी है।</string>
- <string name="onboarding_welcome_3">दो कदम और आप तैयार। एक बार के पाँच मिनट।</string>
- <string name="onboarding_login_title">1. Spotify में लॉग इन करें</string>
+ <string name="onboarding_welcome_3">तीन कदम और आप तैयार। एक बार के पाँच मिनट।</string>
+ <string name="onboarding_step_of">चरण %1$d / %2$d</string>
+ <string name="onboarding_login_title">Spotify में लॉग इन करें</string>
<string name="onboarding_login_1">ब्राउज़र Spotify के पेज पर खुलता है। आप अनुमति देते हैं और वह आपको यहाँ लौटा देता है।</string>
<string name="onboarding_login_2">पासवर्ड आप सिर्फ़ Spotify के अपने पेज पर लिखते हैं: Square उसे कभी नहीं देखता।</string>
<string name="onboarding_login_done">लॉग इन हो गया</string>
- <string name="onboarding_key_title">2. अपनी कुंजी बनाएँ</string>
+ <string name="onboarding_key_title">अपनी कुंजी बनाएँ</string>
<string name="onboarding_key_intro">खोज और सुझाव Spotify के API से होकर जाते हैं, जिसे निजी कुंजी के साथ इस्तेमाल करना होता है। एक मिनट लगता है, मुफ़्त है, कार्ड की ज़रूरत नहीं।</string>
<string name="onboarding_open_dashboard">डैशबोर्ड खोलें</string>
<string name="onboarding_step_login">उसी Spotify खाते से लॉग इन करें।</string>
@@ -233,7 +234,7 @@
<string name="onboarding_step_terms">शर्तें स्वीकार करें और «Save» दबाएँ।</string>
<string name="onboarding_step_client_id">ऐप के पेज पर «Settings» दबाएँ: Client ID «Basic Information» के नीचे है। उसे कॉपी करें।</string>
<string name="onboarding_step_secret">Client secret की ज़रूरत नहीं: उसे न कॉपी करें और न कहीं डालें।</string>
- <string name="onboarding_paste_title">3. Client ID चिपकाएँ</string>
+ <string name="onboarding_paste_title">Client ID चिपकाएँ</string>
<string name="onboarding_paste_done">हो गया: खोज और सुझाव चालू हैं।</string>
<string name="onboarding_key_linked">कुंजी जुड़ गई</string>
<string name="onboarding_paste_hint">Client ID यहाँ चिपकाएँ और कनेक्ट दबाएँ। पुष्टि के लिए ब्राउज़र आख़िरी बार खुलेगा।</string>
@@ -265,9 +266,10 @@
<string name="backend_note">Spotify आपका अपना खाता चलाता है: उसकी लाइब्रेरी, प्लेलिस्ट और डिवाइस। YouTube Music यहाँ बिना पहचान के है — खोज और प्लेबैक चलते हैं, खाते की लाइब्रेरी नहीं। इसे बदलने पर प्लेबैक फिर से शुरू होता है।</string>
<string name="backend_choice_title">आप कहाँ से सुनना चाहते हैं?</string>
<string name="backend_choice_subtitle">दूसरा विकल्प बाद में सेटिंग से चुन सकते हैं।</string>
- <string name="backend_choice_spotify_note">आपका अपना खाता: आपकी लाइब्रेरी, प्लेलिस्ट और Connect डिवाइस। लॉग इन और थोड़ा सेटअप चाहिए।</string>
- <string name="backend_choice_youtube_note">पूरा कैटलॉग, तुरंत खोजें और चलाएँ। खाता नहीं, इसलिए अपनी लाइब्रेरी भी नहीं।</string>
- <string name="backend_choice_changeable">इसे कभी भी सेटिंग से बदला जा सकता है।</string>
+ <string name="backend_choice_spotify_note">आपकी लाइब्रेरी, आपकी प्लेलिस्ट और आपके Connect डिवाइस।</string>
+ <string name="backend_choice_youtube_note">पूरा कैटलॉग और म्यूज़िक वीडियो। Google खाते से आपकी प्लेलिस्ट, एल्बम और फ़ॉलो किए कलाकार भी आ जाते हैं।</string>
+ <string name="backend_choice_spotify_needs">Spotify Premium और कुछ मिनट का सेटअप चाहिए।</string>
+ <string name="backend_choice_youtube_needs">Google खाता वैकल्पिक: इसके बिना भी चलता है।</string>
<string name="youtube_home_empty">सुनना शुरू करने के लिए कुछ खोजें। जो आप चलाएँगे वह यहाँ दिखेगा।</string>
<string name="trending_now">अभी चर्चा में</string>
<string name="popular_playlists">लोकप्रिय प्लेलिस्ट</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 9f0c4fe..968ca4f 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -204,12 +204,13 @@
<string name="onboarding_start">Inizia ad ascoltare</string>
<string name="onboarding_welcome_1">La tua musica Spotify, con testi, canvas ed effetti audio.</string>
<string name="onboarding_welcome_2">Serve un account Spotify Premium.</string>
- <string name="onboarding_welcome_3">Due passaggi e sei pronto. Ci vogliono cinque minuti, una volta sola.</string>
- <string name="onboarding_login_title">1. Accedi a Spotify</string>
+ <string name="onboarding_welcome_3">Tre passaggi e sei pronto. Ci vogliono cinque minuti, una volta sola.</string>
+ <string name="onboarding_step_of">Passo %1$d di %2$d</string>
+ <string name="onboarding_login_title">Accedi a Spotify</string>
<string name="onboarding_login_1">Si apre il browser sulla pagina di Spotify. Autorizzi e torni qui da solo.</string>
<string name="onboarding_login_2">La password la scrivi solo nella pagina di Spotify: Square non la vede.</string>
<string name="onboarding_login_done">Accesso completato</string>
- <string name="onboarding_key_title">2. Crea la tua chiave</string>
+ <string name="onboarding_key_title">Crea la tua chiave</string>
<string name="onboarding_key_intro">La ricerca e i consigli passano dalle API di Spotify, che vanno usate con una chiave personale. Si crea in un minuto, è gratis e non serve nessuna carta.</string>
<string name="onboarding_open_dashboard">Apri il dashboard</string>
<string name="onboarding_step_login">Accedi con lo stesso account Spotify.</string>
@@ -220,7 +221,7 @@
<string name="onboarding_step_terms">Accetta i termini e premi «Save».</string>
<string name="onboarding_step_client_id">Nella pagina dell\'app premi «Settings»: sotto «Basic Information» trovi il Client ID. Copialo.</string>
<string name="onboarding_step_secret">Il Client secret non serve: non copiarlo e non inserirlo da nessuna parte.</string>
- <string name="onboarding_paste_title">3. Incolla il Client ID</string>
+ <string name="onboarding_paste_title">Incolla il Client ID</string>
<string name="onboarding_paste_done">Fatto: ricerca e consigli sono attivi.</string>
<string name="onboarding_key_linked">Chiave collegata</string>
<string name="onboarding_paste_hint">Incolla qui il Client ID e premi Collega. Il browser si apre un\'ultima volta per confermare.</string>
@@ -251,9 +252,10 @@
<string name="backend_note">Spotify riproduce il tuo account: la sua libreria, le sue playlist, i suoi dispositivi. YouTube Music qui è anonimo — ricerca e riproduzione funzionano, la libreria di un account no. Cambiarlo riavvia la riproduzione.</string>
<string name="backend_choice_title">Da dove vuoi ascoltare?</string>
<string name="backend_choice_subtitle">Puoi scegliere l\'altra più avanti, nelle impostazioni.</string>
- <string name="backend_choice_spotify_note">Il tuo account: la tua libreria, le tue playlist, i tuoi dispositivi Connect. Richiede l\'accesso e un po\' di configurazione.</string>
- <string name="backend_choice_youtube_note">Tutto il catalogo, subito cercabile e riproducibile. Nessun account, quindi non c\'è una libreria tua da leggere.</string>
- <string name="backend_choice_changeable">Si può cambiare in qualsiasi momento nelle impostazioni.</string>
+ <string name="backend_choice_spotify_note">La tua libreria, le tue playlist e i tuoi dispositivi Connect.</string>
+ <string name="backend_choice_youtube_note">Tutto il catalogo e i video musicali. Con l\'account Google arrivano anche le tue playlist, gli album e gli artisti che segui.</string>
+ <string name="backend_choice_spotify_needs">Serve Spotify Premium e qualche minuto di configurazione.</string>
+ <string name="backend_choice_youtube_needs">Account Google facoltativo: si ascolta anche senza.</string>
<string name="youtube_home_empty">Cerca qualcosa per iniziare ad ascoltare. Quello che riproduci compare qui.</string>
<string name="trending_now">Tendenze</string>
<string name="popular_playlists">Playlist popolari</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 237d750..5e7209c 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -203,12 +203,13 @@
<string name="onboarding_start">Comece a ouvir</string>
<string name="onboarding_welcome_1">Sua música do Spotify, com letras, canvas e efeitos de áudio.</string>
<string name="onboarding_welcome_2">É preciso uma conta Spotify Premium.</string>
- <string name="onboarding_welcome_3">Dois passos e está pronto. Cinco minutos, uma vez só.</string>
- <string name="onboarding_login_title">1. Entre no Spotify</string>
+ <string name="onboarding_welcome_3">Três passos e está pronto. Cinco minutos, uma vez só.</string>
+ <string name="onboarding_step_of">Passo %1$d de %2$d</string>
+ <string name="onboarding_login_title">Entre no Spotify</string>
<string name="onboarding_login_1">O navegador abre na página do Spotify. Você autoriza e volta para cá sozinho.</string>
<string name="onboarding_login_2">A senha você digita só na página do Spotify: o Square não a vê.</string>
<string name="onboarding_login_done">Acesso concluído</string>
- <string name="onboarding_key_title">2. Crie a sua chave</string>
+ <string name="onboarding_key_title">Crie a sua chave</string>
<string name="onboarding_key_intro">A busca e as recomendações passam pela API do Spotify, que precisa de uma chave pessoal. Leva um minuto, é grátis e não pede cartão.</string>
<string name="onboarding_open_dashboard">Abrir o painel</string>
<string name="onboarding_step_login">Entre com a mesma conta do Spotify.</string>
@@ -219,7 +220,7 @@
<string name="onboarding_step_terms">Aceite os termos e toque em «Save».</string>
<string name="onboarding_step_client_id">Na página do app toque em «Settings»: sob «Basic Information» está o Client ID. Copie-o.</string>
<string name="onboarding_step_secret">O Client secret não é preciso: não copie e não digite em lugar nenhum.</string>
- <string name="onboarding_paste_title">3. Cole o Client ID</string>
+ <string name="onboarding_paste_title">Cole o Client ID</string>
<string name="onboarding_paste_done">Pronto: busca e recomendações estão ativas.</string>
<string name="onboarding_key_linked">Chave conectada</string>
<string name="onboarding_paste_hint">Cole aqui o Client ID e toque em Conectar. O navegador abre uma última vez para confirmar.</string>
@@ -250,9 +251,10 @@
<string name="backend_note">O Spotify reproduz a tua conta: a sua biblioteca, as suas playlists, os seus dispositivos. O YouTube Music aqui é anónimo — a pesquisa e a reprodução funcionam, a biblioteca de uma conta não. Mudar isto reinicia a reprodução.</string>
<string name="backend_choice_title">De onde queres ouvir?</string>
<string name="backend_choice_subtitle">Podes escolher a outra mais tarde, nas definições.</string>
- <string name="backend_choice_spotify_note">A tua conta: a tua biblioteca, as tuas playlists, os teus dispositivos Connect. Requer início de sessão e alguma configuração.</string>
- <string name="backend_choice_youtube_note">Todo o catálogo, pesquisável e reproduzível de imediato. Sem conta, por isso não há biblioteca tua para ler.</string>
- <string name="backend_choice_changeable">Pode ser alterado a qualquer momento nas definições.</string>
+ <string name="backend_choice_spotify_note">A sua biblioteca, as suas playlists e os seus dispositivos Connect.</string>
+ <string name="backend_choice_youtube_note">Todo o catálogo e os videoclipes. Com a conta Google chegam também as suas playlists, álbuns e os artistas que segue.</string>
+ <string name="backend_choice_spotify_needs">Precisa do Spotify Premium e de alguns minutos de configuração.</string>
+ <string name="backend_choice_youtube_needs">Conta Google opcional: também toca sem ela.</string>
<string name="youtube_home_empty">Pesquisa algo para começares a ouvir. O que reproduzires aparece aqui.</string>
<string name="trending_now">Tendências</string>
<string name="popular_playlists">Playlists populares</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 852d229..e80f00e 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -217,12 +217,13 @@
<string name="onboarding_start">Dinlemeye başla</string>
<string name="onboarding_welcome_1">Spotify müziğin; sözler, canvas ve ses efektleriyle.</string>
<string name="onboarding_welcome_2">Spotify Premium hesabı gerekir.</string>
- <string name="onboarding_welcome_3">İki adım ve hazırsın. Bir kereliğine beş dakika.</string>
- <string name="onboarding_login_title">1. Spotify\'a giriş yap</string>
+ <string name="onboarding_welcome_3">Üç adım ve hazırsın. Bir kereliğine beş dakika.</string>
+ <string name="onboarding_step_of">Adım %1$d / %2$d</string>
+ <string name="onboarding_login_title">Spotify\'a giriş yap</string>
<string name="onboarding_login_1">Tarayıcı Spotify\'ın sayfasında açılır. İzin verirsin ve buraya geri döner.</string>
<string name="onboarding_login_2">Şifreni yalnızca Spotify\'ın kendi sayfasına yazarsın: Square onu hiç görmez.</string>
<string name="onboarding_login_done">Giriş yapıldı</string>
- <string name="onboarding_key_title">2. Anahtarını oluştur</string>
+ <string name="onboarding_key_title">Anahtarını oluştur</string>
<string name="onboarding_key_intro">Arama ve öneriler, kişisel bir anahtarla kullanılması gereken Spotify API\'sinden geçer. Bir dakika sürer, ücretsizdir ve kart gerekmez.</string>
<string name="onboarding_open_dashboard">Paneli aç</string>
<string name="onboarding_step_login">Aynı Spotify hesabıyla giriş yap.</string>
@@ -233,7 +234,7 @@
<string name="onboarding_step_terms">Koşulları kabul et ve «Save»e bas.</string>
<string name="onboarding_step_client_id">Uygulamanın sayfasında «Settings»e bas: Client ID, «Basic Information» altındadır. Kopyala.</string>
<string name="onboarding_step_secret">Client secret gerekmez: kopyalama ve hiçbir yere girme.</string>
- <string name="onboarding_paste_title">3. Client ID\'yi yapıştır</string>
+ <string name="onboarding_paste_title">Client ID\'yi yapıştır</string>
<string name="onboarding_paste_done">Tamam: arama ve öneriler açık.</string>
<string name="onboarding_key_linked">Anahtar bağlandı</string>
<string name="onboarding_paste_hint">Client ID\'yi buraya yapıştır ve Bağla\'ya bas. Onay için tarayıcı son bir kez açılır.</string>
@@ -265,9 +266,10 @@
<string name="backend_note">Spotify kendi hesabını çalar: kitaplığı, çalma listeleri, cihazları. YouTube Music burada anonimdir — arama ve çalma işler, hesap kitaplığı işlemez. Bunu değiştirmek çalmayı yeniden başlatır.</string>
<string name="backend_choice_title">Nereden dinlemek istersin?</string>
<string name="backend_choice_subtitle">Diğerini sonra ayarlardan seçebilirsin.</string>
- <string name="backend_choice_spotify_note">Kendi hesabın: kitaplığın, çalma listelerin, Connect cihazların. Giriş ve biraz kurulum gerekir.</string>
- <string name="backend_choice_youtube_note">Tüm katalog, hemen aranır ve çalınır. Hesap yok, dolayısıyla kendine ait bir kitaplık da yok.</string>
- <string name="backend_choice_changeable">Bu, istediğin zaman ayarlardan değiştirilebilir.</string>
+ <string name="backend_choice_spotify_note">Kitaplığın, çalma listelerin ve Connect cihazların.</string>
+ <string name="backend_choice_youtube_note">Tüm katalog ve müzik videoları. Google hesabınla çalma listelerin, albümlerin ve takip ettiğin sanatçılar da gelir.</string>
+ <string name="backend_choice_spotify_needs">Spotify Premium ve birkaç dakikalık kurulum gerekir.</string>
+ <string name="backend_choice_youtube_needs">Google hesabı isteğe bağlı: onsuz da çalar.</string>
<string name="youtube_home_empty">Dinlemeye başlamak için bir şey ara. Çaldıkların burada görünür.</string>
<string name="trending_now">Şu anda trend</string>
<string name="popular_playlists">Popüler çalma listeleri</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3d2f3df..08d4c6c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -223,12 +223,13 @@
<string name="onboarding_start">Start listening</string>
<string name="onboarding_welcome_1">Your Spotify music, with lyrics, canvas and audio effects.</string>
<string name="onboarding_welcome_2">A Spotify Premium account is required.</string>
- <string name="onboarding_welcome_3">Two steps and you are ready. Five minutes, once.</string>
- <string name="onboarding_login_title">1. Log in to Spotify</string>
+ <string name="onboarding_welcome_3">Three steps and you are ready. Five minutes, once.</string>
+ <string name="onboarding_step_of">Step %1$d of %2$d</string>
+ <string name="onboarding_login_title">Log in to Spotify</string>
<string name="onboarding_login_1">The browser opens on Spotify\'s page. You authorise, and it brings you back here.</string>
<string name="onboarding_login_2">You only ever type your password on Spotify\'s own page: Square never sees it.</string>
<string name="onboarding_login_done">Logged in</string>
- <string name="onboarding_key_title">2. Create your key</string>
+ <string name="onboarding_key_title">Create your key</string>
<string name="onboarding_key_intro">Search and recommendations go through Spotify\'s API, which has to be used with a personal key. It takes a minute, it is free, and no card is needed.</string>
<string name="onboarding_open_dashboard">Open the dashboard</string>
<string name="onboarding_step_login">Log in with the same Spotify account.</string>
@@ -239,7 +240,7 @@
<string name="onboarding_step_terms">Accept the terms and press «Save».</string>
<string name="onboarding_step_client_id">On the app\'s page press «Settings»: the Client ID is under «Basic Information». Copy it.</string>
<string name="onboarding_step_secret">The Client secret is not needed: do not copy it and do not enter it anywhere.</string>
- <string name="onboarding_paste_title">3. Paste the Client ID</string>
+ <string name="onboarding_paste_title">Paste the Client ID</string>
<string name="onboarding_paste_done">Done: search and recommendations are on.</string>
<string name="onboarding_key_linked">Key connected</string>
<string name="onboarding_paste_hint">Paste the Client ID here and press Connect. The browser opens one last time to confirm.</string>
@@ -271,9 +272,10 @@
<string name="backend_note">Spotify plays your own account: its library, its playlists, its devices. YouTube Music is anonymous here — search and playback work, an account library does not. Changing this restarts playback.</string>
<string name="backend_choice_title">Where do you want to listen from?</string>
<string name="backend_choice_subtitle">You can pick the other one later, in the settings.</string>
- <string name="backend_choice_spotify_note">Your own account: your library, your playlists, your Connect devices. Needs a login and a bit of setup.</string>
- <string name="backend_choice_youtube_note">The whole catalogue, searchable and playable straight away. No account, so there is no library of your own to read.</string>
- <string name="backend_choice_changeable">This can be changed at any time in the settings.</string>
+ <string name="backend_choice_spotify_note">Your library, your playlists and your Connect devices.</string>
+ <string name="backend_choice_youtube_note">The whole catalogue and the music videos. Signed in with Google, your playlists, albums and followed artists come too.</string>
+ <string name="backend_choice_spotify_needs">Needs Spotify Premium and a few minutes of setup.</string>
+ <string name="backend_choice_youtube_needs">Google account optional: it plays without one.</string>
<string name="youtube_home_empty">Search for something to start listening. What you play shows up here.</string>
<string name="trending_now">Trending now</string>
<string name="popular_playlists">Popular playlists</string>