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.

Speak six languages, get out of the way in settings, and know the account

Lelonio9f9cc39c21ab
diff --git a/.claude/settings.local.json b/.claude/settings.local.json
index 3591b01..6b3d8e9 100644
--- a/.claude/settings.local.json
+++ b/.claude/settings.local.json
@@ -165,7 +165,12 @@
"Bash(git clone *)",
"Bash(./gradlew :app:assembleDebug)",
"Bash(./gradlew :app:installDebug)",
- "Bash(./gradlew :app:installRelease)"
+ "Bash(./gradlew :app:installRelease)",
+ "Bash(./gradlew :app:compileDebugKotlin)",
+ "Bash(grep -rn '\"[A-ZÀ-Ù][a-zà-ù ]\\\\{3,\\\\}' app/src/main/java --include=\"*.kt\")",
+ "Bash(grep -rn --include=\"*.kt\" -oE '\"[^\"]{2,}\"' app/src/main/java)",
+ "Bash(grep -viE '\"\\(spotify:|https?:|hm://|[a-z0-9_.-]+\"$|[a-z]+-[a-z-]+\"$\\)')",
+ "Bash(grep -rn --include=\"*.kt\" -oE '\"[A-ZÀ-Ù][a-zà-ù]{2,}\"' app/src/main/java)"
]
}
}
diff --git a/app/.cxx/Debug/286k5v33/arm64-v8a/configure_fingerprint.bin b/app/.cxx/Debug/286k5v33/arm64-v8a/configure_fingerprint.bin
index 27eb76e..5d41b22 100644
--- a/app/.cxx/Debug/286k5v33/arm64-v8a/configure_fingerprint.bin
+++ b/app/.cxx/Debug/286k5v33/arm64-v8a/configure_fingerprint.bin
@@ -2,27 +2,27 @@ C/C++ Structured Logc
a
_/Users/emanuele/Progetto Spotify/app/.cxx/Debug/286k5v33/arm64-v8a/additional_project_files.txtC
A
-?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  �����3  ��߈�3`
+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ��IJ�3  ��߈�3`
^
-\/Users/emanuele/Progetto Spotify/app/.cxx/Debug/286k5v33/arm64-v8a/android_gradle_build.json  �����3� ��߈�3e
+\/Users/emanuele/Progetto Spotify/app/.cxx/Debug/286k5v33/arm64-v8a/android_gradle_build.json  ��IJ�3� ��߈�3e
c
-a/Users/emanuele/Progetto Spotify/app/.cxx/Debug/286k5v33/arm64-v8a/android_gradle_build_mini.json  �����3� ��߈�3R
+a/Users/emanuele/Progetto Spotify/app/.cxx/Debug/286k5v33/arm64-v8a/android_gradle_build_mini.json  ��IJ�3� ��߈�3R
P
-N/Users/emanuele/Progetto Spotify/app/.cxx/Debug/286k5v33/arm64-v8a/build.ninja  �����3� ��߈�3V
+N/Users/emanuele/Progetto Spotify/app/.cxx/Debug/286k5v33/arm64-v8a/build.ninja  ��IJ�3� ��߈�3V
T
-R/Users/emanuele/Progetto Spotify/app/.cxx/Debug/286k5v33/arm64-v8a/build.ninja.txt  �����3[
+R/Users/emanuele/Progetto Spotify/app/.cxx/Debug/286k5v33/arm64-v8a/build.ninja.txt  ��IJ�3[
Y
-W/Users/emanuele/Progetto Spotify/app/.cxx/Debug/286k5v33/arm64-v8a/build_file_index.txt  �����3 @ ��߈�3\
+W/Users/emanuele/Progetto Spotify/app/.cxx/Debug/286k5v33/arm64-v8a/build_file_index.txt  ��IJ�3 @ ��߈�3\
Z
-X/Users/emanuele/Progetto Spotify/app/.cxx/Debug/286k5v33/arm64-v8a/compile_commands.json  �����3֚ ��߈�3`
+X/Users/emanuele/Progetto Spotify/app/.cxx/Debug/286k5v33/arm64-v8a/compile_commands.json  ��IJ�3֚ ��߈�3`
^
-\/Users/emanuele/Progetto Spotify/app/.cxx/Debug/286k5v33/arm64-v8a/compile_commands.json.bin  �����3 �" ��߈�3f
+\/Users/emanuele/Progetto Spotify/app/.cxx/Debug/286k5v33/arm64-v8a/compile_commands.json.bin  ��IJ�3 �" ��߈�3f
d
-b/Users/emanuele/Progetto Spotify/app/.cxx/Debug/286k5v33/arm64-v8a/metadata_generation_command.txt  �����3
+b/Users/emanuele/Progetto Spotify/app/.cxx/Debug/286k5v33/arm64-v8a/metadata_generation_command.txt  ��IJ�3
� ��߈�3Y
W
-U/Users/emanuele/Progetto Spotify/app/.cxx/Debug/286k5v33/arm64-v8a/prefab_config.json  �����3  ( ��߈�3^
+U/Users/emanuele/Progetto Spotify/app/.cxx/Debug/286k5v33/arm64-v8a/prefab_config.json  ��IJ�3  ( ��߈�3^
\
-Z/Users/emanuele/Progetto Spotify/app/.cxx/Debug/286k5v33/arm64-v8a/symbol_folder_index.txt  �����3  Y ��߈�3D
+Z/Users/emanuele/Progetto Spotify/app/.cxx/Debug/286k5v33/arm64-v8a/symbol_folder_index.txt  ��IJ�3  Y ��߈�3D
B
-@/Users/emanuele/Progetto Spotify/app/src/main/cpp/CMakeLists.txt  �����3 � �Ȅ��3
\ No newline at end of file
+@/Users/emanuele/Progetto Spotify/app/src/main/cpp/CMakeLists.txt  ��IJ�3 � �Ȅ��3
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7865176..0facc7e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -16,6 +16,7 @@
android:allowBackup="false"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
+ android:localeConfig="@xml/locales_config"
android:supportsRtl="true"
android:theme="@style/Theme.Spot">
diff --git a/app/src/main/java/dev/emanuele/spot/auth/SpotifyOAuth.kt b/app/src/main/java/dev/emanuele/spot/auth/SpotifyOAuth.kt
index b4976ed..13bcbee 100644
--- a/app/src/main/java/dev/emanuele/spot/auth/SpotifyOAuth.kt
+++ b/app/src/main/java/dev/emanuele/spot/auth/SpotifyOAuth.kt
@@ -6,6 +6,7 @@ import android.net.Uri
import androidx.browser.customtabs.CustomTabsIntent
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
+import dev.emanuele.spot.R
import okhttp3.FormBody
import okhttp3.OkHttpClient
import okhttp3.Request
@@ -128,7 +129,7 @@ object SpotifyOAuth {
val challenge = challengeFor(verifier)
val state = randomState()
- LoopbackReceiver(REDIRECT_PORT).use { receiver ->
+ LoopbackReceiver(REDIRECT_PORT, context.getString(R.string.browser_return)).use { receiver ->
val redirectUri = receiver.redirectUri
// The port is ephemeral, so without this there is no way to tell a
// listener that never accepted from a browser that refused to load
@@ -240,7 +241,7 @@ object SpotifyOAuth {
* Binds an ephemeral port on 127.0.0.1, serves exactly one request, and closes.
* Only the device's own browser can reach it.
*/
-private class LoopbackReceiver(port: Int) : AutoCloseable {
+private class LoopbackReceiver(port: Int, private val doneMessage: String) : AutoCloseable {
data class Callback(val code: String?, val state: String?, val error: String?)
@@ -254,6 +255,16 @@ private class LoopbackReceiver(port: Int) : AutoCloseable {
*/
private val server = ServerSocket(port, 1, InetAddress.getByName("127.0.0.1"))
+ /** The one line the browser shows once the redirect lands, in the app's language. */
+ private val response: String = buildString {
+ val page = "<html><body><h2>$doneMessage</h2></body></html>"
+ append("HTTP/1.1 200 OK\r\n")
+ append("Content-Type: text/html; charset=utf-8\r\n")
+ append("Content-Length: ${page.toByteArray().size}\r\n")
+ append("Connection: close\r\n\r\n")
+ append(page)
+ }
+
/** Derived from the socket, so the URI can never disagree with the bind. */
val redirectUri: String =
"http://${server.inetAddress.hostAddress}:${server.localPort}/login"
@@ -274,7 +285,7 @@ private class LoopbackReceiver(port: Int) : AutoCloseable {
val uri = Uri.parse("http://127.0.0.1$target")
it.getOutputStream().writer().apply {
- write(RESPONSE)
+ write(response)
flush()
}
@@ -292,14 +303,5 @@ private class LoopbackReceiver(port: Int) : AutoCloseable {
private companion object {
const val REDIRECT_TIMEOUT_MS = 5 * 60 * 1000
-
- val RESPONSE = buildString {
- val page = "<html><body><h2>Puoi tornare all'app.</h2></body></html>"
- append("HTTP/1.1 200 OK\r\n")
- append("Content-Type: text/html; charset=utf-8\r\n")
- append("Content-Length: ${page.toByteArray().size}\r\n")
- append("Connection: close\r\n\r\n")
- append(page)
- }
}
}
diff --git a/app/src/main/java/dev/emanuele/spot/data/SearchResults.kt b/app/src/main/java/dev/emanuele/spot/data/SearchResults.kt
index 06f6abe..e505716 100644
--- a/app/src/main/java/dev/emanuele/spot/data/SearchResults.kt
+++ b/app/src/main/java/dev/emanuele/spot/data/SearchResults.kt
@@ -25,13 +25,18 @@ data class SearchResults(
* a song is what a search box in a music player is mostly for, and burying it
* under artist and album rows makes the common case the slow one.
*/
-fun SearchDto.toResults(): SearchResults = SearchResults(
+fun SearchDto.toResults(
+ /** What each kind is called, in the app's language; see MainViewModel. */
+ artistLabel: String,
+ albumLabel: String,
+ playlistLabel: String,
+): SearchResults = SearchResults(
tracks = tracks?.items.orEmpty().map { it.toCatalogTrack() },
artists = artists?.items.orEmpty().mapNotNull { artist ->
SearchItem(
uri = artist.uri ?: return@mapNotNull null,
title = artist.name,
- subtitle = "Artista",
+ subtitle = artistLabel,
artworkUrl = artist.images.firstOrNull()?.url,
)
},
@@ -39,7 +44,7 @@ fun SearchDto.toResults(): SearchResults = SearchResults(
SearchItem(
uri = album.uri ?: return@mapNotNull null,
title = album.name,
- subtitle = "Album",
+ subtitle = albumLabel,
artworkUrl = album.images.firstOrNull()?.url,
)
},
@@ -50,7 +55,7 @@ fun SearchDto.toResults(): SearchResults = SearchResults(
SearchItem(
uri = playlist.uri,
title = playlist.name,
- subtitle = "Playlist",
+ subtitle = playlistLabel,
artworkUrl = playlist.images.firstOrNull()?.url,
)
},
diff --git a/app/src/main/java/dev/emanuele/spot/data/SpotifyApi.kt b/app/src/main/java/dev/emanuele/spot/data/SpotifyApi.kt
index 0b85521..04558a6 100644
--- a/app/src/main/java/dev/emanuele/spot/data/SpotifyApi.kt
+++ b/app/src/main/java/dev/emanuele/spot/data/SpotifyApi.kt
@@ -88,6 +88,29 @@ interface SpotifyApi {
@Query("time_range") timeRange: String = "short_term",
): PageDto<ArtistDto>
+ /**
+ * The account's own most-played tracks. Same scope as the artists above.
+ *
+ * The time range is the whole point of having both: `short_term` is what is
+ * on repeat now, `long_term` is what the account has always come back to,
+ * and they are rarely the same list.
+ */
+ @GET("v1/me/top/tracks")
+ suspend fun topTracks(
+ @Query("limit") limit: Int = 20,
+ @Query("time_range") timeRange: String = "short_term",
+ ): PageDto<TrackDto>
+
+ /**
+ * What the account played last, wherever it played it.
+ *
+ * Different from the app's own recent list, which only knows what was
+ * played here: this is the phone, the desktop and the speaker together.
+ * Needs `user-read-recently-played`.
+ */
+ @GET("v1/me/player/recently-played")
+ suspend fun recentlyPlayed(@Query("limit") limit: Int = 30): PageDto<PlayHistoryDto>
+
/**
* An artist's most-played tracks.
*
@@ -247,6 +270,17 @@ data class AlbumDto(
@Serializable
data class TopTracksDto(val tracks: List<TrackDto> = emptyList())
+/** One entry of the account's play history: the track and where it was played from. */
+@Serializable
+data class PlayHistoryDto(
+ val track: TrackDto,
+ @SerialName("played_at") val playedAt: String? = null,
+ val context: PlayContextDto? = null,
+)
+
+@Serializable
+data class PlayContextDto(val uri: String? = null, val type: String? = null)
+
@Serializable
data class NewReleasesDto(val albums: PageDto<AlbumDto>? = null)
diff --git a/app/src/main/java/dev/emanuele/spot/playback/EffectPresets.kt b/app/src/main/java/dev/emanuele/spot/playback/EffectPresets.kt
index cd43d5d..ac16315 100644
--- a/app/src/main/java/dev/emanuele/spot/playback/EffectPresets.kt
+++ b/app/src/main/java/dev/emanuele/spot/playback/EffectPresets.kt
@@ -1,6 +1,7 @@
package dev.emanuele.spot.playback
import android.content.Context
+import dev.emanuele.spot.R
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow
@@ -94,6 +95,7 @@ val BuiltInPresets = listOf(
*/
class EffectPresetStore(context: Context) {
+ private val app = context.applicationContext
private val prefs = context.getSharedPreferences(FILE_NAME, Context.MODE_PRIVATE)
private val json = Json { ignoreUnknownKeys = true }
@@ -105,7 +107,7 @@ class EffectPresetStore(context: Context) {
fun save(name: String, speed: Float, pitch: Float, reverb: Float): EffectPreset {
val preset = EffectPreset(
id = java.util.UUID.randomUUID().toString(),
- name = name.trim().ifEmpty { "Senza nome" },
+ name = name.trim().ifEmpty { app.getString(R.string.unnamed) },
speed = speed,
pitch = pitch,
reverbAmount = reverb,
diff --git a/app/src/main/java/dev/emanuele/spot/ui/MainViewModel.kt b/app/src/main/java/dev/emanuele/spot/ui/MainViewModel.kt
index 68146e7..22df8c0 100644
--- a/app/src/main/java/dev/emanuele/spot/ui/MainViewModel.kt
+++ b/app/src/main/java/dev/emanuele/spot/ui/MainViewModel.kt
@@ -1,10 +1,12 @@
package dev.emanuele.spot.ui
import android.app.Application
+import androidx.annotation.StringRes
import androidx.lifecycle.AndroidViewModel
import androidx.lifecycle.viewModelScope
import dev.emanuele.spot.SpotApplication
import dev.emanuele.spot.auth.SpotifyOAuth
+import dev.emanuele.spot.R
import dev.emanuele.spot.data.Catalog
import dev.emanuele.spot.data.AddTracksRequestDto
import dev.emanuele.spot.data.RemoveTracksRequestDto
@@ -63,10 +65,10 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
}
/** What kind of thing the detail screen is showing. */
- enum class DetailKind(val label: String) {
- PLAYLIST("Playlist"),
- ALBUM("Album"),
- ARTIST("Artista"),
+ enum class DetailKind(@StringRes val label: Int) {
+ PLAYLIST(R.string.playlist),
+ ALBUM(R.string.album),
+ ARTIST(R.string.artist),
}
/**
@@ -99,6 +101,10 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
private val container get() = getApplication<SpotApplication>()
+ /** The app's own text, which lives in resources so it can be translated. */
+ private fun string(@StringRes id: Int, vararg args: Any): String =
+ getApplication<SpotApplication>().getString(id, *args)
+
private var inFlight: Job? = null
private var playlistJob: Job? = null
@@ -117,6 +123,14 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
data class FeedState(
val newReleases: List<SearchItem> = emptyList(),
val topArtists: List<SearchItem> = emptyList(),
+ /** On repeat this month. */
+ val topTracks: List<CatalogTrack> = emptyList(),
+ /** What the account has come back to over the years. */
+ val allTimeTracks: List<CatalogTrack> = emptyList(),
+ /** Records the artists the account listens to have put out lately. */
+ val fromYourArtists: List<SearchItem> = emptyList(),
+ /** Playlists and albums the account played last, on any device. */
+ val jumpBackIn: List<SearchItem> = emptyList(),
val loading: Boolean = false,
)
@@ -155,17 +169,104 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
SearchItem(
uri = artist.uri ?: return@mapNotNull null,
title = artist.name,
- subtitle = "Artista",
+ subtitle = string(R.string.artist),
artworkUrl = artist.images.firstOrNull()?.url,
)
}
}.onFailure { android.util.Log.w(TAG, "top artists unavailable: ${describe(it)}") }
.getOrDefault(emptyList())
- _feed.value = FeedState(newReleases = releases, topArtists = artists, loading = false)
+ val onRepeat = topTracks("short_term")
+ val allTime = topTracks("long_term")
+
+ // Built from the artists the account actually listens to rather
+ // than from the catalogue-wide new releases above: those are the
+ // same for everyone, and half of them are records the account would
+ // never open.
+ val fresh = freshFromArtists(artists)
+
+ val jumpBackIn = jumpBackIn()
+
+ _feed.value = FeedState(
+ newReleases = releases,
+ topArtists = artists,
+ topTracks = onRepeat,
+ allTimeTracks = allTime,
+ fromYourArtists = fresh,
+ jumpBackIn = jumpBackIn,
+ loading = false,
+ )
+ }
+ }
+
+ private suspend fun topTracks(range: String): List<CatalogTrack> = runCatching {
+ container.api.topTracks(timeRange = range).items.map { it.toCatalogTrack() }
+ }.onFailure { android.util.Log.w(TAG, "top tracks ($range) unavailable: ${describe(it)}") }
+ .getOrDefault(emptyList())
+
+ /**
+ * Records from the account's own artists, newest first.
+ *
+ * One request per artist, so only the first few are asked: this runs on the
+ * home page's first load and a dozen round trips would be felt. Anything
+ * older than a year is dropped — "new from artists you listen to" that
+ * opens on a 2019 album is just a discography.
+ */
+ private suspend fun freshFromArtists(artists: List<SearchItem>): List<SearchItem> {
+ val cutoff = java.time.LocalDate.now().minusMonths(12).toString()
+ return artists.take(FRESH_ARTISTS).flatMap { artist ->
+ runCatching {
+ container.api.artistAlbums(artist.uri.substringAfterLast(':'), limit = 6).items
+ }.getOrDefault(emptyList())
}
+ .filter { (it.releaseDate ?: "") >= cutoff }
+ .sortedByDescending { it.releaseDate }
+ .distinctBy { it.uri }
+ .mapNotNull { album ->
+ SearchItem(
+ uri = album.uri ?: return@mapNotNull null,
+ title = album.name,
+ subtitle = album.artists.joinToString(", ") { it.name }
+ .ifBlank { album.releaseDate?.take(4).orEmpty() },
+ artworkUrl = album.images.firstOrNull()?.url,
+ )
+ }
}
+ /**
+ * Where the account was listening last, on any device.
+ *
+ * The history gives the *context* a track was played from but not its name
+ * or its cover, and resolving each one would be a request apiece. Albums
+ * carry both on the track itself, and a playlist of the account's own is
+ * already in the rootlist — so those two are shown and anything else (an
+ * editorial playlist, a radio) is left out rather than guessed at.
+ */
+ private suspend fun jumpBackIn(): List<SearchItem> = runCatching {
+ val mine = (_state.value as? UiState.Ready)?.playlists.orEmpty().associateBy { it.uri }
+ container.api.recentlyPlayed().items.mapNotNull { play ->
+ val context = play.context?.uri
+ when {
+ context != null && mine.containsKey(context) -> mine[context]?.let {
+ SearchItem(it.uri, it.name, string(R.string.playlist), it.artworkUrl)
+ }
+
+ context != null && context.startsWith("spotify:album:") ->
+ play.track.album?.let { album ->
+ SearchItem(
+ uri = context,
+ title = album.name,
+ subtitle = play.track.artists.joinToString(", ") { it.name },
+ artworkUrl = album.images.firstOrNull()?.url,
+ )
+ }
+
+ else -> null
+ }
+ }.distinctBy { it.uri }.take(FEED_ROW)
+ }.onFailure { android.util.Log.w(TAG, "play history unavailable: ${describe(it)}") }
+ .getOrDefault(emptyList())
+
/** The Spotify Connect device picker. */
data class DevicesState(
val open: Boolean = false,
@@ -206,7 +307,7 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
if (!container.webApi.isReady) {
_devices.value = _devices.value.copy(
loading = false,
- error = "Serve la tua applicazione Spotify: configurala in Cerca.",
+ error = string(R.string.needs_your_app),
)
return
}
@@ -290,9 +391,9 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
playlists = (_state.value as? UiState.Ready)?.playlists.orEmpty(),
error = when {
trackUri?.startsWith("spotify:track:") != true ->
- "Questo brano non può essere aggiunto."
+ string(R.string.track_cannot_be_added)
!container.webApi.isReady ->
- "Collega la tua applicazione nelle impostazioni."
+ string(R.string.connect_app_in_settings)
else -> null
},
)
@@ -335,8 +436,7 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
// A playlist the account follows but does not own is the
// one failure worth naming: it looks identical to the
// user's own in every list the app draws.
- error = "Non è stato possibile aggiungere a ${playlist.name}. " +
- "Se la playlist non è tua, non puoi modificarla.",
+ error = string(R.string.add_failed, playlist.name),
)
}
}
@@ -382,7 +482,11 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
searchJob = viewModelScope.launch {
delay(SEARCH_DEBOUNCE_MS)
_search.value = _search.value.copy(loading = true, error = null)
- runCatching { container.api.search(query.trim()).toResults() }
+ runCatching { container.api.search(query.trim()).toResults(
+ artistLabel = string(R.string.artist),
+ albumLabel = string(R.string.album),
+ playlistLabel = string(R.string.playlist),
+ ) }
.onSuccess { results ->
_search.value = _search.value.copy(loading = false, results = results)
}
@@ -425,7 +529,7 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
fun connectWebApi() = viewModelScope.launch {
val clientId = _webApi.value.clientId.trim()
if (clientId.isEmpty()) {
- _webApi.value = _webApi.value.copy(error = "Inserisci il client id.")
+ _webApi.value = _webApi.value.copy(error = string(R.string.enter_client_id))
return@launch
}
@@ -555,7 +659,7 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
_state.value = UiState.Connecting
if (!awaitEngine()) {
_state.value = if (container.tokenStore.isLoggedIn) {
- UiState.Failed("Impossibile connettersi a Spotify.")
+ UiState.Failed(string(R.string.cannot_connect))
} else {
UiState.LoggedOut
}
@@ -596,7 +700,7 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
runCatching { Catalog.playlists() }
.onFailure { android.util.Log.w(TAG, "rootlist unavailable: ${describe(it)}") }
.recoverCatching {
- check(container.webApi.isReady) { it.message ?: "rootlist non disponibile" }
+ check(container.webApi.isReady) { it.message ?: string(R.string.rootlist_unavailable) }
container.api.playlists(limit = WEB_API_PAGE).items.map { dto ->
CatalogPlaylist(
uri = dto.uri,
@@ -912,7 +1016,7 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
*/
private suspend fun loadArtist(uri: String): Pair<List<CatalogTrack>, List<SearchItem>> {
if (!container.webApi.isReady) {
- error("Per aprire un artista serve la tua applicazione Spotify, configurala in Cerca.")
+ error(string(R.string.artist_needs_app))
}
val id = uri.substringAfterLast(':')
val tracks = container.api.artistTopTracks(id).tracks.map { it.toCatalogTrack() }
@@ -970,6 +1074,13 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
private companion object {
const val TAG = "SpotUi"
+
+ /** Artists asked for new records on the home page; one request each. */
+ const val FRESH_ARTISTS = 6
+
+ /** How long a home row gets before it stops being worth scrolling. */
+ const val FEED_ROW = 12
+
const val ENGINE_TIMEOUT_MS = 30_000L
const val POLL_INTERVAL_MS = 250L
diff --git a/app/src/main/java/dev/emanuele/spot/ui/SpotApp.kt b/app/src/main/java/dev/emanuele/spot/ui/SpotApp.kt
index 4973a1f..6768f33 100644
--- a/app/src/main/java/dev/emanuele/spot/ui/SpotApp.kt
+++ b/app/src/main/java/dev/emanuele/spot/ui/SpotApp.kt
@@ -1,8 +1,10 @@
package dev.emanuele.spot.ui
import androidx.compose.animation.core.Animatable
+import androidx.compose.animation.core.animateFloatAsState
import androidx.compose.animation.core.Spring
import androidx.compose.animation.core.spring
+import androidx.compose.animation.core.tween
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Box
@@ -38,6 +40,7 @@ import androidx.compose.runtime.rememberUpdatedState
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.layout.onSizeChanged
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.draw.clip
@@ -67,6 +70,7 @@ import dev.emanuele.spot.ui.components.BlurTransformation
import com.kyant.backdrop.Backdrop
import com.kyant.backdrop.backdrops.layerBackdrop
import com.kyant.backdrop.backdrops.rememberLayerBackdrop
+import dev.emanuele.spot.R
import dev.emanuele.spot.data.CanvasClip
import dev.emanuele.spot.data.Catalog
import dev.emanuele.spot.data.CatalogPlaylist
@@ -298,6 +302,11 @@ fun SpotApp(
lyricsLoading = false
}
+ // Read once, up here: these travel with a play as plain text, and the rows
+ // that start one are not composables of their own.
+ val playAgainLabel = stringResource(R.string.play_again)
+ val searchLabel = stringResource(R.string.search)
+
SpotTheme(seed = accent) {
// Material's default content colour is black, and it used to arrive from
// the Surface that wrapped this tree. That Surface is gone — it painted
@@ -313,6 +322,16 @@ fun SpotApp(
val statusBar = WindowInsets.statusBars.asPaddingValues().calculateTopPadding()
val navBar = WindowInsets.navigationBars.asPaddingValues().calculateBottomPadding()
+ // Settings is not a place you listen from: it is a full page of
+ // its own, and the tab bar and the now-playing bar step out of
+ // the way for it instead of floating over a form.
+ val chromeHidden = route == Routes.SETTINGS
+ val chrome by animateFloatAsState(
+ if (chromeHidden) 0f else 1f,
+ tween(220),
+ label = "chrome",
+ )
+
// Lists end above the bottom bar and the mini player rather than
// scrolling behind them.
val listPadding = PaddingValues(
@@ -320,6 +339,10 @@ fun SpotApp(
bottom = barHeight + if (playback.hasItem) MiniPlayerHeight else 0.dp,
)
+ // Nothing floats over settings, so nothing has to be left free
+ // beneath it either.
+ val settingsPadding = PaddingValues(top = statusBar, bottom = navBar + 24.dp)
+
// The screens are recorded into the backdrop layer along with
// the artwork behind them, and the bars that float over them are
// not.
@@ -393,7 +416,10 @@ fun SpotApp(
playlistOrder = playlistOrder,
recent = recent,
onPlayRecent = { tracks, index ->
- onPlay(tracks, index, null, false, "Riascolta")
+ onPlay(tracks, index, null, false, playAgainLabel)
+ },
+ onPlayFeed = { tracks, index, label ->
+ onPlay(tracks, index, null, false, label)
},
feed = feed,
onOpenItem = { item ->
@@ -415,7 +441,7 @@ fun SpotApp(
onClientIdChange = viewModel::onWebApiClientIdChange,
onConnectWebApi = { viewModel.connectWebApi() },
onPlayTrack = { tracks, index ->
- onPlay(tracks, index, null, false, "Ricerca")
+ onPlay(tracks, index, null, false, searchLabel)
},
onEnqueue = onEnqueue,
onOpenContext = { item ->
@@ -443,7 +469,7 @@ fun SpotApp(
SettingsScreen(
state = state,
webApi = webApi,
- contentPadding = listPadding,
+ contentPadding = settingsPadding,
backdrop = artBackdrop,
deviceName = android.os.Build.MODEL ?: "Android",
onClientIdChange = viewModel::onWebApiClientIdChange,
@@ -462,6 +488,9 @@ fun SpotApp(
// wrong here: an album page tinted by an unrelated
// track reads as belonging to something else.
val detailAccent by rememberArtworkColor(playlist.artworkUrl)
+ // Resolved here rather than inside the play
+ // callbacks: those are not composables.
+ val source = playlist.sourceLabel()
SpotTheme(seed = detailAccent) {
PlaylistScreen(
state = playlist,
@@ -474,7 +503,7 @@ fun SpotApp(
index,
playlist.uri,
asContext,
- playlist.sourceLabel(),
+ source,
)
},
onEnqueue = onEnqueue,
@@ -491,7 +520,7 @@ fun SpotApp(
0,
playlist.uri,
false,
- playlist.sourceLabel(),
+ source,
)
},
onAddToPlaylist = { track ->
@@ -526,7 +555,9 @@ fun SpotApp(
// stylistic: these refract `pageBackdrop`, and a pane drawn
// inside the layer it samples recurses on the render thread
// until the process dies.
- Box(
+ // Faded out *and* taken out: a transparent bar still swallows
+ // the taps meant for the page underneath it.
+ if (chrome > 0.01f) Box(
Modifier
.align(Alignment.BottomCenter)
.fillMaxWidth()
@@ -534,7 +565,9 @@ fun SpotApp(
// before it covers it: a tab bar under a full-screen
// player still swallows the taps meant for the
// transport.
- .graphicsLayer { alpha = (1f - expand.value * 3f).coerceIn(0f, 1f) }
+ .graphicsLayer {
+ alpha = (1f - expand.value * 3f).coerceIn(0f, 1f) * chrome
+ }
.onSizeChanged { barHeight = with(density) { it.height.toDp() } },
) {
BottomBar(
@@ -545,7 +578,8 @@ fun SpotApp(
)
}
- if (playback.hasItem) {
+ if (playback.hasItem && chrome > 0.01f) {
+ Box(Modifier.fillMaxSize().graphicsLayer { alpha = chrome }) {
NowPlayingSheet(
progress = expand,
// The measured bar already carries the navigation
@@ -628,6 +662,7 @@ fun SpotApp(
)
},
)
+ }
}
}
@@ -646,25 +681,25 @@ fun SpotApp(
onDismiss = { trackMenu = null },
) {
if (menu != null) {
- TrackSheetAction("Riproduci", PhosphorIcons.Fill.Play) {
+ TrackSheetAction(stringResource(R.string.play), PhosphorIcons.Fill.Play) {
trackMenu = null
onPlay(listOf(menu.track), 0, null, false, "")
}
- TrackSheetAction("Aggiungi alla coda", PhosphorIcons.Regular.Queue) {
+ TrackSheetAction(stringResource(R.string.add_to_queue), PhosphorIcons.Regular.Queue) {
trackMenu = null
onEnqueue(menu.track)
}
- TrackSheetAction("Aggiungi a una playlist", PhosphorIcons.Regular.Plus) {
+ TrackSheetAction(stringResource(R.string.add_to_playlist), PhosphorIcons.Regular.Plus) {
trackMenu = null
viewModel.openAddToPlaylist(menu.track.uri, menu.track.name)
}
- TrackSheetAction("Copia link", PhosphorIcons.Regular.LinkSimple) {
+ TrackSheetAction(stringResource(R.string.copy_link), PhosphorIcons.Regular.LinkSimple) {
trackMenu = null
clipboard.setText(AnnotatedString(menu.track.openLink()))
}
if (menu.removable) {
TrackSheetAction(
- "Rimuovi dalla playlist",
+ stringResource(R.string.remove_from_playlist),
PhosphorIcons.Regular.Trash,
destructive = true,
) {
@@ -811,11 +846,16 @@ private fun BottomBar(
accentColor = Ink,
containerColor = GlassFilm,
) {
- BottomItem("Home", PhosphorIcons.Fill.House, PhosphorIcons.Regular.House, selected == 0) {
+ BottomItem(
+ stringResource(R.string.home),
+ PhosphorIcons.Fill.House,
+ PhosphorIcons.Regular.House,
+ selected == 0,
+ ) {
onSelect(Routes.HOME)
}
BottomItem(
- "Libreria",
+ stringResource(R.string.library),
PhosphorIcons.Fill.MusicNotes,
PhosphorIcons.Regular.MusicNotes,
selected == 1,
@@ -840,7 +880,7 @@ private fun BottomBar(
) {
Icon(
imageVector = if (searching) PhosphorIcons.Fill.MagnifyingGlass else PhosphorIcons.Regular.MagnifyingGlass,
- contentDescription = "Cerca",
+ contentDescription = stringResource(R.string.search),
tint = Ink,
modifier = Modifier.size(24.dp),
)
@@ -908,8 +948,11 @@ private fun NavHostController.openPlaylist(viewModel: MainViewModel, playlist: C
* The kind first, because the name alone reads as a title and the two are worth
* telling apart at a glance while a cover is filling the screen.
*/
-private fun MainViewModel.PlaylistState.sourceLabel(): String =
- if (name.isBlank()) kind.label else "${kind.label} · $name"
+@Composable
+private fun MainViewModel.PlaylistState.sourceLabel(): String {
+ val kindName = stringResource(kind.label)
+ return if (name.isBlank()) kindName else "$kindName · $name"
+}
private fun NavHostController.switchTab(route: String) {
if (currentDestination?.route == route) return
diff --git a/app/src/main/java/dev/emanuele/spot/ui/components/SwipeToQueue.kt b/app/src/main/java/dev/emanuele/spot/ui/components/SwipeToQueue.kt
index 3d6bc7d..7c6b45c 100644
--- a/app/src/main/java/dev/emanuele/spot/ui/components/SwipeToQueue.kt
+++ b/app/src/main/java/dev/emanuele/spot/ui/components/SwipeToQueue.kt
@@ -1,5 +1,7 @@
package dev.emanuele.spot.ui.components
+import dev.emanuele.spot.R
+
import androidx.compose.animation.core.Animatable
import androidx.compose.animation.core.tween
import androidx.compose.foundation.background
@@ -19,6 +21,7 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
import androidx.compose.ui.graphics.graphicsLayer
import androidx.compose.ui.input.pointer.pointerInput
import androidx.compose.ui.platform.LocalDensity
@@ -80,7 +83,7 @@ fun SwipeToQueue(
modifier = Modifier.size(20.dp),
)
Text(
- "In coda",
+ stringResource(R.string.queued),
style = MaterialTheme.typography.labelLarge,
color = MaterialTheme.colorScheme.primary,
modifier = Modifier.padding(start = 8.dp),
diff --git a/app/src/main/java/dev/emanuele/spot/ui/home/HomeScreen.kt b/app/src/main/java/dev/emanuele/spot/ui/home/HomeScreen.kt
index ed710db..cfd843c 100644
--- a/app/src/main/java/dev/emanuele/spot/ui/home/HomeScreen.kt
+++ b/app/src/main/java/dev/emanuele/spot/ui/home/HomeScreen.kt
@@ -1,5 +1,6 @@
package dev.emanuele.spot.ui.home
+import androidx.annotation.StringRes
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
@@ -46,12 +47,14 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.CompositingStrategy
import androidx.compose.ui.graphics.TransformOrigin
import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.lerp
import com.kyant.backdrop.Backdrop
+import dev.emanuele.spot.R
import dev.emanuele.spot.data.CatalogPlaylist
import dev.emanuele.spot.data.CatalogTrack
import dev.emanuele.spot.data.SearchItem
@@ -78,11 +81,12 @@ import java.util.Calendar
* sections keep their order in every one of them, so switching never rearranges
* what stays on screen.
*/
-private enum class Feed(val label: String) {
- ALL("Tutto"),
- LIBRARY("Libreria"),
- RELEASES("Novità"),
- ARTISTS("Artisti"),
+private enum class Feed(@StringRes val label: Int) {
+ ALL(R.string.feed_all),
+ FOR_YOU(R.string.feed_for_you),
+ LIBRARY(R.string.library),
+ RELEASES(R.string.feed_releases),
+ ARTISTS(R.string.artists),
}
/**
@@ -107,6 +111,8 @@ fun HomeScreen(
playlistOrder: List<String>,
recent: List<CatalogTrack>,
onPlayRecent: (List<CatalogTrack>, Int) -> Unit,
+ /** Plays a row of the feed, told which row it was so the player can say so. */
+ onPlayFeed: (List<CatalogTrack>, Int, String) -> Unit,
feed: MainViewModel.FeedState,
onOpenItem: (SearchItem) -> Unit,
onOpenSettings: () -> Unit,
@@ -118,13 +124,13 @@ fun HomeScreen(
AppIcon(84.dp)
SquareWordmark(height = 28.dp)
Text(
- "Client non ufficiale per account Premium",
+ stringResource(R.string.unofficial_client),
style = MaterialTheme.typography.bodyMedium,
color = InkDim,
textAlign = TextAlign.Center,
modifier = Modifier.padding(horizontal = 40.dp),
)
- GlassAction("Accedi con Spotify", backdrop, onLogIn)
+ GlassAction(stringResource(R.string.log_in_with_spotify), backdrop, onLogIn)
}
MainViewModel.UiState.Connecting,
@@ -141,12 +147,17 @@ fun HomeScreen(
textAlign = TextAlign.Center,
modifier = Modifier.padding(horizontal = 40.dp),
)
- GlassAction("Riprova", backdrop, onRetry)
- GlassAction("Esci", backdrop, onLogOut)
+ GlassAction(stringResource(R.string.retry), backdrop, onRetry)
+ GlassAction(stringResource(R.string.log_out), backdrop, onLogOut)
}
is MainViewModel.UiState.Ready -> {
var filter by remember { mutableStateOf(Feed.ALL) }
+ // Read once here rather than inside the rows: the label travels
+ // with the play so the player can say where the song came from,
+ // and that is a plain string by the time it leaves this screen.
+ val onRepeatLabel = stringResource(R.string.on_repeat)
+ val classicsLabel = stringResource(R.string.all_time_favourites)
// Spotify's rootlist arrives in the order the account added them,
// which for an old account is close to arbitrary — the playlist
// opened every day can sit thirtieth.
@@ -206,6 +217,7 @@ fun HomeScreen(
val showReleases = current == Feed.ALL || current == Feed.RELEASES
val showArtists = current == Feed.ALL || current == Feed.ARTISTS
val showLibrary = current == Feed.ALL || current == Feed.LIBRARY
+ val showForYou = current == Feed.ALL || current == Feed.FOR_YOU
val filter = current
LazyColumn(
@@ -233,8 +245,29 @@ fun HomeScreen(
bottom = contentPadding.calculateBottomPadding(),
),
) {
+ // First on the page, and deliberately: what the account is
+ // playing this month is the one row that is different every
+ // time it is opened.
+ if (showForYou && feed.topTracks.isNotEmpty()) {
+ item(contentType = Feed.FOR_YOU.name) { Heading(stringResource(R.string.on_repeat)) }
+ item(contentType = Feed.FOR_YOU.name) {
+ TrackRow(feed.topTracks) { index ->
+ onPlayFeed(feed.topTracks, index, onRepeatLabel)
+ }
+ }
+ }
+
+ if (showForYou && feed.jumpBackIn.isNotEmpty()) {
+ item(contentType = Feed.FOR_YOU.name) { Heading(stringResource(R.string.jump_back_in)) }
+ item(contentType = Feed.FOR_YOU.name) {
+ Carousel(feed.jumpBackIn, key = { it.uri }) { item ->
+ FeedTile(item) { onOpenItem(item) }
+ }
+ }
+ }
+
if (showLibrary || filter == Feed.ALL) {
- item(contentType = Feed.LIBRARY.name) { Heading("Le tue playlist") }
+ item(contentType = Feed.LIBRARY.name) { Heading(stringResource(R.string.your_playlists)) }
item(contentType = Feed.LIBRARY.name) {
Carousel(
playlists.take(if (showLibrary) LIBRARY_SIZE else CAROUSEL_SIZE),
@@ -246,7 +279,7 @@ fun HomeScreen(
}
if (showReleases && feed.newReleases.isNotEmpty()) {
- item(contentType = Feed.RELEASES.name) { Heading("Novità") }
+ item(contentType = Feed.RELEASES.name) { Heading(stringResource(R.string.feed_releases)) }
// Cards rather than another row of thumbnails. A carousel
// says "here is a list, pick one"; this is meant to be
// looked at, so each release gets the width of the page and
@@ -260,8 +293,20 @@ fun HomeScreen(
}
}
+ // Novità, but only from artists the account listens to. Sits
+ // under the catalogue-wide releases on purpose: it is the
+ // narrower of the two and the one worth reaching first.
+ if ((showReleases || showForYou) && feed.fromYourArtists.isNotEmpty()) {
+ item(contentType = Feed.FOR_YOU.name) { Heading(stringResource(R.string.new_from_your_artists)) }
+ item(contentType = Feed.FOR_YOU.name) {
+ Carousel(feed.fromYourArtists, key = { it.uri }) { item ->
+ FeedTile(item) { onOpenItem(item) }
+ }
+ }
+ }
+
if (showArtists && feed.topArtists.isNotEmpty()) {
- item(contentType = Feed.ARTISTS.name) { Heading("Artisti che ascolti") }
+ item(contentType = Feed.ARTISTS.name) { Heading(stringResource(R.string.listening_artists)) }
item(contentType = Feed.ARTISTS.name) {
Carousel(feed.topArtists, key = { it.uri }) { artist ->
ArtistTile(artist) { onOpenItem(artist) }
@@ -270,7 +315,7 @@ fun HomeScreen(
}
if (recent.isNotEmpty() && filter != Feed.ARTISTS) {
- item(contentType = Feed.LIBRARY.name) { Heading("Riascolta") }
+ item(contentType = Feed.LIBRARY.name) { Heading(stringResource(R.string.play_again)) }
item(contentType = Feed.LIBRARY.name) {
LazyRow(
contentPadding = PaddingValues(horizontal = 20.dp),
@@ -284,6 +329,17 @@ fun HomeScreen(
}
}
+ // Last, because it is the least of a surprise: everything above
+ // changes month to month, this is the account's own constants.
+ if (showForYou && feed.allTimeTracks.isNotEmpty()) {
+ item(contentType = Feed.FOR_YOU.name) { Heading(stringResource(R.string.all_time_favourites)) }
+ item(contentType = Feed.FOR_YOU.name) {
+ TrackRow(feed.allTimeTracks) { index ->
+ onPlayFeed(feed.allTimeTracks, index, classicsLabel)
+ }
+ }
+ }
+
item(contentType = "tail") { Box(Modifier.height(24.dp)) }
}
}
@@ -442,7 +498,7 @@ private fun FilterRow(selected: Feed, backdrop: Backdrop, onSelect: (Feed) -> Un
surfaceColor = if (isSelected) SelectedFilm else GlassFilm,
) {
Text(
- entry.label,
+ stringResource(entry.label),
style = MaterialTheme.typography.bodyMedium,
color = if (isSelected) Ink else InkDim,
)
@@ -620,6 +676,54 @@ private fun TrackTile(track: CatalogTrack, onClick: () -> Unit) {
}
}
+/** A row of tracks that play where they are tapped. */
+@Composable
+private fun TrackRow(tracks: List<CatalogTrack>, onPlay: (Int) -> Unit) {
+ LazyRow(
+ contentPadding = PaddingValues(horizontal = 20.dp),
+ horizontalArrangement = Arrangement.spacedBy(12.dp),
+ modifier = Modifier.padding(top = 14.dp),
+ ) {
+ itemsIndexed(tracks, key = { _, track -> track.uri }) { index, track ->
+ TrackTile(track) { onPlay(index) }
+ }
+ }
+}
+
+/** An album or a playlist in a carousel: square art, name, who it is by. */
+@Composable
+private fun FeedTile(item: SearchItem, onClick: () -> Unit) {
+ Column(
+ Modifier
+ .width(152.dp)
+ .clickable(onClick = onClick),
+ ) {
+ Artwork(
+ url = item.artworkUrl,
+ title = item.title,
+ modifier = Modifier
+ .size(152.dp)
+ .softShadow(RoundedCornerShape(20.dp), elevation = 18.dp),
+ corner = 20.dp,
+ )
+ Text(
+ item.title,
+ style = MaterialTheme.typography.titleMedium,
+ maxLines = 1,
+ overflow = TextOverflow.Ellipsis,
+ modifier = Modifier.padding(top = 10.dp, start = 2.dp, end = 2.dp),
+ )
+ Text(
+ item.subtitle,
+ style = MaterialTheme.typography.bodySmall,
+ color = InkDim,
+ maxLines = 1,
+ overflow = TextOverflow.Ellipsis,
+ modifier = Modifier.padding(start = 2.dp, end = 2.dp),
+ )
+ }
+}
+
@Composable
private fun <T> Carousel(
items: List<T>,
@@ -669,10 +773,11 @@ private fun Centered(content: @Composable () -> Unit) {
}
}
-private fun greeting(): String = when (Calendar.getInstance().get(Calendar.HOUR_OF_DAY)) {
- in 5..12 -> "Buongiorno"
- in 13..17 -> "Buon pomeriggio"
- else -> "Buonasera"
+@StringRes
+private fun greeting(): Int = when (Calendar.getInstance().get(Calendar.HOUR_OF_DAY)) {
+ in 5..12 -> R.string.good_morning
+ in 13..17 -> R.string.good_afternoon
+ else -> R.string.good_evening
}
/** A harder film for the chip that is on; see the note at the call site. */
diff --git a/app/src/main/java/dev/emanuele/spot/ui/library/LibraryScreen.kt b/app/src/main/java/dev/emanuele/spot/ui/library/LibraryScreen.kt
index 9ed4088..b9f5f5f 100644
--- a/app/src/main/java/dev/emanuele/spot/ui/library/LibraryScreen.kt
+++ b/app/src/main/java/dev/emanuele/spot/ui/library/LibraryScreen.kt
@@ -1,5 +1,6 @@
package dev.emanuele.spot.ui.library
+import androidx.annotation.StringRes
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
@@ -28,6 +29,7 @@ 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.text.style.TextAlign
@@ -35,6 +37,7 @@ import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import com.kyant.backdrop.Backdrop
+import dev.emanuele.spot.R
import dev.emanuele.spot.data.CatalogPlaylist
import dev.emanuele.spot.data.sortedByRecentlyOpened
import dev.emanuele.spot.ui.MainViewModel
@@ -53,10 +56,10 @@ import com.adamglin.phosphoricons.regular.SquaresFour
private enum class Layout { GRID, LIST }
/** What the library is sorted by. */
-private enum class Order(val label: String) {
- RECENT("Aperte di recente"),
- NAME("Nome"),
- ADDED("Ordine di Spotify"),
+private enum class Order(@StringRes val label: Int) {
+ RECENT(R.string.recently_opened),
+ NAME(R.string.name),
+ ADDED(R.string.spotify_order),
}
/**
@@ -82,15 +85,15 @@ fun LibraryScreen(
) {
when (state) {
MainViewModel.UiState.LoggedOut -> Centered {
- Text("Spot", style = MaterialTheme.typography.displayLarge)
+ Text(stringResource(R.string.app_name), style = MaterialTheme.typography.displayLarge)
Text(
- "Client non ufficiale per account Premium",
+ stringResource(R.string.unofficial_client),
style = MaterialTheme.typography.bodyMedium,
color = InkDim,
textAlign = TextAlign.Center,
modifier = Modifier.padding(horizontal = 40.dp),
)
- GlassAction("Accedi con Spotify", backdrop, onLogIn)
+ GlassAction(stringResource(R.string.log_in_with_spotify), backdrop, onLogIn)
}
MainViewModel.UiState.Connecting,
@@ -107,8 +110,8 @@ fun LibraryScreen(
textAlign = TextAlign.Center,
modifier = Modifier.padding(horizontal = 40.dp),
)
- GlassAction("Riprova", backdrop, onRetry)
- GlassAction("Esci", backdrop, onLogOut)
+ GlassAction(stringResource(R.string.retry), backdrop, onRetry)
+ GlassAction(stringResource(R.string.log_out), backdrop, onLogOut)
}
is MainViewModel.UiState.Ready -> {
@@ -195,9 +198,9 @@ private fun Header(
verticalAlignment = Alignment.CenterVertically,
) {
Column(Modifier.weight(1f)) {
- Text("Libreria", style = MaterialTheme.typography.displayLarge)
+ Text(stringResource(R.string.library), style = MaterialTheme.typography.displayLarge)
Text(
- "$count playlist",
+ stringResource(R.string.playlist_count, count),
style = MaterialTheme.typography.bodySmall,
color = InkDim,
)
@@ -218,7 +221,7 @@ private fun Header(
Icon(
if (layout == Layout.GRID) PhosphorIcons.Regular.ListBullets
else PhosphorIcons.Regular.SquaresFour,
- contentDescription = "Cambia disposizione",
+ contentDescription = stringResource(R.string.change_layout),
tint = Ink,
modifier = Modifier.size(20.dp),
)
@@ -244,7 +247,7 @@ private fun Header(
surfaceColor = if (selected) SelectedFilm else GlassFilm,
) {
Text(
- entry.label,
+ stringResource(entry.label),
style = MaterialTheme.typography.bodySmall,
color = if (selected) Ink else InkDim,
maxLines = 1,
diff --git a/app/src/main/java/dev/emanuele/spot/ui/library/PlaylistScreen.kt b/app/src/main/java/dev/emanuele/spot/ui/library/PlaylistScreen.kt
index dd015f9..733b93a 100644
--- a/app/src/main/java/dev/emanuele/spot/ui/library/PlaylistScreen.kt
+++ b/app/src/main/java/dev/emanuele/spot/ui/library/PlaylistScreen.kt
@@ -1,5 +1,6 @@
package dev.emanuele.spot.ui.library
+import androidx.annotation.StringRes
import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.core.animateFloatAsState
import androidx.compose.animation.core.tween
@@ -36,6 +37,7 @@ 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.Brush
import androidx.compose.ui.graphics.Color
@@ -63,6 +65,7 @@ import androidx.compose.ui.layout.onGloballyPositioned
import androidx.compose.ui.graphics.graphicsLayer
import androidx.compose.runtime.derivedStateOf
import androidx.compose.foundation.layout.BoxScope
+import dev.emanuele.spot.R
import dev.emanuele.spot.data.CatalogTrack
import dev.emanuele.spot.ui.MainViewModel
import com.kyant.backdrop.Backdrop
@@ -98,12 +101,12 @@ import com.adamglin.phosphoricons.regular.Trash
import com.adamglin.phosphoricons.regular.X
/** How the track list is ordered. */
-enum class TrackSort(val label: String) {
- ORIGINAL("Ordine della playlist"),
- TITLE("Titolo"),
- ARTIST("Artista"),
- ADDED("Aggiunti di recente"),
- DURATION("Durata"),
+enum class TrackSort(@StringRes val label: Int) {
+ ORIGINAL(R.string.playlist_order),
+ TITLE(R.string.title),
+ ARTIST(R.string.artist),
+ ADDED(R.string.recently_added),
+ DURATION(R.string.duration),
}
@Composable
@@ -308,11 +311,10 @@ fun PlaylistScreen(
if (state.tracks.isNotEmpty()) {
item(contentType = "sectionTitle") {
SectionHeader(
- title = if (state.kind == MainViewModel.DetailKind.ARTIST) {
- "Brani principali"
- } else {
- "Brani"
- },
+ title = stringResource(
+ if (state.kind == MainViewModel.DetailKind.ARTIST) R.string.top_tracks
+ else R.string.tracks,
+ ),
sort = sort,
onSortOpen = { sortOpen = it },
onAnchor = { sortAnchor = it },
@@ -324,13 +326,13 @@ fun PlaylistScreen(
OutlinedTextField(
value = query,
onValueChange = { query = it },
- placeholder = { Text("Cerca fra i brani") },
+ placeholder = { Text(stringResource(R.string.search_in_tracks)) },
singleLine = true,
leadingIcon = { Icon(PhosphorIcons.Fill.MagnifyingGlass, contentDescription = null) },
trailingIcon = {
if (query.isNotEmpty()) {
IconButton(onClick = { query = "" }) {
- Icon(PhosphorIcons.Regular.X, contentDescription = "Cancella")
+ Icon(PhosphorIcons.Regular.X, contentDescription = stringResource(R.string.clear))
}
}
},
@@ -362,7 +364,8 @@ fun PlaylistScreen(
visible.isEmpty() -> item(contentType = "status") {
StatusBox {
Text(
- if (query.isBlank()) "Nessun brano" else "Nessun risultato per “$query”",
+ if (query.isBlank()) stringResource(R.string.no_tracks)
+ else stringResource(R.string.no_results_for, query),
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant,
)
@@ -407,7 +410,7 @@ fun PlaylistScreen(
color = MaterialTheme.colorScheme.onSurfaceVariant,
)
Text(
- "Altri brani in arrivo",
+ stringResource(R.string.more_tracks_coming),
style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onSurfaceVariant,
modifier = Modifier.padding(start = 10.dp),
@@ -446,7 +449,7 @@ fun PlaylistScreen(
) {
Icon(
PhosphorIcons.Regular.ArrowLeft,
- contentDescription = "Indietro",
+ contentDescription = stringResource(R.string.back),
tint = Color.White,
modifier = Modifier.size(20.dp),
)
@@ -462,7 +465,7 @@ fun PlaylistScreen(
onDismiss = { sortOpen = false },
) {
TrackSort.entries.forEach { option ->
- GlassChoiceItem(option.label, selected = option == sort) {
+ GlassChoiceItem(stringResource(option.label), selected = option == sort) {
sort = option
onSortChange(option.name)
sortOpen = false
@@ -536,9 +539,10 @@ private fun DetailHeader(
horizontalAlignment = Alignment.CenterHorizontally,
) {
Text(
- text = buildString {
- append(kind.label)
- if (trackCount > 0) append(" · $trackCount brani · ${formatTotal(totalMs)}")
+ text = stringResource(kind.label) + if (trackCount > 0) {
+ stringResource(R.string.track_count_and_length, trackCount, formatTotal(totalMs))
+ } else {
+ ""
},
style = MaterialTheme.typography.labelMedium,
color = Color.White.copy(alpha = 0.72f),
@@ -561,7 +565,7 @@ private fun DetailHeader(
) {
CircleAction(
icon = PhosphorIcons.Regular.Shuffle,
- description = "Casuale",
+ description = stringResource(R.string.shuffle),
size = 46.dp,
backdrop = backdrop,
onClick = onShuffle,
@@ -580,14 +584,14 @@ private fun DetailHeader(
) {
Icon(
PhosphorIcons.Fill.Play,
- contentDescription = "Riproduci",
+ contentDescription = stringResource(R.string.play),
tint = Color.Black,
modifier = Modifier.size(34.dp),
)
}
CircleAction(
icon = if (searching) PhosphorIcons.Regular.X else PhosphorIcons.Fill.MagnifyingGlass,
- description = "Cerca fra i brani",
+ description = stringResource(R.string.search_in_tracks),
size = 46.dp,
backdrop = backdrop,
onClick = onToggleSearch,
@@ -611,7 +615,7 @@ private fun DetailHeader(
IconButton(onClick = onBack) {
Icon(
PhosphorIcons.Regular.ArrowLeft,
- contentDescription = "Indietro",
+ contentDescription = stringResource(R.string.back),
tint = Color.White,
modifier = Modifier.size(20.dp),
)
@@ -629,7 +633,7 @@ private fun DetailHeader(
IconButton(onClick = onToggleSearch) {
Icon(
if (searching) PhosphorIcons.Regular.X else PhosphorIcons.Fill.MagnifyingGlass,
- contentDescription = "Cerca fra i brani",
+ contentDescription = stringResource(R.string.search_in_tracks),
tint = Color.White,
modifier = Modifier.size(18.dp),
)
@@ -637,7 +641,7 @@ private fun DetailHeader(
IconButton(onClick = onShuffle) {
Icon(
PhosphorIcons.Regular.Shuffle,
- contentDescription = "Casuale",
+ contentDescription = stringResource(R.string.shuffle),
tint = Color.White,
modifier = Modifier.size(18.dp),
)
@@ -645,7 +649,7 @@ private fun DetailHeader(
IconButton(onClick = onPlay) {
Icon(
PhosphorIcons.Fill.Play,
- contentDescription = "Riproduci",
+ contentDescription = stringResource(R.string.play),
tint = Color.White,
modifier = Modifier.size(22.dp),
)
@@ -756,7 +760,7 @@ private fun AlbumStrip(
) {
Column(Modifier.padding(top = 18.dp)) {
Text(
- "Album",
+ stringResource(R.string.albums),
style = MaterialTheme.typography.titleMedium,
modifier = Modifier.padding(start = 24.dp, bottom = 10.dp),
)
@@ -825,7 +829,7 @@ private fun SectionHeader(
run {
Icon(
PhosphorIcons.Regular.ArrowsDownUp,
- contentDescription = "Ordina",
+ contentDescription = stringResource(R.string.sort),
tint = if (sort == TrackSort.ORIGINAL) {
MaterialTheme.colorScheme.onSurfaceVariant
} else {
@@ -901,7 +905,7 @@ private fun TrackRow(
if (isCurrent) {
Icon(
PhosphorIcons.Fill.Waveform,
- contentDescription = "In riproduzione",
+ contentDescription = stringResource(R.string.now_playing),
tint = MaterialTheme.colorScheme.primary,
modifier = Modifier.size(18.dp),
)
@@ -943,7 +947,7 @@ private fun TrackRow(
IconButton(onClick = onMenu, modifier = Modifier.size(32.dp)) {
Icon(
PhosphorIcons.Regular.DotsThree,
- contentDescription = "Altro",
+ contentDescription = stringResource(R.string.more),
tint = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.6f),
modifier = Modifier.size(18.dp),
)
@@ -1003,8 +1007,10 @@ fun formatDuration(ms: Long): String {
}
/** Total playlist length, in hours and minutes rather than a running clock. */
+@Composable
private fun formatTotal(ms: Long): String {
val hours = TimeUnit.MILLISECONDS.toHours(ms)
val minutes = TimeUnit.MILLISECONDS.toMinutes(ms) % 60
- return if (hours > 0) "${hours}h ${minutes}min" else "${minutes}min"
+ return if (hours > 0) stringResource(R.string.hours_minutes, hours, minutes)
+ else stringResource(R.string.minutes_only, minutes)
}
diff --git a/app/src/main/java/dev/emanuele/spot/ui/onboarding/OnboardingScreen.kt b/app/src/main/java/dev/emanuele/spot/ui/onboarding/OnboardingScreen.kt
index 43e6805..ec9213b 100644
--- a/app/src/main/java/dev/emanuele/spot/ui/onboarding/OnboardingScreen.kt
+++ b/app/src/main/java/dev/emanuele/spot/ui/onboarding/OnboardingScreen.kt
@@ -39,6 +39,7 @@ 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
@@ -52,6 +53,7 @@ import com.adamglin.phosphoricons.regular.ArrowLeft
import com.adamglin.phosphoricons.regular.ArrowUpRight
import com.adamglin.phosphoricons.regular.Check
import com.kyant.backdrop.Backdrop
+import dev.emanuele.spot.R
import dev.emanuele.spot.ui.MainViewModel
import dev.emanuele.spot.ui.components.AppIcon
import dev.emanuele.spot.ui.components.SquareWordmark
@@ -121,12 +123,12 @@ fun OnboardingScreen(
) {
if (step > 0) {
LiquidButton(onClick = { step-- }, backdrop = backdrop) {
- Icon(PhosphorIcons.Regular.ArrowLeft, contentDescription = "Indietro")
+ Icon(PhosphorIcons.Regular.ArrowLeft, contentDescription = stringResource(R.string.back))
}
}
Spacer(Modifier.weight(1f))
TextButton(onClick = onFinish) {
- Text(if (step == last) "Chiudi" else "Salta", color = InkDim)
+ Text(stringResource(if (step == last) R.string.close else R.string.skip), color = InkDim)
}
}
@@ -195,7 +197,7 @@ fun OnboardingScreen(
contentPadding = 26.dp,
) {
Text(
- if (step == last) "Inizia ad ascoltare" else "Avanti",
+ stringResource(if (step == last) R.string.onboarding_start else R.string.next_step),
style = MaterialTheme.typography.titleMedium,
)
}
@@ -212,9 +214,9 @@ private fun Welcome() {
AppIcon(104.dp)
Spacer(Modifier.height(22.dp))
SquareWordmark(height = 34.dp)
- Body("La tua musica Spotify, con testi, canvas ed effetti audio.")
- Note("Serve un account Spotify Premium.")
- Body("Due passaggi e sei pronto. Ci vogliono cinque minuti, una volta sola.")
+ Body(stringResource(R.string.onboarding_welcome_1))
+ Note(stringResource(R.string.onboarding_welcome_2))
+ Body(stringResource(R.string.onboarding_welcome_3))
}
@Composable
@@ -224,13 +226,13 @@ private fun LogIn(
backdrop: Backdrop,
onLogIn: () -> Unit,
) {
- StepTitle("1. Accedi a Spotify")
- Body("Si apre il browser sulla pagina di Spotify. Autorizzi e torni qui da solo.")
- Note("La password la scrivi solo nella pagina di Spotify: Square non la vede.")
+ StepTitle(stringResource(R.string.onboarding_login_title))
+ Body(stringResource(R.string.onboarding_login_1))
+ Note(stringResource(R.string.onboarding_login_2))
Spacer(Modifier.height(20.dp))
if (loggedIn) {
- DoneRow("Accesso completato")
+ DoneRow(stringResource(R.string.onboarding_login_done))
} else {
LiquidButton(
onClick = { if (!connecting) onLogIn() },
@@ -245,7 +247,7 @@ private fun LogIn(
color = MaterialTheme.colorScheme.onPrimary,
)
} else {
- Text("Accedi con Spotify", style = MaterialTheme.typography.titleMedium)
+ Text(stringResource(R.string.log_in_with_spotify), style = MaterialTheme.typography.titleMedium)
}
}
}
@@ -256,12 +258,8 @@ private fun Dashboard(redirectUri: String) {
val uriHandler = LocalUriHandler.current
val clipboard = LocalClipboardManager.current
- StepTitle("2. Crea la tua chiave")
- Body(
- "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.",
- )
+ StepTitle(stringResource(R.string.onboarding_key_title))
+ Body(stringResource(R.string.onboarding_key_intro))
Row(
Modifier
@@ -274,7 +272,7 @@ private fun Dashboard(redirectUri: String) {
verticalAlignment = Alignment.CenterVertically,
) {
Column(Modifier.weight(1f)) {
- Text("Apri il dashboard", style = MaterialTheme.typography.titleMedium)
+ Text(stringResource(R.string.onboarding_open_dashboard), style = MaterialTheme.typography.titleMedium)
Text(
DASHBOARD_URL.removePrefix("https://"),
style = MaterialTheme.typography.bodySmall,
@@ -289,18 +287,10 @@ private fun Dashboard(redirectUri: String) {
)
}
- Numbered(1, "Accedi con lo stesso account Spotify.")
- Numbered(2, "In alto a destra premi «Create app».")
- Numbered(
- 3,
- "App name e App description: scrivi quello che vuoi, per esempio Square. " +
- "Website: lascia vuoto.",
- )
- Numbered(
- 4,
- "Redirect URI: incolla la riga qui sotto e premi «Add». Controlla che " +
- "compaia nell'elenco sotto al campo, altrimenti non viene salvata.",
- )
+ 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))
Row(
Modifier
@@ -317,21 +307,14 @@ private fun Dashboard(redirectUri: String) {
modifier = Modifier.weight(1f),
)
TextButton(onClick = { clipboard.setText(AnnotatedString(redirectUri)) }) {
- Text("Copia")
+ Text(stringResource(R.string.copy))
}
}
- Numbered(
- 5,
- "Alla voce «Which API/SDKs are you planning to use?» spunta Web API.",
- )
- Numbered(6, "Accetta i termini e premi «Save».")
- Numbered(
- 7,
- "Nella pagina dell'app premi «Settings»: sotto «Basic Information» trovi " +
- "il Client ID. Copialo.",
- )
- Note("Il Client secret non serve: non copiarlo e non inserirlo da nessuna parte.")
+ 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
@@ -341,25 +324,19 @@ private fun ClientId(
onClientIdChange: (String) -> Unit,
onConnectWebApi: () -> Unit,
) {
- StepTitle("3. Incolla il Client ID")
+ StepTitle(stringResource(R.string.onboarding_paste_title))
if (webApi.connected) {
- Body("Fatto: ricerca e consigli sono attivi.")
+ Body(stringResource(R.string.onboarding_paste_done))
Spacer(Modifier.height(16.dp))
- DoneRow("Chiave collegata")
+ DoneRow(stringResource(R.string.onboarding_key_linked))
} else {
- Body(
- "Incolla qui il Client ID e premi Collega. Il browser si apre un'ultima " +
- "volta per confermare.",
- )
+ 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)
}
- Note(
- "Se il browser dà errore, torna al passo prima: quasi sempre il " +
- "Redirect URI non è stato aggiunto all'elenco.",
- )
+ Note(stringResource(R.string.onboarding_paste_error))
}
}
@@ -367,13 +344,10 @@ private fun ClientId(
private fun Done() {
Spacer(Modifier.height(16.dp))
AppIcon(72.dp)
- StepTitle("Tutto pronto")
- Body("In home ci sono le tue playlist, con la lente cerchi in tutto il catalogo.")
- Body(
- "Nel player scorri per cambiare brano e apri testi, coda ed effetti dalla " +
- "barra sotto la copertina.",
- )
- Note("Puoi rivedere questa guida da Impostazioni, toccando la tua foto in home.")
+ StepTitle(stringResource(R.string.onboarding_done_title))
+ Body(stringResource(R.string.onboarding_done_1))
+ Body(stringResource(R.string.onboarding_done_2))
+ Note(stringResource(R.string.onboarding_done_3))
}
/* ---- pieces ---- */
diff --git a/app/src/main/java/dev/emanuele/spot/ui/player/AddToPlaylistSheet.kt b/app/src/main/java/dev/emanuele/spot/ui/player/AddToPlaylistSheet.kt
index ff736b6..4d39c12 100644
--- a/app/src/main/java/dev/emanuele/spot/ui/player/AddToPlaylistSheet.kt
+++ b/app/src/main/java/dev/emanuele/spot/ui/player/AddToPlaylistSheet.kt
@@ -30,6 +30,7 @@ import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
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.text.style.TextOverflow
@@ -38,6 +39,7 @@ import com.adamglin.PhosphorIcons
import com.adamglin.phosphoricons.Regular
import com.adamglin.phosphoricons.regular.Check
import com.kyant.backdrop.Backdrop
+import dev.emanuele.spot.R
import dev.emanuele.spot.data.CatalogPlaylist
import dev.emanuele.spot.ui.MainViewModel
import dev.emanuele.spot.ui.components.Artwork
@@ -108,7 +110,7 @@ fun AddToPlaylistSheet(
) {
Column(Modifier.padding(vertical = 18.dp)) {
Text(
- "Aggiungi a una playlist",
+ stringResource(R.string.add_to_playlist),
style = MaterialTheme.typography.titleLarge,
color = GlassInk,
modifier = Modifier.padding(start = 22.dp, end = 22.dp),
@@ -135,7 +137,7 @@ fun AddToPlaylistSheet(
if (state.done != null) {
Text(
- "Aggiunto a ${state.done}",
+ stringResource(R.string.added_to, state.done.orEmpty()),
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.primary,
modifier = Modifier.padding(horizontal = 22.dp, vertical = 8.dp),
@@ -144,7 +146,7 @@ fun AddToPlaylistSheet(
if (state.playlists.isEmpty()) {
Text(
- "Nessuna playlist nel tuo account",
+ stringResource(R.string.no_playlists_in_account),
style = MaterialTheme.typography.bodyMedium,
color = GlassInkDim,
modifier = Modifier.padding(horizontal = 22.dp, vertical = 12.dp),
@@ -186,7 +188,7 @@ fun PlaylistPicker(
) {
Column(Modifier.padding(vertical = 18.dp)) {
Text(
- "Aggiungi a una playlist",
+ stringResource(R.string.add_to_playlist),
style = MaterialTheme.typography.titleLarge,
color = GlassInk,
modifier = Modifier.padding(start = 22.dp, end = 22.dp),
@@ -213,7 +215,7 @@ fun PlaylistPicker(
if (state.done != null) {
Text(
- "Aggiunto a ${state.done}",
+ stringResource(R.string.added_to, state.done.orEmpty()),
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.primary,
modifier = Modifier.padding(horizontal = 22.dp, vertical = 8.dp),
@@ -222,7 +224,7 @@ fun PlaylistPicker(
if (state.playlists.isEmpty()) {
Text(
- "Nessuna playlist nel tuo account",
+ stringResource(R.string.no_playlists_in_account),
style = MaterialTheme.typography.bodyMedium,
color = GlassInkDim,
modifier = Modifier.padding(horizontal = 22.dp, vertical = 12.dp),
diff --git a/app/src/main/java/dev/emanuele/spot/ui/player/DevicePicker.kt b/app/src/main/java/dev/emanuele/spot/ui/player/DevicePicker.kt
index e468b16..2d0aaeb 100644
--- a/app/src/main/java/dev/emanuele/spot/ui/player/DevicePicker.kt
+++ b/app/src/main/java/dev/emanuele/spot/ui/player/DevicePicker.kt
@@ -21,12 +21,14 @@ import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
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.graphics.vector.ImageVector
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import com.kyant.backdrop.Backdrop
+import dev.emanuele.spot.R
import dev.emanuele.spot.ui.MainViewModel
import com.adamglin.PhosphorIcons
import com.adamglin.phosphoricons.Regular
@@ -84,7 +86,7 @@ fun DevicePicker(
verticalAlignment = Alignment.CenterVertically,
) {
Text(
- "Riproduci su",
+ stringResource(R.string.play_on),
style = MaterialTheme.typography.titleLarge,
color = GlassInk,
modifier = Modifier.weight(1f),
@@ -98,7 +100,7 @@ fun DevicePicker(
) {
Icon(
PhosphorIcons.Regular.ArrowClockwise,
- contentDescription = "Aggiorna",
+ contentDescription = stringResource(R.string.refresh),
tint = GlassInkDim,
modifier = Modifier.size(20.dp),
)
@@ -123,7 +125,7 @@ fun DevicePicker(
)
state.devices.isEmpty() -> Text(
- "Nessun dispositivo disponibile",
+ stringResource(R.string.no_devices),
style = MaterialTheme.typography.bodyMedium,
color = GlassInkDim,
modifier = Modifier.padding(horizontal = 22.dp, vertical = 12.dp),
@@ -166,7 +168,7 @@ fun DeviceList(
verticalAlignment = Alignment.CenterVertically,
) {
Text(
- "Riproduci su",
+ stringResource(R.string.play_on),
style = MaterialTheme.typography.titleLarge,
color = GlassInk,
modifier = Modifier.weight(1f),
@@ -180,7 +182,7 @@ fun DeviceList(
) {
Icon(
PhosphorIcons.Regular.ArrowClockwise,
- contentDescription = "Aggiorna",
+ contentDescription = stringResource(R.string.refresh),
tint = GlassInkDim,
modifier = Modifier.size(20.dp),
)
@@ -205,7 +207,7 @@ fun DeviceList(
)
state.devices.isEmpty() -> Text(
- "Nessun dispositivo disponibile",
+ stringResource(R.string.no_devices),
style = MaterialTheme.typography.bodyMedium,
color = GlassInkDim,
modifier = Modifier.padding(horizontal = 22.dp, vertical = 12.dp),
@@ -255,7 +257,7 @@ private fun DeviceRow(device: MainViewModel.SpotifyDevice, onClick: () -> Unit)
overflow = TextOverflow.Ellipsis,
)
Text(
- if (device.isActive) "In riproduzione" else device.type,
+ if (device.isActive) stringResource(R.string.now_playing) else device.type,
style = MaterialTheme.typography.bodySmall,
color = GlassInkDim,
maxLines = 1,
diff --git a/app/src/main/java/dev/emanuele/spot/ui/player/MiniPlayer.kt b/app/src/main/java/dev/emanuele/spot/ui/player/MiniPlayer.kt
index cda3b65..45730e0 100644
--- a/app/src/main/java/dev/emanuele/spot/ui/player/MiniPlayer.kt
+++ b/app/src/main/java/dev/emanuele/spot/ui/player/MiniPlayer.kt
@@ -29,11 +29,13 @@ import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
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.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import com.kyant.backdrop.Backdrop
+import dev.emanuele.spot.R
import dev.emanuele.spot.ui.components.Artwork
import dev.emanuele.spot.ui.glass.LiquidButton
import dev.emanuele.spot.ui.theme.softShadow
@@ -197,7 +199,7 @@ fun MiniPlayer(
IconButton(onClick = onNext, enabled = state.hasNext) {
Icon(
PhosphorIcons.Fill.SkipForward,
- contentDescription = "Successivo",
+ contentDescription = stringResource(R.string.next),
tint = MiniPlayerInkDim,
)
}
@@ -220,7 +222,7 @@ fun MiniPlayer(
) { playing ->
Icon(
imageVector = if (playing) PhosphorIcons.Fill.Pause else PhosphorIcons.Fill.Play,
- contentDescription = if (playing) "Pausa" else "Riproduci",
+ contentDescription = if (playing) stringResource(R.string.pause) else stringResource(R.string.play),
tint = MiniPlayerInk,
modifier = Modifier.size(20.dp),
)
diff --git a/app/src/main/java/dev/emanuele/spot/ui/player/PlayerPanel.kt b/app/src/main/java/dev/emanuele/spot/ui/player/PlayerPanel.kt
index 8550136..371d87f 100644
--- a/app/src/main/java/dev/emanuele/spot/ui/player/PlayerPanel.kt
+++ b/app/src/main/java/dev/emanuele/spot/ui/player/PlayerPanel.kt
@@ -33,10 +33,12 @@ import androidx.compose.runtime.rememberUpdatedState
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.text.font.FontWeight
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
+import dev.emanuele.spot.R
import dev.emanuele.spot.data.Lyrics
import dev.emanuele.spot.playback.EffectPreset
import androidx.compose.foundation.layout.RowScope
@@ -139,19 +141,19 @@ fun PlayerPanelSection(
PanelTab(
icon = PhosphorIcons.Regular.VinylRecord,
activeIcon = PhosphorIcons.Fill.VinylRecord,
- label = "Copertina",
+ label = stringResource(R.string.cover),
selected = selected == 0,
) { onSelect(PlayerPanel.NONE) }
PanelTab(
icon = PhosphorIcons.Regular.TextAlignLeft,
activeIcon = PhosphorIcons.Fill.TextAlignLeft,
- label = "Testo",
+ label = stringResource(R.string.lyrics),
selected = selected == 1,
) { onSelect(PlayerPanel.LYRICS) }
PanelTab(
icon = PhosphorIcons.Regular.SlidersHorizontal,
activeIcon = PhosphorIcons.Fill.SlidersHorizontal,
- label = "Effetti",
+ label = stringResource(R.string.effects),
selected = selected == 2,
) { onSelect(PlayerPanel.EFFECTS) }
}
@@ -188,7 +190,7 @@ data class QueueEntry(val index: Int, val title: String, val artist: String, val
@Composable
internal fun QueueList(queue: List<QueueEntry>, onPlay: (Int) -> Unit) {
if (queue.isEmpty()) {
- EmptyPanel("La coda è vuota")
+ EmptyPanel(stringResource(R.string.queue_empty))
return
}
@@ -273,7 +275,7 @@ internal fun EffectsPanel(
}
EffectSlider(
- label = "Velocità",
+ label = stringResource(R.string.speed),
value = speed,
// Below half speed the stretcher smears badly and above double the
// track stops being recognisable; both ends are past the useful part.
@@ -285,7 +287,7 @@ internal fun EffectsPanel(
)
EffectSlider(
- label = "Tonalità",
+ label = stringResource(R.string.pitch),
value = pitch,
range = 0.5f..2f,
// Semitones read better than a ratio for pitch: "+3" is a musical
@@ -297,10 +299,10 @@ internal fun EffectsPanel(
)
EffectSlider(
- label = "Riverbero",
+ label = stringResource(R.string.reverb),
value = reverb,
range = 0f..1f,
- reading = if (reverb <= 0f) "Off" else "${(reverb * 100).roundToInt()}%",
+ reading = if (reverb <= 0f) stringResource(R.string.off) else "${(reverb * 100).roundToInt()}%",
backdrop = backdrop,
onChange = onReverb,
onReset = { onReverb(0f) },
@@ -357,7 +359,11 @@ private fun PresetRow(
verticalAlignment = Alignment.CenterVertically,
) {
Text(
- preset.name,
+ // "Slowed + Reverb" and "Sped Up" are the names these edits
+ // go by everywhere and are left alone; "Original" is a plain
+ // word and is read from resources.
+ if (preset.id == "original") stringResource(R.string.preset_original)
+ else preset.name,
style = MaterialTheme.typography.bodySmall,
maxLines = 1,
color = if (selected) GlassInk else GlassInkDim,
@@ -365,7 +371,7 @@ private fun PresetRow(
if (selected && !preset.builtIn) {
Icon(
PhosphorIcons.Regular.X,
- contentDescription = "Elimina ${preset.name}",
+ contentDescription = stringResource(R.string.delete_preset, preset.name),
tint = MaterialTheme.colorScheme.onPrimary,
modifier = Modifier
.padding(start = 4.dp)
@@ -391,7 +397,7 @@ private fun PresetRow(
modifier = Modifier.size(16.dp),
)
Text(
- "Salva",
+ stringResource(R.string.save),
style = MaterialTheme.typography.bodySmall,
color = GlassInk,
modifier = Modifier.padding(start = 4.dp),
@@ -405,20 +411,20 @@ private fun SavePresetDialog(onDismiss: () -> Unit, onConfirm: (String) -> Unit)
var name by remember { mutableStateOf("") }
AlertDialog(
onDismissRequest = onDismiss,
- title = { Text("Salva preimpostazione") },
+ title = { Text(stringResource(R.string.save_preset)) },
text = {
OutlinedTextField(
value = name,
onValueChange = { name = it },
singleLine = true,
- label = { Text("Nome") },
+ label = { Text(stringResource(R.string.name)) },
)
},
confirmButton = {
- TextButton(onClick = { onConfirm(name) }) { Text("Salva") }
+ TextButton(onClick = { onConfirm(name) }) { Text(stringResource(R.string.save)) }
},
dismissButton = {
- TextButton(onClick = onDismiss) { Text("Annulla") }
+ TextButton(onClick = onDismiss) { Text(stringResource(R.string.cancel)) }
},
)
}
@@ -446,7 +452,7 @@ private fun EffectSlider(
// is fiddly, and a stuck-off-centre value is the kind of thing that
// gets mistaken for broken playback.
Text(
- "Azzera",
+ stringResource(R.string.reset),
style = MaterialTheme.typography.bodySmall,
color = GlassInk,
modifier = Modifier
diff --git a/app/src/main/java/dev/emanuele/spot/ui/player/PlayerScreen.kt b/app/src/main/java/dev/emanuele/spot/ui/player/PlayerScreen.kt
index c92b9ac..0893ef3 100644
--- a/app/src/main/java/dev/emanuele/spot/ui/player/PlayerScreen.kt
+++ b/app/src/main/java/dev/emanuele/spot/ui/player/PlayerScreen.kt
@@ -48,6 +48,7 @@ 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.blur
import androidx.compose.ui.draw.clip
import androidx.compose.ui.draw.drawWithContent
@@ -66,6 +67,7 @@ import com.kyant.backdrop.Backdrop
import com.kyant.backdrop.backdrops.layerBackdrop
import com.kyant.backdrop.backdrops.rememberCombinedBackdrop
import com.kyant.backdrop.backdrops.rememberLayerBackdrop
+import dev.emanuele.spot.R
import dev.emanuele.spot.ui.MainViewModel
import dev.emanuele.spot.ui.components.Artwork
import dev.emanuele.spot.ui.glass.LiquidButton
@@ -528,7 +530,7 @@ fun PlayerScreen(
) {
Icon(
PhosphorIcons.Regular.Queue,
- contentDescription = "Coda",
+ contentDescription = stringResource(R.string.queue),
// Coloured while its panel is the one
// open: these buttons stay on screen
// with the panel showing, and nothing
@@ -552,7 +554,7 @@ fun PlayerScreen(
) {
Icon(
PhosphorIcons.Regular.Plus,
- contentDescription = "Aggiungi a una playlist",
+ contentDescription = stringResource(R.string.add_to_playlist),
tint = panelTint(panel == PlayerPanel.ADD_TO_PLAYLIST),
modifier = Modifier.size(20.dp),
)
@@ -632,23 +634,23 @@ private fun TopBar(
verticalAlignment = Alignment.CenterVertically,
) {
GlassButton(backdrop, onClick = onCollapse) {
- Icon(PhosphorIcons.Regular.CaretDown, contentDescription = "Chiudi")
+ Icon(PhosphorIcons.Regular.CaretDown, contentDescription = stringResource(R.string.close))
}
// Names whatever the middle of the screen is currently showing, so the
// switch below has a label without carrying one.
Crossfade(
targetState = when (panel) {
- PlayerPanel.LYRICS -> "Testo"
- PlayerPanel.EFFECTS -> "Effetti"
- PlayerPanel.QUEUE -> "In coda"
- PlayerPanel.DEVICES -> "Riproduci su"
- PlayerPanel.ADD_TO_PLAYLIST -> "Aggiungi a una playlist"
+ PlayerPanel.LYRICS -> stringResource(R.string.lyrics)
+ PlayerPanel.EFFECTS -> stringResource(R.string.effects)
+ PlayerPanel.QUEUE -> stringResource(R.string.queued)
+ PlayerPanel.DEVICES -> stringResource(R.string.play_on)
+ PlayerPanel.ADD_TO_PLAYLIST -> stringResource(R.string.add_to_playlist)
// The source in place of the words "in riproduzione", which
// said nothing the screen was not already saying. What is worth
// knowing here is where the track came from — the playlist you
// opened, the album, the search — and this is the one line of
// the player not already spoken for.
- PlayerPanel.NONE -> source.ifBlank { "In riproduzione" }
+ PlayerPanel.NONE -> source.ifBlank { stringResource(R.string.now_playing) }
},
animationSpec = tween(220),
label = "topBarTitle",
@@ -667,7 +669,7 @@ private fun TopBar(
GlassButton(backdrop, onClick = onOpenDevices) {
Icon(
PhosphorIcons.Regular.Devices,
- contentDescription = "Dispositivi",
+ contentDescription = stringResource(R.string.devices),
tint = panelTint(panel == PlayerPanel.DEVICES),
)
}
@@ -813,7 +815,7 @@ private fun Controls(
) {
ToggleIcon(
icon = PhosphorIcons.Regular.Shuffle,
- description = "Riproduzione casuale",
+ description = stringResource(R.string.shuffle_play),
active = state.shuffleEnabled,
onClick = onToggleShuffle,
)
@@ -830,7 +832,7 @@ private fun Controls(
) {
Icon(
PhosphorIcons.Fill.SkipBack,
- contentDescription = "Precedente",
+ contentDescription = stringResource(R.string.previous),
modifier = Modifier.size(30.dp),
)
}
@@ -843,7 +845,7 @@ private fun Controls(
) { playing ->
Icon(
imageVector = if (playing) PhosphorIcons.Fill.Pause else PhosphorIcons.Fill.Play,
- contentDescription = if (playing) "Pausa" else "Riproduci",
+ contentDescription = stringResource(if (playing) R.string.pause else R.string.play),
modifier = Modifier.size(34.dp),
)
}
@@ -857,7 +859,7 @@ private fun Controls(
) {
Icon(
PhosphorIcons.Fill.SkipForward,
- contentDescription = "Successivo",
+ contentDescription = stringResource(R.string.next),
modifier = Modifier.size(30.dp),
)
}
@@ -868,7 +870,7 @@ private fun Controls(
} else {
PhosphorIcons.Regular.Repeat
},
- description = "Ripeti",
+ description = stringResource(R.string.repeat),
active = state.repeatMode != Player.REPEAT_MODE_OFF,
onClick = onCycleRepeat,
)
@@ -986,7 +988,7 @@ private fun LyricsStage(
)
lyrics == null -> Text(
- "Nessun testo per questo brano",
+ stringResource(R.string.no_lyrics),
style = MaterialTheme.typography.bodyMedium,
color = GlassInkDim,
)
diff --git a/app/src/main/java/dev/emanuele/spot/ui/search/SearchScreen.kt b/app/src/main/java/dev/emanuele/spot/ui/search/SearchScreen.kt
index ed3a380..8bf15f7 100644
--- a/app/src/main/java/dev/emanuele/spot/ui/search/SearchScreen.kt
+++ b/app/src/main/java/dev/emanuele/spot/ui/search/SearchScreen.kt
@@ -1,5 +1,6 @@
package dev.emanuele.spot.ui.search
+import androidx.annotation.StringRes
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
@@ -24,11 +25,13 @@ import androidx.compose.material3.TextButton
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
import androidx.compose.ui.platform.LocalClipboardManager
import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
+import dev.emanuele.spot.R
import dev.emanuele.spot.data.CatalogTrack
import dev.emanuele.spot.data.SearchItem
import dev.emanuele.spot.ui.MainViewModel
@@ -67,18 +70,18 @@ fun SearchScreen(
LazyColumn(Modifier.fillMaxSize(), contentPadding = contentPadding) {
item(contentType = "field") {
Column(Modifier.padding(start = 24.dp, end = 24.dp, top = 36.dp, bottom = 10.dp)) {
- Text("Cerca", style = MaterialTheme.typography.displayLarge)
+ Text(stringResource(R.string.search), style = MaterialTheme.typography.displayLarge)
OutlinedTextField(
enabled = !state.needsSetup,
value = state.query,
onValueChange = onQueryChange,
- placeholder = { Text("Brani, artisti, album, playlist") },
+ placeholder = { Text(stringResource(R.string.search_placeholder)) },
singleLine = true,
leadingIcon = { Icon(PhosphorIcons.Fill.MagnifyingGlass, contentDescription = null) },
trailingIcon = {
if (state.query.isNotEmpty()) {
IconButton(onClick = { onQueryChange("") }) {
- Icon(PhosphorIcons.Regular.X, contentDescription = "Cancella")
+ Icon(PhosphorIcons.Regular.X, contentDescription = stringResource(R.string.clear))
}
}
},
@@ -113,7 +116,7 @@ fun SearchScreen(
state.query.isBlank() -> item(contentType = "status") {
StatusBox {
Text(
- "Cerca qualcosa da ascoltare",
+ stringResource(R.string.search_prompt),
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant,
)
@@ -123,7 +126,7 @@ fun SearchScreen(
state.results.isEmpty -> item(contentType = "status") {
StatusBox {
Text(
- "Nessun risultato per “${state.query}”",
+ stringResource(R.string.no_results_for, state.query),
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant,
textAlign = TextAlign.Center,
@@ -134,7 +137,7 @@ fun SearchScreen(
else -> {
val tracks = state.results.tracks
if (tracks.isNotEmpty()) {
- item(contentType = "section") { SectionTitle("Brani") }
+ item(contentType = "section") { SectionTitle(stringResource(R.string.tracks)) }
items(
count = tracks.size,
key = { "track-${tracks[it].uri}-$it" },
@@ -154,22 +157,22 @@ fun SearchScreen(
}
}
- section("Artisti", state.results.artists, round = true, onOpenContext)
- section("Album", state.results.albums, round = false, onOpenContext)
- section("Playlist", state.results.playlists, round = false, onOpenContext)
+ section(R.string.artists, state.results.artists, round = true, onOpenContext)
+ section(R.string.albums, state.results.albums, round = false, onOpenContext)
+ section(R.string.playlists, state.results.playlists, round = false, onOpenContext)
}
}
}
}
private fun LazyListScope.section(
- title: String,
+ @StringRes title: Int,
items: List<SearchItem>,
round: Boolean,
onOpen: (SearchItem) -> Unit,
) {
if (items.isEmpty()) return
- item(contentType = "section") { SectionTitle(title) }
+ item(contentType = "section") { SectionTitle(stringResource(title)) }
items(
count = items.size,
key = { "$title-${items[it].uri}" },
diff --git a/app/src/main/java/dev/emanuele/spot/ui/settings/SettingsScreen.kt b/app/src/main/java/dev/emanuele/spot/ui/settings/SettingsScreen.kt
index 4441ae0..a0c471d 100644
--- a/app/src/main/java/dev/emanuele/spot/ui/settings/SettingsScreen.kt
+++ b/app/src/main/java/dev/emanuele/spot/ui/settings/SettingsScreen.kt
@@ -26,6 +26,7 @@ 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.platform.LocalUriHandler
import androidx.compose.ui.text.font.FontWeight
@@ -39,6 +40,7 @@ import com.adamglin.phosphoricons.regular.CaretDown
import com.adamglin.phosphoricons.regular.CaretUp
import com.kyant.backdrop.Backdrop
import dev.emanuele.spot.BuildConfig
+import dev.emanuele.spot.R
import dev.emanuele.spot.ui.MainViewModel
import dev.emanuele.spot.ui.components.Artwork
import dev.emanuele.spot.ui.glass.LiquidButton
@@ -91,10 +93,10 @@ fun SettingsScreen(
verticalAlignment = Alignment.CenterVertically,
) {
LiquidButton(onClick = onBack, backdrop = backdrop) {
- Icon(PhosphorIcons.Regular.ArrowLeft, contentDescription = "Indietro")
+ Icon(PhosphorIcons.Regular.ArrowLeft, contentDescription = stringResource(R.string.back))
}
Text(
- "Impostazioni",
+ stringResource(R.string.settings),
style = MaterialTheme.typography.displayLarge,
modifier = Modifier.padding(start = 14.dp),
)
@@ -102,7 +104,7 @@ fun SettingsScreen(
}
item("account") {
- Section("Account") {
+ Section(stringResource(R.string.account)) {
Row(
Modifier
.fillMaxWidth()
@@ -124,16 +126,16 @@ fun SettingsScreen(
.padding(start = 14.dp),
) {
Text(
- ready?.displayName ?: "Non connesso",
+ ready?.displayName ?: stringResource(R.string.not_connected),
style = MaterialTheme.typography.titleMedium,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
)
Text(
if (ready != null) {
- "${ready.playlists.size} playlist"
+ stringResource(R.string.playlist_count, ready.playlists.size)
} else {
- "Accedi per riprendere"
+ stringResource(R.string.log_in_to_resume)
},
style = MaterialTheme.typography.bodySmall,
color = InkDim,
@@ -142,21 +144,21 @@ fun SettingsScreen(
}
RowDivider()
- InfoRow("Dispositivo Connect", deviceName)
+ InfoRow(stringResource(R.string.connect_device), deviceName)
}
}
item("webapi") {
- Section("API web") {
+ Section(stringResource(R.string.web_api)) {
if (webApi.connected) {
- InfoRow("Applicazione", "Collegata")
+ InfoRow(stringResource(R.string.application), stringResource(R.string.connected))
RowDivider()
InfoRow(
- "Client id",
+ stringResource(R.string.client_id),
webApi.clientId.take(8) + if (webApi.clientId.length > 8) "…" else "",
)
RowDivider()
- ActionRow("Scollega", destructive = true, onClick = onDisconnectWebApi)
+ ActionRow(stringResource(R.string.disconnect), destructive = true, onClick = onDisconnectWebApi)
} else {
// The full explanation, because with no application
// connected search does not work at all and the reason is
@@ -167,32 +169,30 @@ fun SettingsScreen(
}
item("tutorial") {
- Section("Guida") {
- ActionRow("Rivedi la configurazione guidata", destructive = false) {
+ Section(stringResource(R.string.guide)) {
+ ActionRow(stringResource(R.string.see_setup_again), destructive = false) {
onShowTutorial()
}
}
}
item("permissions") {
- Section("Permessi richiesti") {
+ Section(stringResource(R.string.permissions_asked)) {
Text(
- "Un'applicazione collegata prima di un aggiornamento va ricollegata " +
- "per concedere i permessi aggiunti dopo: le sezioni che li usano " +
- "restano vuote finché non lo fai.",
+ stringResource(R.string.permissions_note),
style = MaterialTheme.typography.bodySmall,
color = InkDim,
modifier = Modifier.padding(horizontal = 18.dp, vertical = 14.dp),
)
SCOPES.forEach { (scope, why) ->
RowDivider()
- InfoRow(scope, why)
+ InfoRow(scope, stringResource(why))
}
}
}
item("author") {
- Section("Sviluppato da") {
+ Section(stringResource(R.string.developed_by)) {
val uriHandler = LocalUriHandler.current
Row(
Modifier
@@ -236,8 +236,8 @@ fun SettingsScreen(
}
item("about") {
- Section("Informazioni") {
- InfoRow("Versione", "${BuildConfig.VERSION_NAME} (${BuildConfig.BUILD_TYPE})")
+ Section(stringResource(R.string.about)) {
+ InfoRow(stringResource(R.string.version), "${BuildConfig.VERSION_NAME} (${BuildConfig.BUILD_TYPE})")
RowDivider()
Licences()
}
@@ -246,7 +246,7 @@ fun SettingsScreen(
if (ready != null) {
item("logout") {
Section(null) {
- ActionRow("Esci", destructive = true, onClick = onLogOut)
+ ActionRow(stringResource(R.string.log_out), destructive = true, onClick = onLogOut)
}
}
}
@@ -272,7 +272,7 @@ private fun Licences() {
.padding(horizontal = 18.dp, vertical = 14.dp),
verticalAlignment = Alignment.CenterVertically,
) {
- Text("Licenze", style = MaterialTheme.typography.bodyLarge, modifier = Modifier.weight(1f))
+ Text(stringResource(R.string.licences), style = MaterialTheme.typography.bodyLarge, modifier = Modifier.weight(1f))
Icon(
if (open) PhosphorIcons.Regular.CaretUp else PhosphorIcons.Regular.CaretDown,
contentDescription = null,
@@ -362,12 +362,12 @@ private fun RowDivider() {
/** Kept next to the request that asks for them; see MainViewModel.connectWebApi. */
private val SCOPES = listOf(
- "user-top-read" to "Artisti che ascolti",
- "user-read-recently-played" to "Cronologia dell'account",
- "user-read-playback-state" to "Elenco dispositivi",
- "user-modify-playback-state" to "Sposta la riproduzione",
- "playlist-modify-private" to "Aggiungi a playlist private",
- "playlist-modify-public" to "Aggiungi a playlist pubbliche",
+ "user-top-read" to R.string.scope_top_artists,
+ "user-read-recently-played" to R.string.scope_history,
+ "user-read-playback-state" to R.string.scope_devices,
+ "user-modify-playback-state" to R.string.scope_transfer,
+ "playlist-modify-private" to R.string.scope_private_playlists,
+ "playlist-modify-public" to R.string.scope_public_playlists,
)
private val LICENCES = listOf(
diff --git a/app/src/main/java/dev/emanuele/spot/ui/settings/WebApiSetup.kt b/app/src/main/java/dev/emanuele/spot/ui/settings/WebApiSetup.kt
index b8d719e..e26abd9 100644
--- a/app/src/main/java/dev/emanuele/spot/ui/settings/WebApiSetup.kt
+++ b/app/src/main/java/dev/emanuele/spot/ui/settings/WebApiSetup.kt
@@ -15,10 +15,12 @@ import androidx.compose.material3.TextButton
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
import androidx.compose.ui.platform.LocalClipboardManager
import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.unit.dp
import com.kyant.backdrop.Backdrop
+import dev.emanuele.spot.R
import dev.emanuele.spot.ui.MainViewModel
import dev.emanuele.spot.ui.glass.LiquidButton
@@ -40,18 +42,16 @@ internal fun WebApiSetup(
) {
val clipboard = LocalClipboardManager.current
Column(Modifier.padding(horizontal = 24.dp, vertical = 12.dp)) {
- Text("ATTIVA LA RICERCA", style = MaterialTheme.typography.labelLarge, color = MaterialTheme.colorScheme.primary)
+ Text(stringResource(R.string.turn_on_search), style = MaterialTheme.typography.labelLarge, color = MaterialTheme.colorScheme.primary)
Text(
- "La ricerca usa le API web di Spotify, che hanno un limite di richieste " +
- "per applicazione. Registra un'app nel dashboard per sviluppatori e " +
- "incolla qui il suo client id: così il limite è solo tuo.",
+ stringResource(R.string.web_api_explainer),
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant,
modifier = Modifier.padding(top = 8.dp),
)
Text(
- "Nell'app va aggiunto questo Redirect URI, identico:",
+ stringResource(R.string.redirect_uri_note),
style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onSurfaceVariant,
modifier = Modifier.padding(top = 18.dp),
@@ -66,7 +66,7 @@ internal fun WebApiSetup(
modifier = Modifier.weight(1f),
)
TextButton(onClick = { clipboard.setText(AnnotatedString(state.redirectUri)) }) {
- Text("Copia")
+ Text(stringResource(R.string.copy))
}
}
@@ -92,7 +92,7 @@ internal fun WebApiSetupInline(
OutlinedTextField(
value = state.clientId,
onValueChange = onClientIdChange,
- label = { Text("Client id") },
+ label = { Text(stringResource(R.string.client_id)) },
singleLine = true,
enabled = !state.connecting,
shape = RoundedCornerShape(16.dp),
@@ -125,7 +125,7 @@ internal fun WebApiSetupInline(
color = MaterialTheme.colorScheme.onPrimary,
)
} else {
- Text("Collega", style = MaterialTheme.typography.titleMedium)
+ Text(stringResource(R.string.connect), style = MaterialTheme.typography.titleMedium)
}
}
}
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
new file mode 100644
index 0000000..7745af4
--- /dev/null
+++ b/app/src/main/res/values-de/strings.xml
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="back">Zurück</string>
+ <string name="close">Schließen</string>
+ <string name="skip">Überspringen</string>
+ <string name="next_step">Weiter</string>
+ <string name="copy">Kopieren</string>
+ <string name="cancel">Abbrechen</string>
+ <string name="save">Speichern</string>
+ <string name="clear">Löschen</string>
+ <string name="retry">Erneut versuchen</string>
+ <string name="log_out">Abmelden</string>
+ <string name="refresh">Aktualisieren</string>
+ <string name="more">Mehr</string>
+ <string name="sort">Sortieren</string>
+ <string name="name">Name</string>
+ <string name="title">Titel</string>
+ <string name="artist">Künstler</string>
+ <string name="album">Album</string>
+ <string name="playlist">Playlist</string>
+ <string name="duration">Länge</string>
+ <string name="tracks">Titel</string>
+ <string name="artists">Künstler</string>
+ <string name="albums">Alben</string>
+ <string name="playlists">Playlists</string>
+ <string name="shuffle">Zufall</string>
+ <string name="play">Abspielen</string>
+ <string name="pause">Pause</string>
+ <string name="previous">Zurück</string>
+ <string name="next">Weiter</string>
+ <string name="repeat">Wiederholen</string>
+ <string name="reset">Zurücksetzen</string>
+ <string name="off">Aus</string>
+ <string name="queue">Warteschlange</string>
+ <string name="lyrics">Songtext</string>
+ <string name="effects">Effekte</string>
+ <string name="cover">Cover</string>
+ <string name="devices">Geräte</string>
+ <string name="settings">Einstellungen</string>
+ <string name="home">Start</string>
+ <string name="library">Bibliothek</string>
+ <string name="search">Suchen</string>
+ <string name="now_playing">Läuft gerade</string>
+ <string name="unofficial_client">Inoffizieller Client für Premium-Konten</string>
+ <string name="log_in_with_spotify">Mit Spotify anmelden</string>
+ <string name="connect">Verbinden</string>
+ <string name="client_id">Client ID</string>
+
+ <string name="good_morning">Guten Morgen</string>
+ <string name="good_afternoon">Guten Tag</string>
+ <string name="good_evening">Guten Abend</string>
+ <string name="feed_all">Alles</string>
+ <string name="feed_for_you">Für dich</string>
+ <string name="feed_releases">Neu</string>
+ <string name="your_playlists">Deine Playlists</string>
+ <string name="listening_artists">Künstler, die du hörst</string>
+ <string name="play_again">Nochmal hören</string>
+ <string name="on_repeat">Zurzeit in Dauerschleife</string>
+ <string name="jump_back_in">Weiter, wo du warst</string>
+ <string name="new_from_your_artists">Neues von deinen Künstlern</string>
+ <string name="all_time_favourites">Deine Dauerbrenner</string>
+ <string name="cannot_connect">Spotify ist nicht erreichbar.</string>
+ <string name="rootlist_unavailable">Playlists nicht verfügbar</string>
+
+ <string name="recently_opened">Zuletzt geöffnet</string>
+ <string name="spotify_order">Reihenfolge von Spotify</string>
+ <string name="change_layout">Ansicht wechseln</string>
+ <string name="playlist_count">%1$d Playlists</string>
+
+ <string name="playlist_order">Reihenfolge der Playlist</string>
+ <string name="recently_added">Zuletzt hinzugefügt</string>
+ <string name="top_tracks">Top-Titel</string>
+ <string name="search_in_tracks">In den Titeln suchen</string>
+ <string name="no_tracks">Keine Titel</string>
+ <string name="no_results_for">Keine Treffer für „%1$s“</string>
+ <string name="more_tracks_coming">Weitere Titel folgen</string>
+ <string name="track_count_and_length"> · %1$d Titel · %2$s</string>
+ <string name="hours_minutes">%1$d Std. %2$d Min.</string>
+ <string name="minutes_only">%1$d Min.</string>
+ <string name="artist_needs_app">Für einen Künstler braucht es deine eigene Spotify-Anwendung: richte sie unter Suchen ein.</string>
+
+ <string name="add_to_queue">Zur Warteschlange</string>
+ <string name="add_to_playlist">Zu einer Playlist hinzufügen</string>
+ <string name="copy_link">Link kopieren</string>
+ <string name="remove_from_playlist">Aus der Playlist entfernen</string>
+ <string name="queued">In der Warteschlange</string>
+ <string name="added_to">Zu %1$s hinzugefügt</string>
+ <string name="no_playlists_in_account">Keine Playlists in deinem Konto</string>
+ <string name="track_cannot_be_added">Dieser Titel lässt sich nicht hinzufügen.</string>
+ <string name="connect_app_in_settings">Verbinde deine Anwendung in den Einstellungen.</string>
+ <string name="add_failed">Zu %1$s konnte nichts hinzugefügt werden. Wenn die Playlist nicht dir gehört, kannst du sie nicht ändern.</string>
+
+ <string name="play_on">Abspielen auf</string>
+ <string name="no_devices">Keine Geräte verfügbar</string>
+ <string name="queue_empty">Die Warteschlange ist leer</string>
+ <string name="no_lyrics">Kein Songtext für diesen Titel</string>
+ <string name="speed">Tempo</string>
+ <string name="pitch">Tonhöhe</string>
+ <string name="reverb">Hall</string>
+ <string name="save_preset">Voreinstellung speichern</string>
+ <string name="delete_preset">%1$s löschen</string>
+ <string name="shuffle_play">Zufallswiedergabe</string>
+ <string name="unnamed">Ohne Namen</string>
+ <string name="preset_original">Original</string>
+
+ <string name="search_placeholder">Titel, Künstler, Alben, Playlists</string>
+ <string name="search_prompt">Suche etwas zum Hören</string>
+
+ <string name="account">Konto</string>
+ <string name="not_connected">Nicht verbunden</string>
+ <string name="log_in_to_resume">Melde dich an, um weiterzuhören</string>
+ <string name="connect_device">Connect-Gerät</string>
+ <string name="web_api">Web-API</string>
+ <string name="application">Anwendung</string>
+ <string name="connected">Verbunden</string>
+ <string name="disconnect">Trennen</string>
+ <string name="guide">Anleitung</string>
+ <string name="see_setup_again">Einrichtung noch einmal ansehen</string>
+ <string name="permissions_asked">Angefragte Berechtigungen</string>
+ <string name="permissions_note">Eine vor einem Update verbundene Anwendung muss neu verbunden werden, um die seither hinzugekommenen Berechtigungen zu erteilen: die Bereiche, die sie brauchen, bleiben bis dahin leer.</string>
+ <string name="developed_by">Entwickelt von</string>
+ <string name="about">Info</string>
+ <string name="version">Version</string>
+ <string name="licences">Lizenzen</string>
+ <string name="scope_top_artists">Künstler, die du hörst</string>
+ <string name="scope_history">Verlauf des Kontos</string>
+ <string name="scope_devices">Geräteliste</string>
+ <string name="scope_transfer">Wiedergabe übertragen</string>
+ <string name="scope_private_playlists">Zu privaten Playlists hinzufügen</string>
+ <string name="scope_public_playlists">Zu öffentlichen Playlists hinzufügen</string>
+ <string name="enter_client_id">Gib die Client ID ein.</string>
+ <string name="needs_your_app">Dafür braucht es deine eigene Spotify-Anwendung: richte sie unter Suchen ein.</string>
+
+ <string name="turn_on_search">SUCHE AKTIVIEREN</string>
+ <string name="web_api_explainer">Die Suche läuft über Spotifys Web-API, die pro Anwendung ein Anfragelimit hat. Registriere eine App im Entwickler-Dashboard und füge hier ihre Client ID ein: dann gehört das Limit dir allein.</string>
+ <string name="redirect_uri_note">In der App muss genau diese Redirect URI eingetragen werden:</string>
+
+ <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_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_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>
+ <string name="onboarding_step_create">Oben rechts auf «Create app» tippen.</string>
+ <string name="onboarding_step_names">App name und App description: was du magst, zum Beispiel Square. Website: leer lassen.</string>
+ <string name="onboarding_step_redirect">Redirect URI: die Zeile unten einfügen und «Add» drücken. Prüfe, dass sie in der Liste unter dem Feld auftaucht, sonst wird sie nicht gespeichert.</string>
+ <string name="onboarding_step_api">Bei «Which API/SDKs are you planning to use?» Web API ankreuzen.</string>
+ <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_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>
+ <string name="onboarding_paste_error">Zeigt der Browser einen Fehler, geh einen Schritt zurück: fast immer wurde die Redirect URI nicht in die Liste aufgenommen.</string>
+ <string name="onboarding_done_title">Alles bereit</string>
+ <string name="onboarding_done_1">Auf der Startseite stehen deine Playlists, mit der Lupe durchsuchst du den ganzen Katalog.</string>
+ <string name="onboarding_done_2">Im Player wischst du für den nächsten Titel und öffnest Songtext, Warteschlange und Effekte über die Leiste unter dem Cover.</string>
+ <string name="onboarding_done_3">Diese Anleitung findest du wieder in den Einstellungen — tippe auf der Startseite auf dein Bild.</string>
+
+ <string name="browser_return">Du kannst zur App zurückgehen.</string>
+</resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
new file mode 100644
index 0000000..c087b49
--- /dev/null
+++ b/app/src/main/res/values-es/strings.xml
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="back">Atrás</string>
+ <string name="close">Cerrar</string>
+ <string name="skip">Saltar</string>
+ <string name="next_step">Siguiente</string>
+ <string name="copy">Copiar</string>
+ <string name="cancel">Cancelar</string>
+ <string name="save">Guardar</string>
+ <string name="clear">Borrar</string>
+ <string name="retry">Reintentar</string>
+ <string name="log_out">Salir</string>
+ <string name="refresh">Actualizar</string>
+ <string name="more">Más</string>
+ <string name="sort">Ordenar</string>
+ <string name="name">Nombre</string>
+ <string name="title">Título</string>
+ <string name="artist">Artista</string>
+ <string name="album">Álbum</string>
+ <string name="playlist">Playlist</string>
+ <string name="duration">Duración</string>
+ <string name="tracks">Canciones</string>
+ <string name="artists">Artistas</string>
+ <string name="albums">Álbumes</string>
+ <string name="playlists">Playlists</string>
+ <string name="shuffle">Aleatorio</string>
+ <string name="play">Reproducir</string>
+ <string name="pause">Pausa</string>
+ <string name="previous">Anterior</string>
+ <string name="next">Siguiente</string>
+ <string name="repeat">Repetir</string>
+ <string name="reset">Restablecer</string>
+ <string name="off">Off</string>
+ <string name="queue">Cola</string>
+ <string name="lyrics">Letra</string>
+ <string name="effects">Efectos</string>
+ <string name="cover">Portada</string>
+ <string name="devices">Dispositivos</string>
+ <string name="settings">Ajustes</string>
+ <string name="home">Inicio</string>
+ <string name="library">Biblioteca</string>
+ <string name="search">Buscar</string>
+ <string name="now_playing">Reproduciendo</string>
+ <string name="unofficial_client">Cliente no oficial para cuentas Premium</string>
+ <string name="log_in_with_spotify">Entrar con Spotify</string>
+ <string name="connect">Conectar</string>
+ <string name="client_id">Client ID</string>
+
+ <string name="good_morning">Buenos días</string>
+ <string name="good_afternoon">Buenas tardes</string>
+ <string name="good_evening">Buenas noches</string>
+ <string name="feed_all">Todo</string>
+ <string name="feed_for_you">Para ti</string>
+ <string name="feed_releases">Novedades</string>
+ <string name="your_playlists">Tus playlists</string>
+ <string name="listening_artists">Artistas que escuchas</string>
+ <string name="play_again">Volver a escuchar</string>
+ <string name="on_repeat">En bucle estos días</string>
+ <string name="jump_back_in">Retoma donde lo dejaste</string>
+ <string name="new_from_your_artists">Nuevo de tus artistas</string>
+ <string name="all_time_favourites">Tus clásicos de siempre</string>
+ <string name="cannot_connect">No se ha podido conectar con Spotify.</string>
+ <string name="rootlist_unavailable">playlists no disponibles</string>
+
+ <string name="recently_opened">Abiertas hace poco</string>
+ <string name="spotify_order">Orden de Spotify</string>
+ <string name="change_layout">Cambiar disposición</string>
+ <string name="playlist_count">%1$d playlists</string>
+
+ <string name="playlist_order">Orden de la playlist</string>
+ <string name="recently_added">Añadidas hace poco</string>
+ <string name="top_tracks">Canciones principales</string>
+ <string name="search_in_tracks">Buscar entre las canciones</string>
+ <string name="no_tracks">Ninguna canción</string>
+ <string name="no_results_for">Sin resultados para “%1$s”</string>
+ <string name="more_tracks_coming">Llegan más canciones</string>
+ <string name="track_count_and_length"> · %1$d canciones · %2$s</string>
+ <string name="hours_minutes">%1$d h %2$d min</string>
+ <string name="minutes_only">%1$d min</string>
+ <string name="artist_needs_app">Para abrir un artista hace falta tu propia aplicación de Spotify: configúrala en Buscar.</string>
+
+ <string name="add_to_queue">Añadir a la cola</string>
+ <string name="add_to_playlist">Añadir a una playlist</string>
+ <string name="copy_link">Copiar enlace</string>
+ <string name="remove_from_playlist">Quitar de la playlist</string>
+ <string name="queued">En cola</string>
+ <string name="added_to">Añadido a %1$s</string>
+ <string name="no_playlists_in_account">No hay playlists en tu cuenta</string>
+ <string name="track_cannot_be_added">Esta canción no se puede añadir.</string>
+ <string name="connect_app_in_settings">Conecta tu aplicación en los ajustes.</string>
+ <string name="add_failed">No se ha podido añadir a %1$s. Si la playlist no es tuya, no puedes modificarla.</string>
+
+ <string name="play_on">Reproducir en</string>
+ <string name="no_devices">Ningún dispositivo disponible</string>
+ <string name="queue_empty">La cola está vacía</string>
+ <string name="no_lyrics">Sin letra para esta canción</string>
+ <string name="speed">Velocidad</string>
+ <string name="pitch">Tono</string>
+ <string name="reverb">Reverberación</string>
+ <string name="save_preset">Guardar ajuste</string>
+ <string name="delete_preset">Eliminar %1$s</string>
+ <string name="shuffle_play">Reproducción aleatoria</string>
+ <string name="unnamed">Sin nombre</string>
+ <string name="preset_original">Original</string>
+
+ <string name="search_placeholder">Canciones, artistas, álbumes, playlists</string>
+ <string name="search_prompt">Busca algo que escuchar</string>
+
+ <string name="account">Cuenta</string>
+ <string name="not_connected">No conectado</string>
+ <string name="log_in_to_resume">Entra para continuar</string>
+ <string name="connect_device">Dispositivo Connect</string>
+ <string name="web_api">API web</string>
+ <string name="application">Aplicación</string>
+ <string name="connected">Conectada</string>
+ <string name="disconnect">Desconectar</string>
+ <string name="guide">Guía</string>
+ <string name="see_setup_again">Repasar la configuración guiada</string>
+ <string name="permissions_asked">Permisos solicitados</string>
+ <string name="permissions_note">Una aplicación conectada antes de una actualización debe reconectarse para conceder los permisos añadidos después: las secciones que los usan seguirán vacías hasta entonces.</string>
+ <string name="developed_by">Desarrollado por</string>
+ <string name="about">Información</string>
+ <string name="version">Versión</string>
+ <string name="licences">Licencias</string>
+ <string name="scope_top_artists">Artistas que escuchas</string>
+ <string name="scope_history">Historial de la cuenta</string>
+ <string name="scope_devices">Lista de dispositivos</string>
+ <string name="scope_transfer">Mover la reproducción</string>
+ <string name="scope_private_playlists">Añadir a playlists privadas</string>
+ <string name="scope_public_playlists">Añadir a playlists públicas</string>
+ <string name="enter_client_id">Introduce el client ID.</string>
+ <string name="needs_your_app">Hace falta tu propia aplicación de Spotify: configúrala en Buscar.</string>
+
+ <string name="turn_on_search">ACTIVA LA BÚSQUEDA</string>
+ <string name="web_api_explainer">La búsqueda usa la API web de Spotify, que tiene un límite de peticiones por aplicación. Registra una app en el panel para desarrolladores y pega aquí su client ID: así el límite es solo tuyo.</string>
+ <string name="redirect_uri_note">En la app hay que añadir este Redirect URI, idéntico:</string>
+
+ <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_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_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>
+ <string name="onboarding_step_create">Arriba a la derecha pulsa «Create app».</string>
+ <string name="onboarding_step_names">App name y App description: lo que quieras, por ejemplo Square. Website: déjalo vacío.</string>
+ <string name="onboarding_step_redirect">Redirect URI: pega la línea de abajo y pulsa «Add». Comprueba que aparece en la lista bajo el campo, o no se guarda.</string>
+ <string name="onboarding_step_api">En «Which API/SDKs are you planning to use?» marca Web API.</string>
+ <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_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>
+ <string name="onboarding_paste_error">Si el navegador da error, vuelve al paso anterior: casi siempre el Redirect URI no se añadió a la lista.</string>
+ <string name="onboarding_done_title">Todo listo</string>
+ <string name="onboarding_done_1">En inicio están tus playlists, y con la lupa buscas en todo el catálogo.</string>
+ <string name="onboarding_done_2">En el reproductor desliza para cambiar de canción y abre letra, cola y efectos desde la barra bajo la portada.</string>
+ <string name="onboarding_done_3">Puedes ver esta guía otra vez en Ajustes, tocando tu foto en inicio.</string>
+
+ <string name="browser_return">Ya puedes volver a la app.</string>
+</resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
new file mode 100644
index 0000000..c41786d
--- /dev/null
+++ b/app/src/main/res/values-fr/strings.xml
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="back">Retour</string>
+ <string name="close">Fermer</string>
+ <string name="skip">Passer</string>
+ <string name="next_step">Suivant</string>
+ <string name="copy">Copier</string>
+ <string name="cancel">Annuler</string>
+ <string name="save">Enregistrer</string>
+ <string name="clear">Effacer</string>
+ <string name="retry">Réessayer</string>
+ <string name="log_out">Se déconnecter</string>
+ <string name="refresh">Actualiser</string>
+ <string name="more">Plus</string>
+ <string name="sort">Trier</string>
+ <string name="name">Nom</string>
+ <string name="title">Titre</string>
+ <string name="artist">Artiste</string>
+ <string name="album">Album</string>
+ <string name="playlist">Playlist</string>
+ <string name="duration">Durée</string>
+ <string name="tracks">Titres</string>
+ <string name="artists">Artistes</string>
+ <string name="albums">Albums</string>
+ <string name="playlists">Playlists</string>
+ <string name="shuffle">Aléatoire</string>
+ <string name="play">Lecture</string>
+ <string name="pause">Pause</string>
+ <string name="previous">Précédent</string>
+ <string name="next">Suivant</string>
+ <string name="repeat">Répéter</string>
+ <string name="reset">Réinitialiser</string>
+ <string name="off">Off</string>
+ <string name="queue">File d\'attente</string>
+ <string name="lyrics">Paroles</string>
+ <string name="effects">Effets</string>
+ <string name="cover">Pochette</string>
+ <string name="devices">Appareils</string>
+ <string name="settings">Réglages</string>
+ <string name="home">Accueil</string>
+ <string name="library">Bibliothèque</string>
+ <string name="search">Rechercher</string>
+ <string name="now_playing">En cours de lecture</string>
+ <string name="unofficial_client">Client non officiel pour comptes Premium</string>
+ <string name="log_in_with_spotify">Se connecter avec Spotify</string>
+ <string name="connect">Connecter</string>
+ <string name="client_id">Client ID</string>
+
+ <string name="good_morning">Bonjour</string>
+ <string name="good_afternoon">Bon après-midi</string>
+ <string name="good_evening">Bonsoir</string>
+ <string name="feed_all">Tout</string>
+ <string name="feed_for_you">Pour vous</string>
+ <string name="feed_releases">Nouveautés</string>
+ <string name="your_playlists">Vos playlists</string>
+ <string name="listening_artists">Artistes que vous écoutez</string>
+ <string name="play_again">Réécouter</string>
+ <string name="on_repeat">En boucle en ce moment</string>
+ <string name="jump_back_in">Reprendre où vous en étiez</string>
+ <string name="new_from_your_artists">Nouveautés de vos artistes</string>
+ <string name="all_time_favourites">Vos incontournables</string>
+ <string name="cannot_connect">Impossible de joindre Spotify.</string>
+ <string name="rootlist_unavailable">playlists indisponibles</string>
+
+ <string name="recently_opened">Ouvertes récemment</string>
+ <string name="spotify_order">Ordre de Spotify</string>
+ <string name="change_layout">Changer la disposition</string>
+ <string name="playlist_count">%1$d playlists</string>
+
+ <string name="playlist_order">Ordre de la playlist</string>
+ <string name="recently_added">Ajoutés récemment</string>
+ <string name="top_tracks">Titres principaux</string>
+ <string name="search_in_tracks">Rechercher parmi les titres</string>
+ <string name="no_tracks">Aucun titre</string>
+ <string name="no_results_for">Aucun résultat pour « %1$s »</string>
+ <string name="more_tracks_coming">D\'autres titres arrivent</string>
+ <string name="track_count_and_length"> · %1$d titres · %2$s</string>
+ <string name="hours_minutes">%1$d h %2$d min</string>
+ <string name="minutes_only">%1$d min</string>
+ <string name="artist_needs_app">Ouvrir un artiste demande votre propre application Spotify : configurez-la dans Rechercher.</string>
+
+ <string name="add_to_queue">Ajouter à la file</string>
+ <string name="add_to_playlist">Ajouter à une playlist</string>
+ <string name="copy_link">Copier le lien</string>
+ <string name="remove_from_playlist">Retirer de la playlist</string>
+ <string name="queued">Dans la file</string>
+ <string name="added_to">Ajouté à %1$s</string>
+ <string name="no_playlists_in_account">Aucune playlist dans votre compte</string>
+ <string name="track_cannot_be_added">Ce titre ne peut pas être ajouté.</string>
+ <string name="connect_app_in_settings">Connectez votre application dans les réglages.</string>
+ <string name="add_failed">Impossible d\'ajouter à %1$s. Si la playlist n\'est pas la vôtre, vous ne pouvez pas la modifier.</string>
+
+ <string name="play_on">Lire sur</string>
+ <string name="no_devices">Aucun appareil disponible</string>
+ <string name="queue_empty">La file est vide</string>
+ <string name="no_lyrics">Pas de paroles pour ce titre</string>
+ <string name="speed">Vitesse</string>
+ <string name="pitch">Hauteur</string>
+ <string name="reverb">Réverbération</string>
+ <string name="save_preset">Enregistrer le préréglage</string>
+ <string name="delete_preset">Supprimer %1$s</string>
+ <string name="shuffle_play">Lecture aléatoire</string>
+ <string name="unnamed">Sans nom</string>
+ <string name="preset_original">Original</string>
+
+ <string name="search_placeholder">Titres, artistes, albums, playlists</string>
+ <string name="search_prompt">Cherchez quelque chose à écouter</string>
+
+ <string name="account">Compte</string>
+ <string name="not_connected">Non connecté</string>
+ <string name="log_in_to_resume">Connectez-vous pour continuer</string>
+ <string name="connect_device">Appareil Connect</string>
+ <string name="web_api">API web</string>
+ <string name="application">Application</string>
+ <string name="connected">Connectée</string>
+ <string name="disconnect">Déconnecter</string>
+ <string name="guide">Guide</string>
+ <string name="see_setup_again">Revoir la configuration guidée</string>
+ <string name="permissions_asked">Autorisations demandées</string>
+ <string name="permissions_note">Une application connectée avant une mise à jour doit être reconnectée pour accorder les autorisations ajoutées depuis : les sections qui les utilisent restent vides tant que ce n\'est pas fait.</string>
+ <string name="developed_by">Développé par</string>
+ <string name="about">À propos</string>
+ <string name="version">Version</string>
+ <string name="licences">Licences</string>
+ <string name="scope_top_artists">Artistes que vous écoutez</string>
+ <string name="scope_history">Historique du compte</string>
+ <string name="scope_devices">Liste des appareils</string>
+ <string name="scope_transfer">Déplacer la lecture</string>
+ <string name="scope_private_playlists">Ajouter aux playlists privées</string>
+ <string name="scope_public_playlists">Ajouter aux playlists publiques</string>
+ <string name="enter_client_id">Saisissez le client ID.</string>
+ <string name="needs_your_app">Votre propre application Spotify est nécessaire : configurez-la dans Rechercher.</string>
+
+ <string name="turn_on_search">ACTIVER LA RECHERCHE</string>
+ <string name="web_api_explainer">La recherche passe par l\'API web de Spotify, limitée en nombre de requêtes par application. Enregistrez une app dans le tableau de bord développeur et collez ici son client ID : la limite n\'est alors qu\'à vous.</string>
+ <string name="redirect_uri_note">Ce Redirect URI doit être ajouté à l\'app, à l\'identique :</string>
+
+ <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_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_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>
+ <string name="onboarding_step_create">En haut à droite, appuyez sur « Create app ».</string>
+ <string name="onboarding_step_names">App name et App description : ce que vous voulez, par exemple Square. Website : laissez vide.</string>
+ <string name="onboarding_step_redirect">Redirect URI : collez la ligne ci-dessous et appuyez sur « Add ». Vérifiez qu\'elle apparaît dans la liste sous le champ, sinon elle n\'est pas enregistrée.</string>
+ <string name="onboarding_step_api">À « Which API/SDKs are you planning to use? », cochez Web API.</string>
+ <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_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>
+ <string name="onboarding_paste_error">Si le navigateur affiche une erreur, revenez à l\'étape précédente : presque toujours le Redirect URI n\'a pas été ajouté à la liste.</string>
+ <string name="onboarding_done_title">Tout est prêt</string>
+ <string name="onboarding_done_1">L\'accueil contient vos playlists, et la loupe cherche dans tout le catalogue.</string>
+ <string name="onboarding_done_2">Dans le lecteur, balayez pour changer de titre et ouvrez paroles, file et effets depuis la barre sous la pochette.</string>
+ <string name="onboarding_done_3">Vous pouvez revoir ce guide depuis les Réglages, en touchant votre photo sur l\'accueil.</string>
+
+ <string name="browser_return">Vous pouvez revenir à l\'app.</string>
+</resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
new file mode 100644
index 0000000..25c0748
--- /dev/null
+++ b/app/src/main/res/values-it/strings.xml
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- The originals: the app was written in Italian, and this is that text. -->
+<resources>
+ <string name="back">Indietro</string>
+ <string name="close">Chiudi</string>
+ <string name="skip">Salta</string>
+ <string name="next_step">Avanti</string>
+ <string name="copy">Copia</string>
+ <string name="cancel">Annulla</string>
+ <string name="save">Salva</string>
+ <string name="clear">Cancella</string>
+ <string name="retry">Riprova</string>
+ <string name="log_out">Esci</string>
+ <string name="refresh">Aggiorna</string>
+ <string name="more">Altro</string>
+ <string name="sort">Ordina</string>
+ <string name="name">Nome</string>
+ <string name="title">Titolo</string>
+ <string name="artist">Artista</string>
+ <string name="album">Album</string>
+ <string name="playlist">Playlist</string>
+ <string name="duration">Durata</string>
+ <string name="tracks">Brani</string>
+ <string name="artists">Artisti</string>
+ <string name="albums">Album</string>
+ <string name="playlists">Playlist</string>
+ <string name="shuffle">Casuale</string>
+ <string name="play">Riproduci</string>
+ <string name="pause">Pausa</string>
+ <string name="previous">Precedente</string>
+ <string name="next">Successivo</string>
+ <string name="repeat">Ripeti</string>
+ <string name="reset">Azzera</string>
+ <string name="off">Off</string>
+ <string name="queue">Coda</string>
+ <string name="lyrics">Testo</string>
+ <string name="effects">Effetti</string>
+ <string name="cover">Copertina</string>
+ <string name="devices">Dispositivi</string>
+ <string name="settings">Impostazioni</string>
+ <string name="home">Home</string>
+ <string name="library">Libreria</string>
+ <string name="search">Cerca</string>
+ <string name="now_playing">In riproduzione</string>
+ <string name="unofficial_client">Client non ufficiale per account Premium</string>
+ <string name="log_in_with_spotify">Accedi con Spotify</string>
+ <string name="connect">Collega</string>
+ <string name="client_id">Client id</string>
+
+ <string name="good_morning">Buongiorno</string>
+ <string name="good_afternoon">Buon pomeriggio</string>
+ <string name="good_evening">Buonasera</string>
+ <string name="feed_all">Tutto</string>
+ <string name="feed_for_you">Per te</string>
+ <string name="feed_releases">Novità</string>
+ <string name="your_playlists">Le tue playlist</string>
+ <string name="listening_artists">Artisti che ascolti</string>
+ <string name="play_again">Riascolta</string>
+ <string name="on_repeat">In loop in questo periodo</string>
+ <string name="jump_back_in">Riprendi da dove eri</string>
+ <string name="new_from_your_artists">Nuovo dai tuoi artisti</string>
+ <string name="all_time_favourites">I tuoi grandi classici</string>
+ <string name="cannot_connect">Impossibile connettersi a Spotify.</string>
+ <string name="rootlist_unavailable">rootlist non disponibile</string>
+
+ <string name="recently_opened">Aperte di recente</string>
+ <string name="spotify_order">Ordine di Spotify</string>
+ <string name="change_layout">Cambia disposizione</string>
+ <string name="playlist_count">%1$d playlist</string>
+
+ <string name="playlist_order">Ordine della playlist</string>
+ <string name="recently_added">Aggiunti di recente</string>
+ <string name="top_tracks">Brani principali</string>
+ <string name="search_in_tracks">Cerca fra i brani</string>
+ <string name="no_tracks">Nessun brano</string>
+ <string name="no_results_for">Nessun risultato per “%1$s”</string>
+ <string name="more_tracks_coming">Altri brani in arrivo</string>
+ <string name="track_count_and_length"> · %1$d brani · %2$s</string>
+ <string name="hours_minutes">%1$dh %2$dmin</string>
+ <string name="minutes_only">%1$dmin</string>
+ <string name="artist_needs_app">Per aprire un artista serve la tua applicazione Spotify, configurala in Cerca.</string>
+
+ <string name="add_to_queue">Aggiungi alla coda</string>
+ <string name="add_to_playlist">Aggiungi a una playlist</string>
+ <string name="copy_link">Copia link</string>
+ <string name="remove_from_playlist">Rimuovi dalla playlist</string>
+ <string name="queued">In coda</string>
+ <string name="added_to">Aggiunto a %1$s</string>
+ <string name="no_playlists_in_account">Nessuna playlist nel tuo account</string>
+ <string name="track_cannot_be_added">Questo brano non può essere aggiunto.</string>
+ <string name="connect_app_in_settings">Collega la tua applicazione nelle impostazioni.</string>
+ <string name="add_failed">Non è stato possibile aggiungere a %1$s. Se la playlist non è tua, non puoi modificarla.</string>
+
+ <string name="play_on">Riproduci su</string>
+ <string name="no_devices">Nessun dispositivo disponibile</string>
+ <string name="queue_empty">La coda è vuota</string>
+ <string name="no_lyrics">Nessun testo per questo brano</string>
+ <string name="speed">Velocità</string>
+ <string name="pitch">Tonalità</string>
+ <string name="reverb">Riverbero</string>
+ <string name="save_preset">Salva preimpostazione</string>
+ <string name="delete_preset">Elimina %1$s</string>
+ <string name="shuffle_play">Riproduzione casuale</string>
+ <string name="unnamed">Senza nome</string>
+ <string name="preset_original">Originale</string>
+
+ <string name="search_placeholder">Brani, artisti, album, playlist</string>
+ <string name="search_prompt">Cerca qualcosa da ascoltare</string>
+
+ <string name="account">Account</string>
+ <string name="not_connected">Non connesso</string>
+ <string name="log_in_to_resume">Accedi per riprendere</string>
+ <string name="connect_device">Dispositivo Connect</string>
+ <string name="web_api">API web</string>
+ <string name="application">Applicazione</string>
+ <string name="connected">Collegata</string>
+ <string name="disconnect">Scollega</string>
+ <string name="guide">Guida</string>
+ <string name="see_setup_again">Rivedi la configurazione guidata</string>
+ <string name="permissions_asked">Permessi richiesti</string>
+ <string name="permissions_note">Un\'applicazione collegata prima di un aggiornamento va ricollegata per concedere i permessi aggiunti dopo: le sezioni che li usano restano vuote finché non lo fai.</string>
+ <string name="developed_by">Sviluppato da</string>
+ <string name="about">Informazioni</string>
+ <string name="version">Versione</string>
+ <string name="licences">Licenze</string>
+ <string name="scope_top_artists">Artisti che ascolti</string>
+ <string name="scope_history">Cronologia dell\'account</string>
+ <string name="scope_devices">Elenco dispositivi</string>
+ <string name="scope_transfer">Sposta la riproduzione</string>
+ <string name="scope_private_playlists">Aggiungi a playlist private</string>
+ <string name="scope_public_playlists">Aggiungi a playlist pubbliche</string>
+ <string name="enter_client_id">Inserisci il client id.</string>
+ <string name="needs_your_app">Serve la tua applicazione Spotify: configurala in Cerca.</string>
+
+ <string name="turn_on_search">ATTIVA LA RICERCA</string>
+ <string name="web_api_explainer">La ricerca usa le API web di Spotify, che hanno un limite di richieste per applicazione. Registra un\'app nel dashboard per sviluppatori e incolla qui il suo client id: così il limite è solo tuo.</string>
+ <string name="redirect_uri_note">Nell\'app va aggiunto questo Redirect URI, identico:</string>
+
+ <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_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_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>
+ <string name="onboarding_step_create">In alto a destra premi «Create app».</string>
+ <string name="onboarding_step_names">App name e App description: scrivi quello che vuoi, per esempio Square. Website: lascia vuoto.</string>
+ <string name="onboarding_step_redirect">Redirect URI: incolla la riga qui sotto e premi «Add». Controlla che compaia nell\'elenco sotto al campo, altrimenti non viene salvata.</string>
+ <string name="onboarding_step_api">Alla voce «Which API/SDKs are you planning to use?» spunta Web API.</string>
+ <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_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>
+ <string name="onboarding_paste_error">Se il browser dà errore, torna al passo prima: quasi sempre il Redirect URI non è stato aggiunto all\'elenco.</string>
+ <string name="onboarding_done_title">Tutto pronto</string>
+ <string name="onboarding_done_1">In home ci sono le tue playlist, con la lente cerchi in tutto il catalogo.</string>
+ <string name="onboarding_done_2">Nel player scorri per cambiare brano e apri testi, coda ed effetti dalla barra sotto la copertina.</string>
+ <string name="onboarding_done_3">Puoi rivedere questa guida da Impostazioni, toccando la tua foto in home.</string>
+
+ <string name="browser_return">Puoi tornare all\'app.</string>
+</resources>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
new file mode 100644
index 0000000..d3ad539
--- /dev/null
+++ b/app/src/main/res/values-pt/strings.xml
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="back">Voltar</string>
+ <string name="close">Fechar</string>
+ <string name="skip">Pular</string>
+ <string name="next_step">Avançar</string>
+ <string name="copy">Copiar</string>
+ <string name="cancel">Cancelar</string>
+ <string name="save">Salvar</string>
+ <string name="clear">Limpar</string>
+ <string name="retry">Tentar de novo</string>
+ <string name="log_out">Sair</string>
+ <string name="refresh">Atualizar</string>
+ <string name="more">Mais</string>
+ <string name="sort">Ordenar</string>
+ <string name="name">Nome</string>
+ <string name="title">Título</string>
+ <string name="artist">Artista</string>
+ <string name="album">Álbum</string>
+ <string name="playlist">Playlist</string>
+ <string name="duration">Duração</string>
+ <string name="tracks">Faixas</string>
+ <string name="artists">Artistas</string>
+ <string name="albums">Álbuns</string>
+ <string name="playlists">Playlists</string>
+ <string name="shuffle">Aleatório</string>
+ <string name="play">Tocar</string>
+ <string name="pause">Pausar</string>
+ <string name="previous">Anterior</string>
+ <string name="next">Próxima</string>
+ <string name="repeat">Repetir</string>
+ <string name="reset">Zerar</string>
+ <string name="off">Off</string>
+ <string name="queue">Fila</string>
+ <string name="lyrics">Letra</string>
+ <string name="effects">Efeitos</string>
+ <string name="cover">Capa</string>
+ <string name="devices">Dispositivos</string>
+ <string name="settings">Configurações</string>
+ <string name="home">Início</string>
+ <string name="library">Biblioteca</string>
+ <string name="search">Buscar</string>
+ <string name="now_playing">Tocando agora</string>
+ <string name="unofficial_client">Cliente não oficial para contas Premium</string>
+ <string name="log_in_with_spotify">Entrar com o Spotify</string>
+ <string name="connect">Conectar</string>
+ <string name="client_id">Client ID</string>
+
+ <string name="good_morning">Bom dia</string>
+ <string name="good_afternoon">Boa tarde</string>
+ <string name="good_evening">Boa noite</string>
+ <string name="feed_all">Tudo</string>
+ <string name="feed_for_you">Para você</string>
+ <string name="feed_releases">Novidades</string>
+ <string name="your_playlists">Suas playlists</string>
+ <string name="listening_artists">Artistas que você ouve</string>
+ <string name="play_again">Ouvir de novo</string>
+ <string name="on_repeat">No repeat ultimamente</string>
+ <string name="jump_back_in">Continue de onde parou</string>
+ <string name="new_from_your_artists">Novidades dos seus artistas</string>
+ <string name="all_time_favourites">Seus clássicos de sempre</string>
+ <string name="cannot_connect">Não foi possível conectar ao Spotify.</string>
+ <string name="rootlist_unavailable">playlists indisponíveis</string>
+
+ <string name="recently_opened">Abertas há pouco</string>
+ <string name="spotify_order">Ordem do Spotify</string>
+ <string name="change_layout">Mudar a disposição</string>
+ <string name="playlist_count">%1$d playlists</string>
+
+ <string name="playlist_order">Ordem da playlist</string>
+ <string name="recently_added">Adicionadas há pouco</string>
+ <string name="top_tracks">Faixas principais</string>
+ <string name="search_in_tracks">Buscar entre as faixas</string>
+ <string name="no_tracks">Nenhuma faixa</string>
+ <string name="no_results_for">Nenhum resultado para “%1$s”</string>
+ <string name="more_tracks_coming">Mais faixas a caminho</string>
+ <string name="track_count_and_length"> · %1$d faixas · %2$s</string>
+ <string name="hours_minutes">%1$dh %2$dmin</string>
+ <string name="minutes_only">%1$dmin</string>
+ <string name="artist_needs_app">Para abrir um artista é preciso a sua própria aplicação do Spotify: configure-a em Buscar.</string>
+
+ <string name="add_to_queue">Adicionar à fila</string>
+ <string name="add_to_playlist">Adicionar a uma playlist</string>
+ <string name="copy_link">Copiar link</string>
+ <string name="remove_from_playlist">Remover da playlist</string>
+ <string name="queued">Na fila</string>
+ <string name="added_to">Adicionado a %1$s</string>
+ <string name="no_playlists_in_account">Nenhuma playlist na sua conta</string>
+ <string name="track_cannot_be_added">Esta faixa não pode ser adicionada.</string>
+ <string name="connect_app_in_settings">Conecte a sua aplicação nas configurações.</string>
+ <string name="add_failed">Não foi possível adicionar a %1$s. Se a playlist não é sua, você não pode alterá-la.</string>
+
+ <string name="play_on">Tocar em</string>
+ <string name="no_devices">Nenhum dispositivo disponível</string>
+ <string name="queue_empty">A fila está vazia</string>
+ <string name="no_lyrics">Sem letra para esta faixa</string>
+ <string name="speed">Velocidade</string>
+ <string name="pitch">Tom</string>
+ <string name="reverb">Reverb</string>
+ <string name="save_preset">Salvar predefinição</string>
+ <string name="delete_preset">Excluir %1$s</string>
+ <string name="shuffle_play">Reprodução aleatória</string>
+ <string name="unnamed">Sem nome</string>
+ <string name="preset_original">Original</string>
+
+ <string name="search_placeholder">Faixas, artistas, álbuns, playlists</string>
+ <string name="search_prompt">Procure algo para ouvir</string>
+
+ <string name="account">Conta</string>
+ <string name="not_connected">Não conectado</string>
+ <string name="log_in_to_resume">Entre para continuar</string>
+ <string name="connect_device">Dispositivo Connect</string>
+ <string name="web_api">API web</string>
+ <string name="application">Aplicação</string>
+ <string name="connected">Conectada</string>
+ <string name="disconnect">Desconectar</string>
+ <string name="guide">Guia</string>
+ <string name="see_setup_again">Rever a configuração guiada</string>
+ <string name="permissions_asked">Permissões solicitadas</string>
+ <string name="permissions_note">Uma aplicação conectada antes de uma atualização precisa ser reconectada para conceder as permissões acrescentadas depois: as seções que as usam ficam vazias até lá.</string>
+ <string name="developed_by">Desenvolvido por</string>
+ <string name="about">Sobre</string>
+ <string name="version">Versão</string>
+ <string name="licences">Licenças</string>
+ <string name="scope_top_artists">Artistas que você ouve</string>
+ <string name="scope_history">Histórico da conta</string>
+ <string name="scope_devices">Lista de dispositivos</string>
+ <string name="scope_transfer">Mover a reprodução</string>
+ <string name="scope_private_playlists">Adicionar a playlists privadas</string>
+ <string name="scope_public_playlists">Adicionar a playlists públicas</string>
+ <string name="enter_client_id">Informe o client ID.</string>
+ <string name="needs_your_app">É preciso a sua própria aplicação do Spotify: configure-a em Buscar.</string>
+
+ <string name="turn_on_search">ATIVE A BUSCA</string>
+ <string name="web_api_explainer">A busca usa a API web do Spotify, que tem um limite de requisições por aplicação. Registre um app no painel de desenvolvedores e cole aqui o client ID dele: assim o limite é só seu.</string>
+ <string name="redirect_uri_note">No app é preciso acrescentar este Redirect URI, idêntico:</string>
+
+ <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_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_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>
+ <string name="onboarding_step_create">No alto à direita toque em «Create app».</string>
+ <string name="onboarding_step_names">App name e App description: o que você quiser, por exemplo Square. Website: deixe vazio.</string>
+ <string name="onboarding_step_redirect">Redirect URI: cole a linha abaixo e toque em «Add». Confira que ela aparece na lista sob o campo, senão não é salva.</string>
+ <string name="onboarding_step_api">Em «Which API/SDKs are you planning to use?» marque Web API.</string>
+ <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_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>
+ <string name="onboarding_paste_error">Se o navegador der erro, volte um passo: quase sempre o Redirect URI não foi acrescentado à lista.</string>
+ <string name="onboarding_done_title">Tudo pronto</string>
+ <string name="onboarding_done_1">No início ficam suas playlists, e com a lupa você busca em todo o catálogo.</string>
+ <string name="onboarding_done_2">No player deslize para trocar de faixa e abra letra, fila e efeitos na barra sob a capa.</string>
+ <string name="onboarding_done_3">Dá para rever este guia nas Configurações, tocando na sua foto no início.</string>
+
+ <string name="browser_return">Você já pode voltar ao app.</string>
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e5a5671..c04d553 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,4 +1,189 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+ The app's text, in English.
+
+ English is the base rather than Italian even though Italian is what it was
+ written in: a locale nobody translated falls back to this file, and English
+ is the one a stranger is likeliest to read. The Italian originals live in
+ values-it.
+-->
<resources>
<string name="app_name">Square</string>
+
+ <!-- Shared -->
+ <string name="back">Back</string>
+ <string name="close">Close</string>
+ <string name="skip">Skip</string>
+ <string name="next_step">Next</string>
+ <string name="copy">Copy</string>
+ <string name="cancel">Cancel</string>
+ <string name="save">Save</string>
+ <string name="clear">Clear</string>
+ <string name="retry">Retry</string>
+ <string name="log_out">Log out</string>
+ <string name="refresh">Refresh</string>
+ <string name="more">More</string>
+ <string name="sort">Sort</string>
+ <string name="name">Name</string>
+ <string name="title">Title</string>
+ <string name="artist">Artist</string>
+ <string name="album">Album</string>
+ <string name="playlist">Playlist</string>
+ <string name="duration">Length</string>
+ <string name="tracks">Songs</string>
+ <string name="artists">Artists</string>
+ <string name="albums">Albums</string>
+ <string name="playlists">Playlists</string>
+ <string name="shuffle">Shuffle</string>
+ <string name="play">Play</string>
+ <string name="pause">Pause</string>
+ <string name="previous">Previous</string>
+ <string name="next">Next</string>
+ <string name="repeat">Repeat</string>
+ <string name="reset">Reset</string>
+ <string name="off">Off</string>
+ <string name="queue">Queue</string>
+ <string name="lyrics">Lyrics</string>
+ <string name="effects">Effects</string>
+ <string name="cover">Cover</string>
+ <string name="devices">Devices</string>
+ <string name="settings">Settings</string>
+ <string name="home">Home</string>
+ <string name="library">Library</string>
+ <string name="search">Search</string>
+ <string name="now_playing">Now playing</string>
+ <string name="unofficial_client">Unofficial client for Premium accounts</string>
+ <string name="log_in_with_spotify">Log in with Spotify</string>
+ <string name="connect">Connect</string>
+ <string name="client_id">Client ID</string>
+
+ <!-- Home -->
+ <string name="good_morning">Good morning</string>
+ <string name="good_afternoon">Good afternoon</string>
+ <string name="good_evening">Good evening</string>
+ <string name="feed_all">Everything</string>
+ <string name="feed_for_you">For you</string>
+ <string name="feed_releases">New</string>
+ <string name="your_playlists">Your playlists</string>
+ <string name="listening_artists">Artists you listen to</string>
+ <string name="play_again">Play again</string>
+ <string name="on_repeat">On repeat lately</string>
+ <string name="jump_back_in">Pick up where you left off</string>
+ <string name="new_from_your_artists">New from your artists</string>
+ <string name="all_time_favourites">Your all-time favourites</string>
+ <string name="cannot_connect">Could not reach Spotify.</string>
+ <string name="rootlist_unavailable">playlists unavailable</string>
+
+ <!-- Library -->
+ <string name="recently_opened">Recently opened</string>
+ <string name="spotify_order">Spotify\'s order</string>
+ <string name="change_layout">Change layout</string>
+ <string name="playlist_count">%1$d playlists</string>
+
+ <!-- Playlist, album, artist -->
+ <string name="playlist_order">Playlist order</string>
+ <string name="recently_added">Recently added</string>
+ <string name="top_tracks">Top songs</string>
+ <string name="search_in_tracks">Search these songs</string>
+ <string name="no_tracks">No songs</string>
+ <string name="no_results_for">No results for “%1$s”</string>
+ <string name="more_tracks_coming">More songs on the way</string>
+ <string name="track_count_and_length"> · %1$d songs · %2$s</string>
+ <string name="hours_minutes">%1$dh %2$dmin</string>
+ <string name="minutes_only">%1$dmin</string>
+ <string name="artist_needs_app">Opening an artist needs your own Spotify application; set it up in Search.</string>
+
+ <!-- Track menu -->
+ <string name="add_to_queue">Add to queue</string>
+ <string name="add_to_playlist">Add to a playlist</string>
+ <string name="copy_link">Copy link</string>
+ <string name="remove_from_playlist">Remove from playlist</string>
+ <string name="queued">Queued</string>
+ <string name="added_to">Added to %1$s</string>
+ <string name="no_playlists_in_account">No playlists in your account</string>
+ <string name="track_cannot_be_added">This song cannot be added.</string>
+ <string name="connect_app_in_settings">Connect your application in settings.</string>
+ <string name="add_failed">%1$s could not be added to. If the playlist is not yours, you cannot change it.</string>
+
+ <!-- Player -->
+ <string name="play_on">Play on</string>
+ <string name="no_devices">No devices available</string>
+ <string name="queue_empty">The queue is empty</string>
+ <string name="no_lyrics">No lyrics for this song</string>
+ <string name="speed">Speed</string>
+ <string name="pitch">Pitch</string>
+ <string name="reverb">Reverb</string>
+ <string name="save_preset">Save preset</string>
+ <string name="delete_preset">Delete %1$s</string>
+ <string name="shuffle_play">Shuffle</string>
+ <string name="unnamed">Unnamed</string>
+ <string name="preset_original">Original</string>
+
+ <!-- Search -->
+ <string name="search_placeholder">Songs, artists, albums, playlists</string>
+ <string name="search_prompt">Search for something to listen to</string>
+
+ <!-- Settings -->
+ <string name="account">Account</string>
+ <string name="not_connected">Not connected</string>
+ <string name="log_in_to_resume">Log in to carry on</string>
+ <string name="connect_device">Connect device</string>
+ <string name="web_api">Web API</string>
+ <string name="application">Application</string>
+ <string name="connected">Connected</string>
+ <string name="disconnect">Disconnect</string>
+ <string name="guide">Guide</string>
+ <string name="see_setup_again">Go through the setup again</string>
+ <string name="permissions_asked">Permissions asked for</string>
+ <string name="permissions_note">An application connected before an update has to be reconnected to grant the permissions added since: the sections that use them stay empty until you do.</string>
+ <string name="developed_by">Developed by</string>
+ <string name="about">About</string>
+ <string name="version">Version</string>
+ <string name="licences">Licences</string>
+ <string name="scope_top_artists">Artists you listen to</string>
+ <string name="scope_history">Account history</string>
+ <string name="scope_devices">Device list</string>
+ <string name="scope_transfer">Move playback</string>
+ <string name="scope_private_playlists">Add to private playlists</string>
+ <string name="scope_public_playlists">Add to public playlists</string>
+ <string name="enter_client_id">Enter the client ID.</string>
+ <string name="needs_your_app">You need your own Spotify application: set it up in Search.</string>
+
+ <!-- Web API setup -->
+ <string name="turn_on_search">TURN ON SEARCH</string>
+ <string name="web_api_explainer">Search goes through Spotify\'s web API, which has a request limit per application. Register an app in the developer dashboard and paste its client ID here: then the limit is yours alone.</string>
+ <string name="redirect_uri_note">This exact Redirect URI has to be added to the app:</string>
+
+ <!-- Onboarding -->
+ <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_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_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>
+ <string name="onboarding_step_create">Top right, press «Create app».</string>
+ <string name="onboarding_step_names">App name and App description: anything you like, for instance Square. Website: leave it empty.</string>
+ <string name="onboarding_step_redirect">Redirect URI: paste the line below and press «Add». Check that it appears in the list under the field, or it is not saved.</string>
+ <string name="onboarding_step_api">Under «Which API/SDKs are you planning to use?» tick Web API.</string>
+ <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_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>
+ <string name="onboarding_paste_error">If the browser shows an error, go back one step: nearly always the Redirect URI was not added to the list.</string>
+ <string name="onboarding_done_title">All set</string>
+ <string name="onboarding_done_1">Home has your playlists, and the lens searches the whole catalogue.</string>
+ <string name="onboarding_done_2">In the player, swipe to change song and open lyrics, queue and effects from the bar under the cover.</string>
+ <string name="onboarding_done_3">You can see this guide again from Settings, by tapping your picture on the home page.</string>
+
+ <!-- Auth -->
+ <string name="browser_return">You can go back to the app.</string>
</resources>
diff --git a/app/src/main/res/xml/locales_config.xml b/app/src/main/res/xml/locales_config.xml
new file mode 100644
index 0000000..4a77af5
--- /dev/null
+++ b/app/src/main/res/xml/locales_config.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ The languages the app ships. Declaring them is what puts Square in Android's
+ per-app language picker, so the app can be read in one language while the
+ phone stays in another.
+-->
+<locale-config xmlns:android="http://schemas.android.com/apk/res/android">
+ <locale android:name="en" />
+ <locale android:name="it" />
+ <locale android:name="es" />
+ <locale android:name="fr" />
+ <locale android:name="de" />
+ <locale android:name="pt" />
+</locale-config>