refactor: Separate bundle list screen code from dashboard

ReVanced · Nov 20, 2024 · eac6ce9 · eac6ce9
1 parent 9305a7b
commit eac6ce9
Show file tree

Hide file tree

Showing 2 changed files with 68 additions and 38 deletions.
diff --git a/app/src/main/java/app/revanced/manager/ui/screen/BundleListScreen.kt b/app/src/main/java/app/revanced/manager/ui/screen/BundleListScreen.kt
@@ -0,0 +1,57 @@
+package app.revanced.manager.ui.screen
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.lazy.items
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.snapshots.SnapshotStateList
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import app.revanced.manager.domain.bundles.PatchBundleSource
+import app.revanced.manager.ui.component.LazyColumnWithScrollbar
+import app.revanced.manager.ui.component.bundle.BundleItem
+
+@Composable
+fun BundleListScreen(
+    onDelete: (PatchBundleSource) -> Unit,
+    onUpdate: (PatchBundleSource) -> Unit,
+    sources: List<PatchBundleSource>,
+    selectedSources: SnapshotStateList<PatchBundleSource>,
+    bundlesSelectable: Boolean = false,
+) {
+    Column {
+        LazyColumnWithScrollbar(
+            modifier = Modifier.fillMaxSize(),
+            horizontalAlignment = Alignment.CenterHorizontally,
+            verticalArrangement = Arrangement.Top,
+        ) {
+            items(
+                sources,
+                key = { it.uid }
+            ) { source ->
+                BundleItem(
+                    bundle = source,
+                    onDelete = {
+                        onDelete(source)
+                    },
+                    onUpdate = {
+                        onUpdate(source)
+                    },
+                    selectable = bundlesSelectable,
+                    onSelect = {
+                        selectedSources.add(source)
+                    },
+                    isBundleSelected = selectedSources.contains(source),
+                    toggleSelection = { bundleIsNotSelected ->
+                        if (bundleIsNotSelected) {
+                            selectedSources.add(source)
+                        } else {
+                            selectedSources.remove(source)
+                        }
+                    }
+                )
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/app/revanced/manager/ui/screen/DashboardScreen.kt b/app/src/main/java/app/revanced/manager/ui/screen/DashboardScreen.kt
@@ -7,7 +7,6 @@ import android.provider.Settings
 import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.pager.HorizontalPager
 import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.material.icons.Icons
@@ -18,7 +17,6 @@ import androidx.compose.material.icons.outlined.*
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalContext
@@ -32,9 +30,7 @@ import app.revanced.manager.patcher.aapt.Aapt
 import app.revanced.manager.ui.component.AppTopBar
 import app.revanced.manager.ui.component.AutoUpdatesDialog
 import app.revanced.manager.ui.component.AvailableUpdateDialog
-import app.revanced.manager.ui.component.LazyColumnWithScrollbar
 import app.revanced.manager.ui.component.NotificationCard
-import app.revanced.manager.ui.component.bundle.BundleItem
 import app.revanced.manager.ui.component.bundle.BundleTopBar
 import app.revanced.manager.ui.component.haptics.HapticFloatingActionButton
 import app.revanced.manager.ui.component.haptics.HapticTab
@@ -267,40 +263,17 @@ fun DashboardScreen(
 
                             val sources by vm.sources.collectAsStateWithLifecycle(initialValue = emptyList())
 
-                            Column {
-                                LazyColumnWithScrollbar(
-                                    modifier = Modifier.fillMaxSize(),
-                                    horizontalAlignment = Alignment.CenterHorizontally,
-                                    verticalArrangement = Arrangement.Top,
-                                ) {
-                                    items(
-                                        sources,
-                                        key = { it.uid }
-                                    ) { source ->
-                                        BundleItem(
-                                            bundle = source,
-                                            onDelete = {
-                                                vm.delete(source)
-                                            },
-                                            onUpdate = {
-                                                vm.update(source)
-                                            },
-                                            selectable = bundlesSelectable,
-                                            onSelect = {
-                                                vm.selectedSources.add(source)
-                                            },
-                                            isBundleSelected = vm.selectedSources.contains(source),
-                                            toggleSelection = { bundleIsNotSelected ->
-                                                if (bundleIsNotSelected) {
-                                                    vm.selectedSources.add(source)
-                                                } else {
-                                                    vm.selectedSources.remove(source)
-                                                }
-                                            }
-                                        )
-                                    }
-                                }
-                            }
+                            BundleListScreen(
+                                onDelete = {
+                                    vm.delete(it)
+                                },
+                                onUpdate = {
+                                    vm.update(it)
+                                },
+                                sources = sources,
+                                selectedSources = vm.selectedSources,
+                                bundlesSelectable = bundlesSelectable
+                            )
                         }
                     }
                 }