Skip to content

Native Android client for Spotify, built with Jetpack Compose

Tapping an installed extension in the store (Store tab rows, repositories and GitHub discoveries, in both looks) opens its full page, the one the Installed tab opens, whatever source it was installed from with that id, instead of the reduced store page, which stays for extensions not installed and remains one tap away through "See in store" on the full page (ratings, downloads) [skip ci]

kota-zo87fb48596cd4
diff --git a/base/app/src/main/java/com/music/spotui/ui/immersive/pages/ImmersiveExtensionsScreen.kt b/base/app/src/main/java/com/music/spotui/ui/immersive/pages/ImmersiveExtensionsScreen.kt
index 9e31e3e7..6ec304cb 100644
--- a/base/app/src/main/java/com/music/spotui/ui/immersive/pages/ImmersiveExtensionsScreen.kt
+++ b/base/app/src/main/java/com/music/spotui/ui/immersive/pages/ImmersiveExtensionsScreen.kt
@@ -82,8 +82,8 @@ import com.music.spotui.ui.screens.installedRoute
import com.music.spotui.ui.screens.offer
import com.music.spotui.ui.screens.rememberEnabler
import com.music.spotui.ui.screens.rememberPackagePicker
+import com.music.spotui.ui.screens.rowRoute
import com.music.spotui.ui.screens.stateLine
-import com.music.spotui.ui.screens.storeRoute
import com.music.spotui.ui.screens.toastError
import kotlinx.coroutines.launch
@@ -176,7 +176,7 @@ fun ImmersiveExtensionsScreen(navController: NavController) {
entries.forEach { entry ->
row {
StoreRow(url, entry, Store.action(entry, installedCodes[entry.id], appVersion), entry.id in busy, registry,
- onOpen = { navController.navigate(storeRoute(entry.id)) },
+ onOpen = { navController.navigate(rowRoute(entry.id, entry.id in installedCodes)) },
onInstall = { scope.launch { installFromStore(ctx, url, entry) } },
onInstalled = { navController.navigate(installedRoute(entry.id)) })
}
@@ -191,7 +191,7 @@ fun ImmersiveExtensionsScreen(navController: NavController) {
row {
val entry = r.item
StoreRow(app.myspoti.extensions.Discovery.SOURCE, entry, Store.action(entry, installedCodes[entry.id], appVersion), entry.id in busy, registry,
- onOpen = { navController.navigate(storeRoute(entry.id)) },
+ onOpen = { navController.navigate(rowRoute(entry.id, entry.id in installedCodes)) },
onInstall = { scope.launch { installFromStore(ctx, app.myspoti.extensions.Discovery.SOURCE, entry) } },
onInstalled = { navController.navigate(installedRoute(entry.id)) },
rating = r.rating, hidden = app.myspoti.extensions.Ranking.hidden(r, blocks, System.currentTimeMillis()) != null)
diff --git a/base/app/src/main/java/com/music/spotui/ui/screens/ExtensionsScreen.kt b/base/app/src/main/java/com/music/spotui/ui/screens/ExtensionsScreen.kt
index 9853b53a..7790a994 100644
--- a/base/app/src/main/java/com/music/spotui/ui/screens/ExtensionsScreen.kt
+++ b/base/app/src/main/java/com/music/spotui/ui/screens/ExtensionsScreen.kt
@@ -83,6 +83,9 @@ import kotlinx.coroutines.launch
internal fun installedRoute(id: String) = "${Routes.Extension.route}/${Uri.encode(id)}"
internal fun storeRoute(id: String) = "${Routes.ExtensionEntry.route}/${Uri.encode(id)}"
+/** A store row's page: the installed extension's own page when that id is installed (whatever its source), else the store's page. */
+internal fun rowRoute(id: String, installed: Boolean) = if (installed) installedRoute(id) else storeRoute(id)
+
// ── The list: Store and Installed tabs, search, categories ──
@Composable
@@ -137,7 +140,7 @@ fun ExtensionsScreen(navController: NavController) {
repo.catalog?.extensions?.filter { Store.matches(it, query, category) }?.forEach { entry ->
shown++
StoreRow(url, entry, Store.action(entry, installedCodes[entry.id], appVersion), entry.id in busy, registry,
- onOpen = { navController.navigate(storeRoute(entry.id)) },
+ onOpen = { navController.navigate(rowRoute(entry.id, entry.id in installedCodes)) },
onInstall = { scope.launch { installFromStore(ctx, url, entry) } },
onInstalled = { navController.navigate(installedRoute(entry.id)) })
}
@@ -150,7 +153,7 @@ fun ExtensionsScreen(navController: NavController) {
val entry = r.item
shown++
StoreRow(app.myspoti.extensions.Discovery.SOURCE, entry, Store.action(entry, installedCodes[entry.id], appVersion), entry.id in busy, registry,
- onOpen = { navController.navigate(storeRoute(entry.id)) },
+ onOpen = { navController.navigate(rowRoute(entry.id, entry.id in installedCodes)) },
onInstall = { scope.launch { installFromStore(ctx, app.myspoti.extensions.Discovery.SOURCE, entry) } },
onInstalled = { navController.navigate(installedRoute(entry.id)) },
rating = r.rating, hidden = app.myspoti.extensions.Ranking.hidden(r, blocks, System.currentTimeMillis()) != null)