Unofficial YouTube Music / Spotify Premium client for Android, built in Liquid Glass. Audio effects, Spotify Connect, listening history, 8 languages. Rust core on librespot.
Kotlin alternativeandroidandroid-applicationclientglassmorphisminnertubelibrespotliquid-glassspotifyspotify-connectspotifyapiyoutube-musicyoutube-playerytdlnis
One tap to update, not three
Leloniob50c256a1a62
diff --git a/app/src/main/java/dev/lelonio/square/data/Catalog.kt b/app/src/main/java/dev/lelonio/square/data/Catalog.ktindex 27e7762..92e50a2 100644--- a/app/src/main/java/dev/lelonio/square/data/Catalog.kt+++ b/app/src/main/java/dev/lelonio/square/data/Catalog.kt@@ -154,9 +154,19 @@ object Catalog {)}+ /**+ * Spotify's DJ, which is not a playlist.+ *+ * The access point lists it among them, but it is a generated stream: it has+ * no track list to open, and opening it is the one thing a row in a library+ * promises. The same id for every account.+ */+ private const val DJ_URI = "spotify:playlist:37i9dQZF1EYkqdzj48dyYq"+/** The account's own playlists. */suspend fun playlists(): List<CatalogPlaylist> = withContext(Dispatchers.IO) {json.decodeFromString<List<CatalogPlaylist>>(NativeBridge.rootlist())+ .filterNot { it.uri == DJ_URI }}/**diff --git a/app/src/main/java/dev/lelonio/square/ui/settings/SettingsScreen.kt b/app/src/main/java/dev/lelonio/square/ui/settings/SettingsScreen.ktindex cbabad4..26f28da 100644--- a/app/src/main/java/dev/lelonio/square/ui/settings/SettingsScreen.kt+++ b/app/src/main/java/dev/lelonio/square/ui/settings/SettingsScreen.kt@@ -28,6 +28,8 @@ import androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifierimport androidx.compose.ui.res.stringResourceimport androidx.compose.ui.draw.clip+import androidx.activity.compose.rememberLauncherForActivityResult+import androidx.activity.result.contract.ActivityResultContractsimport androidx.compose.runtime.rememberCoroutineScopeimport androidx.compose.ui.platform.LocalContextimport androidx.compose.ui.platform.LocalUriHandler@@ -307,22 +309,29 @@ private fun UpdateRow() {else stringResource(R.string.update_failed)}- val busy = state is Updater.State.Checking || state is Updater.State.Downloading+ val busy = state is Updater.State.Checking ||+ state is Updater.State.Downloading ||+ state is Updater.State.Installing++ // Held across the trip to the system settings, so granting the permission+ // continues the install instead of ending in a row that has to be pressed+ // again.+ var pending by remember { mutableStateOf<Updater.State.Available?>(null) }+ val permission = rememberLauncherForActivityResult(+ ActivityResultContracts.StartActivityForResult(),+ ) {+ val update = pending ?: return@rememberLauncherForActivityResult+ pending = null+ scope.launch { if (updater.canInstall()) updater.install(update) }+ }Row(Modifier.fillMaxWidth().clickable(enabled = !busy) {- when (val current = state) {- is Updater.State.Available -> scope.launch { updater.install(current) }- is Updater.State.Failed ->- if (current.reason == Updater.REASON_PERMISSION) {- context.startActivity(updater.permissionIntent())- updater.dismiss()- } else {- scope.launch { updater.check() }- }- else -> scope.launch { updater.check() }+ scope.launch {+ pending = updater.checkAndInstall()+ pending?.let { permission.launch(updater.permissionIntent()) }}}.padding(horizontal = 18.dp, vertical = 14.dp),@@ -330,12 +339,8 @@ private fun UpdateRow() {horizontalArrangement = Arrangement.spacedBy(12.dp),) {Text(- stringResource(- if (state is Updater.State.Available) R.string.update_install- else R.string.check_for_updates,- ),+ stringResource(R.string.check_for_updates),style = MaterialTheme.typography.bodyLarge,- fontWeight = if (state is Updater.State.Available) FontWeight.Medium else FontWeight.Normal,modifier = Modifier.weight(1f),)if (status != null) {diff --git a/app/src/main/java/dev/lelonio/square/update/Updater.kt b/app/src/main/java/dev/lelonio/square/update/Updater.ktindex 5fe81df..6863548 100644--- a/app/src/main/java/dev/lelonio/square/update/Updater.kt+++ b/app/src/main/java/dev/lelonio/square/update/Updater.kt@@ -79,6 +79,28 @@ class Updater(context: Context) {_state.value = State.Available(result.version, result.url, result.bytes)}+ /**+ * Checks, and installs whatever it finds, as one action.+ *+ * Split in two internally but never in the interface: "there is an update"+ * is not a decision the user has anything to decide with — they pressed a+ * row that says update, and being asked again is a step, not a safeguard.+ * The safeguard is Android's own dialog, which no app can skip.+ *+ * @return the update it could not install without permission, so the caller+ * can ask for it and come back here rather than starting over.+ */+ suspend fun checkAndInstall(): State.Available? {+ check()+ val update = _state.value as? State.Available ?: return null+ if (!canInstall()) {+ _state.value = State.Failed(REASON_PERMISSION)+ return update+ }+ install(update)+ return null+ }+private data class Release(val version: String, val url: String, val bytes: Long)private fun latestRelease(): Release? {@@ -193,11 +215,16 @@ class Updater(context: Context) {fun canInstall(): Boolean =Build.VERSION.SDK_INT < Build.VERSION_CODES.O || app.packageManager.canRequestPackageInstalls()- /** The settings page where that permission is granted. */+ /**+ * The settings page where that permission is granted.+ *+ * No `NEW_TASK` flag: it is started for a result, so the caller is told when+ * the user comes back and can carry on with the install they already asked+ * for rather than making them press the row a second time.+ */fun permissionIntent(): Intent =Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES).setData(Uri.parse("package:${app.packageName}"))- .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)fun dismiss() {_state.value = State.Idlediff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xmlindex b6b62a2..4597d5d 100644--- a/app/src/main/res/values-de/strings.xml+++ b/app/src/main/res/values-de/strings.xml@@ -172,7 +172,6 @@<string name="update_checking">Wird geprüft…</string><string name="update_none">Aktuell</string><string name="update_available">%1$s verfügbar</string>- <string name="update_install">Update installieren</string><string name="update_downloading">Wird geladen…</string><string name="update_installing">Warte auf deine Bestätigung</string><string name="update_needs_permission">Installation erlauben — tippen</string>diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xmlindex d2baf04..66f36f8 100644--- a/app/src/main/res/values-es/strings.xml+++ b/app/src/main/res/values-es/strings.xml@@ -172,7 +172,6 @@<string name="update_checking">Comprobando…</string><string name="update_none">Ya está al día</string><string name="update_available">%1$s disponible</string>- <string name="update_install">Instalar la actualización</string><string name="update_downloading">Descargando…</string><string name="update_installing">Esperando tu confirmación</string><string name="update_needs_permission">Permite la instalación — toca</string>diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xmlindex 5869eea..cdab14e 100644--- a/app/src/main/res/values-fr/strings.xml+++ b/app/src/main/res/values-fr/strings.xml@@ -172,7 +172,6 @@<string name="update_checking">Vérification…</string><string name="update_none">À jour</string><string name="update_available">%1$s disponible</string>- <string name="update_install">Installer la mise à jour</string><string name="update_downloading">Téléchargement…</string><string name="update_installing">En attente de votre confirmation</string><string name="update_needs_permission">Autorisez l\'installation — touchez</string>diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xmlindex f340033..87e340b 100644--- a/app/src/main/res/values-it/strings.xml+++ b/app/src/main/res/values-it/strings.xml@@ -173,7 +173,6 @@<string name="update_checking">Controllo…</string><string name="update_none">Già aggiornata</string><string name="update_available">%1$s disponibile</string>- <string name="update_install">Installa l\'aggiornamento</string><string name="update_downloading">Scarico…</string><string name="update_installing">Aspetto la tua conferma</string><string name="update_needs_permission">Consenti l\'installazione — tocca</string>diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xmlindex c606e0a..086cf26 100644--- a/app/src/main/res/values-pt/strings.xml+++ b/app/src/main/res/values-pt/strings.xml@@ -172,7 +172,6 @@<string name="update_checking">A verificar…</string><string name="update_none">Já atualizada</string><string name="update_available">%1$s disponível</string>- <string name="update_install">Instalar a atualização</string><string name="update_downloading">A transferir…</string><string name="update_installing">À espera da tua confirmação</string><string name="update_needs_permission">Permite a instalação — toca</string>diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xmlindex 3da42ff..a5531e9 100644--- a/app/src/main/res/values/strings.xml+++ b/app/src/main/res/values/strings.xml@@ -193,7 +193,6 @@<string name="update_checking">Checking…</string><string name="update_none">Up to date</string><string name="update_available">%1$s available</string>- <string name="update_install">Install the update</string><string name="update_downloading">Downloading…</string><string name="update_installing">Waiting for you to confirm</string><string name="update_needs_permission">Allow installing — tap</string>