feat: open module configuration from the store install bar

Author: xihale

manager-ui/src/main/kotlin/org/matrix/vector/ui/store/RepoDetailsScreen.kt

@@ -113,6 +113,7 @@ fun RepoDetailsScreen(
     packageName: String,
     onNavigateBack: () -> Unit,
     onOpenUrl: (String) -> Unit,
+    onOpenScope: (packageName: String, userId: Int) -> Unit,
     dataSource: StoreDataSource,
     settings: StoreSettings,
     host: StoreInstallHost? = null,
@@ -137,6 +138,7 @@ fun RepoDetailsScreen(
     val installedScope by viewModel.installedScope.collectAsState()
     val installedIsLegacy by viewModel.installedIsLegacy.collectAsState()
     val install by viewModel.installState.collectAsState()
+    val installedUserId by viewModel.installedUserId.collectAsState()
 
     var choosing by remember { mutableStateOf<Release?>(null) }
     var optionsOpen by remember { mutableStateOf(false) }
@@ -204,6 +206,8 @@ fun RepoDetailsScreen(
                         else choosing = release
                     },
                     onAcknowledge = viewModel::acknowledgeInstall,
+                    installedUserId = installedUserId,
+                    onOpenScope = { onOpenScope(packageName, it) },
                 )
             }
         },
@@ -378,6 +382,9 @@ private fun InstallBar(
     install: InstallStep,
     onInstall: (Release) -> Unit,
     onAcknowledge: () -> Unit,
+    /** The installed copy's user id, so the "Manage" button can open the configuration screen. */
+    installedUserId: Int?,
+    onOpenScope: (userId: Int) -> Unit,
 ) {
     val context = LocalContext.current
     val newest = state.releases.firstOrNull { it.apks.isNotEmpty() } ?: return
@@ -449,31 +456,46 @@ private fun InstallBar(
                     }
                 }
                 else -> {
-                    Button(
-                        onClick = {
-                            onAcknowledge()
-                            onInstall(newest)
-                        },
-                        modifier = Modifier.fillMaxWidth(),
-                    ) {
-                        Icon(
-                            Icons.Rounded.Download,
-                            contentDescription = null,
-                            modifier = Modifier.size(18.dp),
-                        )
-                        Spacer(Modifier.width(8.dp))
-                        Text(
-                            when {
-                                state.upgradable ->
-                                    stringResource(
-                                        if (state.sameVersion) UiR.string.store_badge_reinstall
-                                        else UiR.string.store_badge_update,
-                                        state.latest?.versionName.orEmpty(),
-                                    )
-                                state.installed != null -> stringResource(UiR.string.store_reinstall)
-                                else -> stringResource(UiR.string.store_install)
-                            }
-                        )
+                    // Installed and current — the next thing is to configure it, not reinstall it.
+                    if (state.installed != null && !state.upgradable && installedUserId != null) {
+                        FilledTonalButton(
+                            onClick = { onOpenScope(installedUserId) },
+                            modifier = Modifier.fillMaxWidth(),
+                        ) {
+                            Icon(
+                                Icons.Rounded.Tune,
+                                contentDescription = null,
+                                modifier = Modifier.size(18.dp),
+                            )
+                            Spacer(Modifier.width(8.dp))
+                            Text(stringResource(UiR.string.nav_manage))
+                        }
+                    } else {
+                        Button(
+                            onClick = {
+                                onAcknowledge()
+                                onInstall(newest)
+                            },
+                            modifier = Modifier.fillMaxWidth(),
+                        ) {
+                            Icon(
+                                Icons.Rounded.Download,
+                                contentDescription = null,
+                                modifier = Modifier.size(18.dp),
+                            )
+                            Spacer(Modifier.width(8.dp))
+                            Text(
+                                when {
+                                    state.upgradable ->
+                                        stringResource(
+                                            if (state.sameVersion) UiR.string.store_badge_reinstall
+                                            else UiR.string.store_badge_update,
+                                            state.latest?.versionName.orEmpty(),
+                                        )
+                                    else -> stringResource(UiR.string.store_install)
+                                }
+                            )
+                        }
                     }
                 }
             }

manager-ui/src/main/kotlin/org/matrix/vector/ui/store/RepoDetailsViewModel.kt

@@ -93,6 +93,10 @@ class RepoDetailsViewModel(
     val installedIsLegacy: StateFlow<Boolean> =
         host?.installedIsLegacy ?: MutableStateFlow(false).asStateFlow()
 
+    /** The user id of the installed copy, for the configuration screen; null when nothing is installed. */
+    val installedUserId: StateFlow<Int?> =
+        host?.installedUserId ?: MutableStateFlow<Int?>(null).asStateFlow()
+
     private val _detail = MutableStateFlow<OnlineModule?>(null)
     private val _fetch = MutableStateFlow(DetailFetch.Loading)
 

manager-ui/src/main/kotlin/org/matrix/vector/ui/store/StoreInstallHost.kt

@@ -23,6 +23,9 @@ interface StoreInstallHost {
     /** Whether the installed copy is a legacy-framework module (its scope names are swapped). */
     val installedIsLegacy: StateFlow<Boolean>
 
+    /** The user id of the installed copy, for the configuration screen; null when nothing is installed. */
+    val installedUserId: StateFlow<Int?>
+
     /** Download and install [asset], recording it against [releaseVersion]. */
     fun install(asset: ReleaseAsset, releaseVersion: RepoVersion?)
 

manager-ui/src/main/res/values-ar/strings_store.xml

@@ -58,7 +58,6 @@
     <string name="store_open_module">فتح صفحة الوحدة</string>
     <!-- Install -->
     <string name="store_install">تثبيت</string>
-    <string name="store_reinstall">إعادة التثبيت</string>
     <string name="store_choose_asset">اختر ملفًا للتثبيت</string>
     <plurals name="store_asset_downloads">
         <item quantity="zero">لا تنزيلات</item>

manager-ui/src/main/res/values-de/strings_store.xml

@@ -42,7 +42,6 @@
     <string name="store_open_module">Modulseite öffnen</string>
 
     <string name="store_install">Installieren</string>
-    <string name="store_reinstall">Neu installieren</string>
     <string name="store_choose_asset">Datei zur Installation wählen</string>
     <plurals name="store_asset_downloads">
         <item quantity="one">%1$d Download</item>

manager-ui/src/main/res/values-es/strings_store.xml

@@ -42,7 +42,6 @@
     <string name="store_open_module">Abrir la página del módulo</string>
 
     <string name="store_install">Instalar</string>
-    <string name="store_reinstall">Reinstalar</string>
     <string name="store_choose_asset">Elige el archivo que instalar</string>
     <plurals name="store_asset_downloads">
         <item quantity="one">%1$d descarga</item>

manager-ui/src/main/res/values-fa/strings_store.xml

@@ -50,7 +50,6 @@
     <string name="store_open_module">باز کردن صفحهٔ ماژول</string>
     <!-- Install -->
     <string name="store_install">نصب</string>
-    <string name="store_reinstall">نصب دوباره</string>
     <string name="store_choose_asset">پرونده‌ای برای نصب برگزینید</string>
     <plurals name="store_asset_downloads">
         <item quantity="one">%1$d بارگیری</item>

manager-ui/src/main/res/values-fr/strings_store.xml

@@ -42,7 +42,6 @@
     <string name="store_open_module">Ouvrir la page du module</string>
 
     <string name="store_install">Installer</string>
-    <string name="store_reinstall">Réinstaller</string>
     <string name="store_choose_asset">Choisir un fichier à installer</string>
     <plurals name="store_asset_downloads">
         <item quantity="one">%1$d téléchargement</item>

manager-ui/src/main/res/values-in/strings_store.xml

@@ -40,7 +40,6 @@
     <string name="store_open_module">Buka halaman modul</string>
 
     <string name="store_install">Pasang</string>
-    <string name="store_reinstall">Pasang ulang</string>
     <string name="store_choose_asset">Pilih berkas untuk dipasang</string>
     <plurals name="store_asset_downloads">
         <item quantity="other">%1$d unduhan</item>

manager-ui/src/main/res/values-it/strings_store.xml

@@ -42,7 +42,6 @@
     <string name="store_open_module">Apri la pagina del modulo</string>
 
     <string name="store_install">Installa</string>
-    <string name="store_reinstall">Reinstalla</string>
     <string name="store_choose_asset">Scegli un file da installare</string>
     <plurals name="store_asset_downloads">
         <item quantity="one">%1$d download</item>