i figured out how to make parcelables work

app/build.gradle.kts

@@ -177,9 +177,6 @@ dependencies {
     implementation(libs.koin.compose.navigation)
     implementation(libs.koin.workmanager)
 
-    // Compose Navigation
-    implementation(libs.reimagined.navigation)
-
     // Licenses
     implementation(libs.about.libraries)
 

app/src/main/java/app/revanced/manager/MainActivity.kt

@@ -1,6 +1,7 @@
 package app.revanced.manager
 
 import android.os.Bundle
+import android.os.Parcelable
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
@@ -26,14 +27,12 @@ import app.revanced.manager.ui.screen.settings.update.UpdatesSettingsScreen
 import app.revanced.manager.ui.theme.ReVancedManagerTheme
 import app.revanced.manager.ui.theme.Theme
 import app.revanced.manager.ui.viewmodel.MainViewModel
-import app.revanced.manager.ui.viewmodel.PatchesSelectorViewModel
 import app.revanced.manager.ui.viewmodel.SelectedAppInfoViewModel
 import app.revanced.manager.util.EventEffect
 import org.koin.androidx.compose.koinViewModel
 import org.koin.androidx.compose.navigation.koinNavViewModel
 import org.koin.core.parameter.parametersOf
-import org.koin.androidx.compose.koinViewModel as getComposeViewModel
+import org.koin.androidx.viewmodel.ext.android.getViewModel as getActivityViewModel
-import org.koin.androidx.viewmodel.ext.android.getViewModel as getAndroidViewModel
 
 class MainActivity : ComponentActivity() {
     @ExperimentalAnimationApi
@@ -44,7 +43,7 @@ class MainActivity : ComponentActivity() {
         enableEdgeToEdge()
         installSplashScreen()
 
-        val vm: MainViewModel = getAndroidViewModel()
+        val vm: MainViewModel = getActivityViewModel()
         vm.importLegacySettings(this)
 
         setContent {
@@ -66,7 +65,10 @@ private fun ReVancedManager(vm: MainViewModel) {
     val navController = rememberNavController()
 
     EventEffect(vm.appSelectFlow) { app ->
-        // navController.navigate(SelectedApplicationInfo(app))
+        navController.navigateComplex(
+            SelectedApplicationInfo,
+            SelectedApplicationInfo.ViewModelParams(app)
+        )
     }
 
     NavHost(
@@ -77,16 +79,12 @@ private fun ReVancedManager(vm: MainViewModel) {
             DashboardScreen(
                 onSettingsClick = { navController.navigate(Settings) },
                 onAppSelectorClick = {
-                    println("before: ${navController.currentBackStackEntry?.id}")
                     navController.navigate(AppSelector)
-                    println("after: ${navController.currentBackStackEntry?.id}")
                 },
                 onUpdateClick = {
                     navController.navigate(Update())
-                    // navController.navigate(Destination.Settings(SettingsDestination.Update()))
                 },
                 onDownloaderPluginClick = {
-                    // navController.navigate(Destination.Settings(SettingsDestination.Downloads))
                     navController.navigate(Settings.Downloads)
                 },
                 onAppClick = { installedApp ->
@@ -101,7 +99,7 @@ private fun ReVancedManager(vm: MainViewModel) {
             InstalledAppInfoScreen(
                 onPatchClick = vm::selectApp,
                 onBackClick = navController::popBackStack,
-                viewModel = getComposeViewModel { parametersOf(data.packageName) }
+                viewModel = koinViewModel { parametersOf(data.packageName) }
             )
         }
 
@@ -123,45 +121,43 @@ private fun ReVancedManager(vm: MainViewModel) {
                         }
                     }
                 },
-                vm = koinViewModel { parametersOf(it.toRoute<Patcher>()) }
+                vm = koinViewModel { parametersOf(it.getComplexArg<Patcher.ViewModelParams>()) }
             )
         }
 
         navigation<SelectedApplicationInfo>(startDestination = SelectedApplicationInfo.Main) {
             composable<SelectedApplicationInfo.Main> {
                 val parentBackStackEntry = navController.navGraphEntry(it)
-                val data = parentBackStackEntry.toRoute<SelectedApplicationInfo>()
+                val data =
+                    parentBackStackEntry.getComplexArg<SelectedApplicationInfo.ViewModelParams>()
 
                 SelectedAppInfoScreen(
                     onBackClick = navController::popBackStack,
                     onPatchClick = { app, patches, options ->
-                        // navController.navigate(Patcher(app, patches, options))
+                        navController.navigateComplex(
+                            Patcher,
+                            Patcher.ViewModelParams(app, patches, options)
+                        )
                     },
                     onPatchSelectorClick = { app, patches, options ->
-                        /*
+                        navController.navigateComplex(
-                        navController.navigate(
+                            SelectedApplicationInfo.PatchesSelector,
-                            SelectedApplicationInfo.PatchesSelector(
+                            SelectedApplicationInfo.PatchesSelector.ViewModelParams(
                                 app,
                                 patches,
                                 options
                             )
-                        )*/
+                        )
                     },
                     vm = koinNavViewModel<SelectedAppInfoViewModel>(viewModelStoreOwner = parentBackStackEntry) {
-                        parametersOf(
+                        parametersOf(data)
-                            SelectedAppInfoViewModel.Params(
-                                data.selectedApp,
-                                data.patchSelection
-                            )
-                        )
                     }
                 )
             }
 
-            composable<SelectedApplicationInfo.PatchesSelector>(
+            composable<SelectedApplicationInfo.PatchesSelector> {
-                // typeMap = mapOf(typeOf<SelectedApplicationInfo.PatchesSelector>() to SelectedApplicationInfo.PatchesSelector.navType)
+                val data =
-            ) {
+                    it.getComplexArg<SelectedApplicationInfo.PatchesSelector.ViewModelParams>()
-                val data = it.toRoute<SelectedApplicationInfo.PatchesSelector>()
                 val selectedAppInfoVm = koinNavViewModel<SelectedAppInfoViewModel>(
                     viewModelStoreOwner = navController.navGraphEntry(it)
                 )
@@ -172,15 +168,7 @@ private fun ReVancedManager(vm: MainViewModel) {
                         selectedAppInfoVm.updateConfiguration(patches, options)
                         navController.popBackStack()
                     },
-                    vm = koinViewModel {
+                    vm = koinViewModel { parametersOf(data) }
-                        parametersOf(
-                            PatchesSelectorViewModel.Params(
-                                data.app,
-                                data.currentSelection,
-                                data.options,
-                            )
-                        )
-                    }
                 )
             }
         }
@@ -243,82 +231,16 @@ private fun ReVancedManager(vm: MainViewModel) {
     }
 }
 
+private fun <T : Parcelable, R : ComplexParameter<T>> NavController.navigateComplex(
+    route: R,
+    data: T
+) {
+    navigate(route)
+    getBackStackEntry(route).savedStateHandle["args"] = data
+}
+
+private fun <T : Parcelable> NavBackStackEntry.getComplexArg() = savedStateHandle.get<T>("args")!!
+
 @Composable
-private fun NavController.navGraphEntry(entry: NavBackStackEntry) = remember(entry) {
+private fun NavController.navGraphEntry(entry: NavBackStackEntry) =
-    getBackStackEntry(entry.destination.parent!!)
+    remember(entry) { getBackStackEntry(entry.destination.parent!!.id) }
-}
-
-/*
-                val navController =
-                    rememberNavController<Destination>(startDestination = Destination.Dashboard)
-                NavBackHandler(navController)
-
-                EventEffect(vm.appSelectFlow) { app ->
-                    navController.navigate(Destination.SelectedApplicationInfo(app))
-                }
-
-                AnimatedNavHost(
-                    controller = navController
-                ) { destination ->
-                    when (destination) {
-                        is Destination.Dashboard -> DashboardScreen(
-                            onSettingsClick = { navController.navigate(Destination.Settings()) },
-                            onAppSelectorClick = { navController.navigate(Destination.AppSelector) },
-                            onUpdateClick = {
-                                navController.navigate(Destination.Settings(SettingsDestination.Update()))
-                            },
-                            onDownloaderPluginClick = {
-                                navController.navigate(Destination.Settings(SettingsDestination.Downloads))
-                            },
-                            onAppClick = { installedApp ->
-                                navController.navigate(
-                                    Destination.InstalledApplicationInfo(
-                                        installedApp
-                                    )
-                                )
-                            }
-                        )
-
-                        is Destination.InstalledApplicationInfo -> InstalledAppInfoScreen(
-                            onPatchClick = vm::selectApp,
-                            onBackClick = { navController.pop() },
-                            viewModel = getComposeViewModel { parametersOf(destination.installedApp) }
-                        )
-
-                        is Destination.Settings -> SettingsScreen(
-                            onBackClick = { navController.pop() },
-                            startDestination = destination.startDestination
-                        )
-
-                        is Destination.AppSelector -> AppSelectorScreen(
-                            onSelect = vm::selectApp,
-                            onStorageSelect = vm::selectApp,
-                            onBackClick = { navController.pop() }
-                        )
-
-                        is Destination.SelectedApplicationInfo -> SelectedAppInfoScreen(
-                            onPatchClick = { app, patches, options ->
-                                navController.navigate(
-                                    Destination.Patcher(
-                                        app, patches, options
-                                    )
-                                )
-                            },
-                            onBackClick = navController::pop,
-                            vm = getComposeViewModel {
-                                parametersOf(
-                                    SelectedAppInfoViewModel.Params(
-                                        destination.selectedApp,
-                                        destination.patchSelection
-                                    )
-                                )
-                            }
-                        )
-
-                        is Destination.Patcher -> PatcherScreen(
-                            onBackClick = { navController.popUpTo { it is Destination.Dashboard } },
-                            vm = getComposeViewModel { parametersOf(destination) }
-                        )
-                    }
-                }
- */

app/src/main/java/app/revanced/manager/ui/destination/Destination.kt

@@ -1,31 +0,0 @@
-package app.revanced.manager.ui.destination
-
-import android.os.Parcelable
-import app.revanced.manager.data.room.apps.installed.InstalledApp
-import app.revanced.manager.ui.model.SelectedApp
-import app.revanced.manager.util.Options
-import app.revanced.manager.util.PatchSelection
-import kotlinx.parcelize.Parcelize
-import kotlinx.parcelize.RawValue
-
-sealed interface Destination : Parcelable {
-
-    @Parcelize
-    data object Dashboard : Destination
-
-    // @Parcelize
-    // data class InstalledApplicationInfo(val installedApp: InstalledApp) : Destination
-
-    @Parcelize
-    data object AppSelector : Destination
-
-    @Parcelize
-    data class Settings(val startDestination: SettingsDestination = SettingsDestination.Settings) : Destination
-
-    @Parcelize
-    data class SelectedApplicationInfo(val selectedApp: SelectedApp, val patchSelection: PatchSelection? = null) : Destination
-
-    @Parcelize
-    data class Patcher(val selectedApp: SelectedApp, val selectedPatches: PatchSelection, val options: @RawValue Options) : Destination
-
-}

app/src/main/java/app/revanced/manager/ui/destination/SelectedAppInfoDestination.kt

@@ -1,16 +0,0 @@
-package app.revanced.manager.ui.destination
-
-import android.os.Parcelable
-import app.revanced.manager.ui.model.SelectedApp
-import app.revanced.manager.util.Options
-import app.revanced.manager.util.PatchSelection
-import kotlinx.parcelize.Parcelize
-import kotlinx.parcelize.RawValue
-
-sealed interface SelectedAppInfoDestination : Parcelable {
-    @Parcelize
-    data object Main : SelectedAppInfoDestination
-
-    @Parcelize
-    data class PatchesSelector(val app: SelectedApp, val currentSelection: PatchSelection?, val options: @RawValue Options) : SelectedAppInfoDestination
-}

app/src/main/java/app/revanced/manager/ui/destination/SettingsDestination.kt

@@ -1,43 +0,0 @@
-package app.revanced.manager.ui.destination
-
-import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
-
-sealed interface SettingsDestination : Parcelable {
-
-    @Parcelize
-    data object Settings : SettingsDestination
-
-    @Parcelize
-    data object General : SettingsDestination
-
-    @Parcelize
-    data object Advanced : SettingsDestination
-
-    @Parcelize
-    data object Updates : SettingsDestination
-
-    @Parcelize
-    data object Downloads : SettingsDestination
-
-    @Parcelize
-    data object ImportExport : SettingsDestination
-
-    @Parcelize
-    data object About : SettingsDestination
-
-    @Parcelize
-    data class Update(val downloadOnScreenEntry: Boolean = false) : SettingsDestination
-
-    @Parcelize
-    data object Changelogs : SettingsDestination
-
-    @Parcelize
-    data object Contributors: SettingsDestination
-
-    @Parcelize
-    data object Licenses: SettingsDestination
-
-    @Parcelize
-    data object DeveloperOptions: SettingsDestination
-}

app/src/main/java/app/revanced/manager/ui/model/navigation/Nav.kt

@@ -1,8 +1,11 @@
 package app.revanced.manager.ui.model.navigation
 
+import android.os.Parcelable
 import app.revanced.manager.ui.model.SelectedApp
 import app.revanced.manager.util.Options
 import app.revanced.manager.util.PatchSelection
+import kotlinx.parcelize.Parcelize
+import kotlinx.parcelize.RawValue
 import kotlinx.serialization.Serializable
 
 /*
@@ -28,6 +31,8 @@ sealed interface Destination : Parcelable {
 
 }*/
 
+interface ComplexParameter<T : Parcelable>
+
 @Serializable
 object Dashboard
 
@@ -41,40 +46,35 @@ data class InstalledApplicationInfo(val packageName: String)
 data class Update(val downloadOnScreenEntry: Boolean = false)
 
 @Serializable
-data class SelectedApplicationInfo(
+data object SelectedApplicationInfo : ComplexParameter<SelectedApplicationInfo.ViewModelParams> {
-    val h: Int = 0,
+    @Parcelize
-    // val selectedApp: SelectedApp,
+    data class ViewModelParams(
-    // val patchSelection: PatchSelection? = null
+        val app: SelectedApp,
-) {
+        val patches: PatchSelection? = null
-    val patchSelection: PatchSelection? get() = TODO()
+    ) : Parcelable
-    val selectedApp: SelectedApp get() = TODO()
 
     @Serializable
     object Main
 
     @Serializable
-    data class PatchesSelector(
+    data object PatchesSelector : ComplexParameter<PatchesSelector.ViewModelParams> {
-        val h: Int,
+        @Parcelize
-        //val app: SelectedApp,
+        data class ViewModelParams(
-        // val currentSelection: PatchSelection?,
+            val app: SelectedApp,
-        // val options: Options
+            val currentSelection: PatchSelection?,
-    ) {
+            val options: @RawValue Options,
-        val app: SelectedApp get() = TODO()
+        ) : Parcelable
-        val currentSelection: PatchSelection? get() = TODO()
-        val options: Options get() = TODO()
     }
 }
 
 @Serializable
-data class Patcher(
+data object Patcher : ComplexParameter<Patcher.ViewModelParams> {
-    val h: Int = 0,
+    @Parcelize
-    //val selectedApp: SelectedApp,
+    data class ViewModelParams(
-    // val selectedPatches: PatchSelection,
+        val selectedApp: SelectedApp,
-    // val options: Options
+        val selectedPatches: PatchSelection,
-) {
+        val options: @RawValue Options
-    val selectedApp: SelectedApp get() = TODO()
+    ) : Parcelable
-    val options: Options get() = TODO()
-    val selectedPatches: PatchSelection get() = TODO()
 }
 
 @Serializable

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

@@ -32,7 +32,6 @@ import app.revanced.manager.ui.component.AppTopBar
 import app.revanced.manager.ui.component.ColumnWithScrollbar
 import app.revanced.manager.ui.component.LoadingIndicator
 import app.revanced.manager.ui.component.haptics.HapticExtendedFloatingActionButton
-import app.revanced.manager.ui.destination.SelectedAppInfoDestination
 import app.revanced.manager.ui.model.BundleInfo.Extensions.bundleInfoFlow
 import app.revanced.manager.ui.model.SelectedApp
 import app.revanced.manager.ui.viewmodel.PatchesSelectorViewModel

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

@@ -39,7 +39,6 @@ import app.revanced.manager.plugin.downloader.PluginHostApi
 import app.revanced.manager.plugin.downloader.UserInteractionException
 import app.revanced.manager.service.InstallService
 import app.revanced.manager.service.UninstallService
-import app.revanced.manager.ui.destination.Destination
 import app.revanced.manager.ui.model.InstallerModel
 import app.revanced.manager.ui.model.ProgressKey
 import app.revanced.manager.ui.model.SelectedApp
@@ -70,11 +69,10 @@ import org.koin.core.component.inject
 import java.io.File
 import java.nio.file.Files
 import java.time.Duration
-import java.util.UUID
 
 @OptIn(SavedStateHandleSaveableApi::class, PluginHostApi::class)
 class PatcherViewModel(
-    private val input: Patcher
+    private val input: Patcher.ViewModelParams
 ) : ViewModel(), KoinComponent, StepProgressProvider, InstallerModel {
     private val app: Application by inject()
     private val fs: Filesystem by inject()

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

@@ -23,6 +23,7 @@ import app.revanced.manager.ui.model.BundleInfo
 import app.revanced.manager.ui.model.BundleInfo.Extensions.bundleInfoFlow
 import app.revanced.manager.ui.model.BundleInfo.Extensions.toPatchSelection
 import app.revanced.manager.ui.model.SelectedApp
+import app.revanced.manager.ui.model.navigation.SelectedApplicationInfo
 import app.revanced.manager.util.Options
 import app.revanced.manager.util.PatchSelection
 import app.revanced.manager.util.saver.Nullable
@@ -40,7 +41,7 @@ import kotlinx.coroutines.flow.map
 
 @Stable
 @OptIn(SavedStateHandleSaveableApi::class)
-class PatchesSelectorViewModel(input: Params) : ViewModel(), KoinComponent {
+class PatchesSelectorViewModel(input: SelectedApplicationInfo.PatchesSelector.ViewModelParams) : ViewModel(), KoinComponent {
     private val app: Application = get()
     private val savedStateHandle: SavedStateHandle = get()
     private val prefs: PreferencesManager = get()
@@ -214,12 +215,6 @@ class PatchesSelectorViewModel(input: Params) : ViewModel(), KoinComponent {
         private val selectionSaver: Saver<PersistentPatchSelection?, Nullable<PatchSelection>> =
             nullableSaver(persistentMapSaver(valueSaver = persistentSetSaver()))
     }
-
-    data class Params(
-        val app: SelectedApp,
-        val currentSelection: PatchSelection?,
-        val options: Options,
-    )
 }
 
 // Versions of other types, but utilizing persistent/observable collection types.

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

@@ -36,6 +36,7 @@ import app.revanced.manager.ui.model.BundleInfo
 import app.revanced.manager.ui.model.BundleInfo.Extensions.bundleInfoFlow
 import app.revanced.manager.ui.model.BundleInfo.Extensions.toPatchSelection
 import app.revanced.manager.ui.model.SelectedApp
+import app.revanced.manager.ui.model.navigation.SelectedApplicationInfo
 import app.revanced.manager.util.Options
 import app.revanced.manager.util.PM
 import app.revanced.manager.util.PatchSelection
@@ -58,7 +59,9 @@ import org.koin.core.component.KoinComponent
 import org.koin.core.component.get
 
 @OptIn(SavedStateHandleSaveableApi::class, PluginHostApi::class)
-class SelectedAppInfoViewModel(input: Params) : ViewModel(), KoinComponent {
+class SelectedAppInfoViewModel(
+    input: SelectedApplicationInfo.ViewModelParams
+) : ViewModel(), KoinComponent {
     private val app: Application = get()
     val bundlesRepo: PatchBundleRepository = get()
     private val bundleRepository: PatchBundleRepository = get()
@@ -285,11 +288,6 @@ class SelectedAppInfoViewModel(input: Params) : ViewModel(), KoinComponent {
         }
     }
 
-    data class Params(
-        val app: SelectedApp,
-        val patches: PatchSelection?,
-    )
-
     enum class Error(@StringRes val resourceId: Int) {
         NoPlugins(R.string.downloader_no_plugins_available)
     }

gradle/libs.versions.toml

@@ -9,7 +9,7 @@ appcompat = "1.7.0"
 preferences-datastore = "1.1.1"
 work-runtime = "2.10.0"
 compose-bom = "2024.12.01"
-navigation = "2.8.4"
+navigation = "2.8.5"
 accompanist = "0.34.0"
 placeholder = "1.1.2"
 reorderable = "1.5.2"
@@ -19,9 +19,7 @@ datetime = "0.6.0"
 room-version = "2.6.1"
 revanced-patcher = "21.0.0"
 revanced-library = "3.0.2"
-koin-version = "3.5.3"
+koin = "3.5.3"
-koin-version-compose = "3.5.3"
-reimagined-navigation = "1.5.0"
 ktor = "2.3.9"
 markdown-renderer = "0.22.0"
 fading-edges = "1.0.4"
@@ -87,13 +85,10 @@ revanced-patcher = { group = "app.revanced", name = "revanced-patcher", version.
 revanced-library = { group = "app.revanced", name = "revanced-library", version.ref = "revanced-library" }
 
 # Koin
-koin-android = { group = "io.insert-koin", name = "koin-android", version.ref = "koin-version" }
+koin-android = { group = "io.insert-koin", name = "koin-android", version.ref = "koin" }
-koin-compose = { group = "io.insert-koin", name = "koin-androidx-compose", version.ref = "koin-version-compose" }
+koin-compose = { group = "io.insert-koin", name = "koin-androidx-compose", version.ref = "koin" }
-koin-compose-navigation = { group = "io.insert-koin", name = "koin-androidx-compose-navigation", version.ref = "koin-version-compose" }
+koin-compose-navigation = { group = "io.insert-koin", name = "koin-androidx-compose-navigation", version.ref = "koin" }
-koin-workmanager = { group = "io.insert-koin", name = "koin-androidx-workmanager", version.ref = "koin-version" }
+koin-workmanager = { group = "io.insert-koin", name = "koin-androidx-workmanager", version.ref = "koin" }
-
-# Compose Navigation
-reimagined-navigation = { group = "dev.olshevski.navigation", name = "reimagined", version.ref = "reimagined-navigation" }
 
 # About Libraries
 about-libraries = { group = "com.mikepenz", name = "aboutlibraries-compose", version.ref = "about-libraries-gradle-plugin" }