feat: make bundles selectable (#1237)

app/src/main/java/app/revanced/manager/di/ViewModelModule.kt

@@ -12,7 +12,6 @@ val viewModelModule = module {
     viewModelOf(::AdvancedSettingsViewModel)
     viewModelOf(::AppSelectorViewModel)
     viewModelOf(::VersionSelectorViewModel)
-    viewModelOf(::BundlesViewModel)
     viewModelOf(::InstallerViewModel)
     viewModelOf(::UpdateProgressViewModel)
     viewModelOf(::ManagerUpdateChangelogViewModel)

app/src/main/java/app/revanced/manager/ui/component/bundle/BundleItem.kt

@@ -1,6 +1,7 @@
 package app.revanced.manager.ui.component.bundle
 
-import androidx.compose.foundation.clickable
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -8,6 +9,7 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.ErrorOutline
 import androidx.compose.material.icons.outlined.Warning
+import androidx.compose.material3.Checkbox
 import androidx.compose.material3.Icon
 import androidx.compose.material3.ListItem
 import androidx.compose.material3.MaterialTheme
@@ -28,11 +30,16 @@ import app.revanced.manager.domain.bundles.PatchBundleSource
 import app.revanced.manager.domain.bundles.PatchBundleSource.Companion.propsOrNullFlow
 import kotlinx.coroutines.flow.map
 
+@OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun BundleItem(
     bundle: PatchBundleSource,
     onDelete: () -> Unit,
-    onUpdate: () -> Unit
+    onUpdate: () -> Unit,
+    selectable: Boolean,
+    onSelect: () -> Unit,
+    isBundleSelected: Boolean,
+    toggleSelection: (Boolean) -> Unit,
 ) {
     var viewBundleDialogPage by rememberSaveable { mutableStateOf(false) }
     val state by bundle.state.collectAsStateWithLifecycle()
@@ -57,9 +64,21 @@ fun BundleItem(
         modifier = Modifier
             .height(64.dp)
             .fillMaxWidth()
-            .clickable {
+            .combinedClickable(
-                viewBundleDialogPage = true
+                onClick = {
-            },
+                    viewBundleDialogPage = true
+                },
+                onLongClick = onSelect,
+            ),
+        leadingContent = {
+            if(selectable) {
+                Checkbox(
+                    checked = isBundleSelected,
+                    onCheckedChange = toggleSelection,
+                )
+            }
+        },
+
         headlineContent = {
             Text(
                 text = bundle.name,

app/src/main/java/app/revanced/manager/ui/screen/BundlesScreen.kt

@@ -1,35 +0,0 @@
-package app.revanced.manager.ui.screen
-
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.ui.Modifier
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import app.revanced.manager.ui.component.bundle.BundleItem
-import app.revanced.manager.ui.viewmodel.BundlesViewModel
-import org.koin.androidx.compose.getViewModel
-
-@Composable
-fun BundlesScreen(
-    vm: BundlesViewModel = getViewModel(),
-) {
-    val sources by vm.sources.collectAsStateWithLifecycle(initialValue = emptyList())
-
-    Column(
-        modifier = Modifier
-            .fillMaxSize(),
-    ) {
-        sources.forEach {
-            BundleItem(
-                bundle = it,
-                onDelete = {
-                    vm.delete(it)
-                },
-                onUpdate = {
-                    vm.update(it)
-                }
-            )
-        }
-    }
-}

app/src/main/java/app/revanced/manager/ui/screen/DashboardScreen.kt

@@ -8,14 +8,20 @@ import androidx.compose.foundation.pager.HorizontalPager
 import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Add
+import androidx.compose.material.icons.filled.Close
 import androidx.compose.material.icons.outlined.Apps
+import androidx.compose.material.icons.outlined.DeleteOutline
 import androidx.compose.material.icons.outlined.HelpOutline
+import androidx.compose.material.icons.outlined.Refresh
 import androidx.compose.material.icons.outlined.Settings
 import androidx.compose.material.icons.outlined.Source
 import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
@@ -26,8 +32,11 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import app.revanced.manager.R
+import app.revanced.manager.domain.bundles.PatchBundleSource.Companion.isDefault
 import app.revanced.manager.data.room.apps.installed.InstalledApp
 import app.revanced.manager.ui.component.AppTopBar
+import app.revanced.manager.ui.component.bundle.BundleItem
+import app.revanced.manager.ui.component.bundle.BundleTopBar
 import app.revanced.manager.ui.component.bundle.ImportBundleDialog
 import app.revanced.manager.ui.viewmodel.DashboardViewModel
 import app.revanced.manager.util.toast
@@ -51,6 +60,8 @@ fun DashboardScreen(
     onAppClick: (InstalledApp) -> Unit
 ) {
     var showImportBundleDialog by rememberSaveable { mutableStateOf(false) }
+
+    val bundlesSelectable by remember { derivedStateOf { vm.selectedSources.size > 0 } }
     val pages: Array<DashboardPage> = DashboardPage.values()
     val availablePatches by vm.availablePatches.collectAsStateWithLifecycle(0)
     val androidContext = LocalContext.current
@@ -58,6 +69,10 @@ fun DashboardScreen(
     val pagerState = rememberPagerState()
     val composableScope = rememberCoroutineScope()
 
+    LaunchedEffect(pagerState.currentPage) {
+        if (pagerState.currentPage != DashboardPage.BUNDLES.ordinal) vm.cancelSourceSelection()
+    }
+
     if (showImportBundleDialog) {
         fun dismiss() {
             showImportBundleDialog = false
@@ -78,21 +93,60 @@ fun DashboardScreen(
 
     Scaffold(
         topBar = {
-            AppTopBar(
+            if (bundlesSelectable) {
-                title = stringResource(R.string.app_name),
+                BundleTopBar(
-                actions = {
+                    title = stringResource(R.string.bundles_selected, vm.selectedSources.size),
-                    IconButton(onClick = {}) {
+                    onBackClick = vm::cancelSourceSelection,
-                        Icon(Icons.Outlined.HelpOutline, stringResource(R.string.help))
+                    onBackIcon = {
+                        Icon(
+                            imageVector = Icons.Default.Close,
+                            contentDescription = stringResource(R.string.back)
+                        )
+                    },
+                    actions = {
+                        IconButton(
+                            onClick = {
+                                vm.selectedSources.forEach { if (!it.isDefault) vm.delete(it) }
+                                vm.cancelSourceSelection()
+                            }
+                        ) {
+                            Icon(
+                                Icons.Outlined.DeleteOutline,
+                                stringResource(R.string.delete)
+                            )
+                        }
+                        IconButton(
+                            onClick = {
+                                vm.selectedSources.forEach { vm.update(it) }
+                                vm.cancelSourceSelection()
+                            }
+                        ) {
+                            Icon(
+                                Icons.Outlined.Refresh,
+                                stringResource(R.string.refresh)
+                            )
+                        }
                     }
-                    IconButton(onClick = onSettingsClick) {
+                )
-                        Icon(Icons.Outlined.Settings, stringResource(R.string.settings))
+            } else {
+                AppTopBar(
+                    title = stringResource(R.string.app_name),
+                    actions = {
+                        IconButton(onClick = {}) {
+                            Icon(Icons.Outlined.HelpOutline, stringResource(R.string.help))
+                        }
+                        IconButton(onClick = onSettingsClick) {
+                            Icon(Icons.Outlined.Settings, stringResource(R.string.settings))
+                        }
                     }
-                }
+                )
-            )
+            }
         },
         floatingActionButton = {
             FloatingActionButton(
                 onClick = {
+                    vm.cancelSourceSelection()
+
                     when (pagerState.currentPage) {
                         DashboardPage.DASHBOARD.ordinal -> {
                             if (availablePatches < 1) {
@@ -149,7 +203,38 @@ fun DashboardScreen(
                         }
 
                         DashboardPage.BUNDLES -> {
-                            BundlesScreen()
+
+                            val sources by vm.sources.collectAsStateWithLifecycle(initialValue = emptyList())
+
+                            Column(
+                                modifier = Modifier
+                                    .fillMaxSize(),
+                            ) {
+                                sources.forEach {
+
+                                    BundleItem(
+                                        bundle = it,
+                                        onDelete = {
+                                            vm.delete(it)
+                                        },
+                                        onUpdate = {
+                                            vm.update(it)
+                                        },
+                                        selectable = bundlesSelectable,
+                                        onSelect = {
+                                            vm.selectedSources.add(it)
+                                        },
+                                        isBundleSelected = vm.selectedSources.contains(it),
+                                        toggleSelection = { bundleIsNotSelected ->
+                                            if (bundleIsNotSelected) {
+                                                vm.selectedSources.add(it)
+                                            } else {
+                                                vm.selectedSources.remove(it)
+                                            }
+                                        }
+                                    )
+                                }
+                            }
                         }
                     }
                 }

app/src/main/java/app/revanced/manager/ui/viewmodel/BundlesViewModel.kt

@@ -1,33 +0,0 @@
-package app.revanced.manager.ui.viewmodel
-
-import android.app.Application
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import app.revanced.manager.R
-import app.revanced.manager.domain.bundles.PatchBundleSource
-import app.revanced.manager.domain.bundles.RemotePatchBundle
-import app.revanced.manager.domain.repository.PatchBundleRepository
-import app.revanced.manager.util.uiSafe
-import kotlinx.coroutines.launch
-
-class BundlesViewModel(
-    private val app: Application,
-    private val patchBundleRepository: PatchBundleRepository
-) : ViewModel() {
-    val sources = patchBundleRepository.sources
-
-    fun delete(bundle: PatchBundleSource) =
-        viewModelScope.launch { patchBundleRepository.remove(bundle) }
-
-    fun update(bundle: PatchBundleSource) = viewModelScope.launch {
-        if (bundle !is RemotePatchBundle) return@launch
-
-        uiSafe(
-            app,
-            R.string.source_download_fail,
-            RemotePatchBundle.updateFailMsg
-        ) {
-            bundle.update()
-        }
-    }
-}

app/src/main/java/app/revanced/manager/ui/viewmodel/DashboardViewModel.kt

@@ -3,21 +3,30 @@ package app.revanced.manager.ui.viewmodel
 import android.app.Application
 import android.content.ContentResolver
 import android.net.Uri
+import androidx.compose.runtime.mutableStateListOf
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import app.revanced.manager.R
+import app.revanced.manager.domain.bundles.PatchBundleSource
+import app.revanced.manager.domain.bundles.RemotePatchBundle
 import app.revanced.manager.domain.repository.PatchBundleRepository
-import io.ktor.http.Url
+import app.revanced.manager.util.uiSafe
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 
 class DashboardViewModel(
-    app: Application,
+    private val app: Application,
     private val patchBundleRepository: PatchBundleRepository
 ) : ViewModel() {
     val availablePatches =
         patchBundleRepository.bundles.map { it.values.sumOf { bundle -> bundle.patches.size } }
     private val contentResolver: ContentResolver = app.contentResolver
+    val sources = patchBundleRepository.sources
+    val selectedSources = mutableStateListOf<PatchBundleSource>()
 
+    fun cancelSourceSelection() {
+        selectedSources.clear()
+    }
     fun createLocalSource(name: String, patchBundle: Uri, integrations: Uri?) =
         viewModelScope.launch {
             contentResolver.openInputStream(patchBundle)!!.use { patchesStream ->
@@ -32,4 +41,19 @@ class DashboardViewModel(
 
     fun createRemoteSource(name: String, apiUrl: String, autoUpdate: Boolean) =
         viewModelScope.launch { patchBundleRepository.createRemote(name, apiUrl, autoUpdate) }
+
+    fun delete(bundle: PatchBundleSource) =
+        viewModelScope.launch { patchBundleRepository.remove(bundle) }
+
+    fun update(bundle: PatchBundleSource) = viewModelScope.launch {
+        if (bundle !is RemotePatchBundle) return@launch
+
+        uiSafe(
+            app,
+            R.string.source_download_fail,
+            RemotePatchBundle.updateFailMsg
+        ) {
+            bundle.update()
+        }
+    }
 }

app/src/main/res/values/strings.xml

@@ -141,6 +141,7 @@
     <string name="no_patches">No patches available to view</string>
     <string name="patches_available">%d Patches available, tap to view</string>
     <string name="tap_on_patches">Tap on the patches to get more information about them</string>
+    <string name="bundles_selected">%s selected</string>
     <string name="unsupported_app">Unsupported app</string>
     <string name="unsupported_patches">Unsupported patches</string>
     <string name="universal_patches">Universal patches</string>