refactor: Merge AppSelector and InstalledApp screens viewmodels

Author: Ushie

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

@@ -30,7 +30,6 @@ import androidx.navigation.toRoute
 import app.revanced.manager.domain.repository.ChangelogSource
 import app.revanced.manager.ui.model.navigation.Announcement
 import app.revanced.manager.ui.model.navigation.Announcements
-import app.revanced.manager.ui.model.navigation.AppSelector
 import app.revanced.manager.ui.model.navigation.BundleInformation
 import app.revanced.manager.ui.model.navigation.ComplexParameter
 import app.revanced.manager.ui.model.navigation.Dashboard
@@ -42,7 +41,6 @@ import app.revanced.manager.ui.model.navigation.Settings
 import app.revanced.manager.ui.model.navigation.Update
 import app.revanced.manager.ui.screen.AnnouncementScreen
 import app.revanced.manager.ui.screen.AnnouncementsScreen
-import app.revanced.manager.ui.screen.AppSelectorScreen
 import app.revanced.manager.ui.screen.BundleInformationScreen
 import app.revanced.manager.ui.screen.DashboardScreen
 import app.revanced.manager.ui.screen.InstalledAppInfoScreen
@@ -166,9 +164,6 @@ private fun ReVancedManager(vm: MainViewModel) {
         composable<Dashboard> {
             DashboardScreen(
                 onSettingsClick = { navController.navigateSafe(Settings) },
-                onAppSelectorClick = {
-                    navController.navigateSafe(AppSelector)
-                },
                 onUpdateClick = {
                     navController.navigateSafe(Update())
                 },
@@ -215,14 +210,6 @@ private fun ReVancedManager(vm: MainViewModel) {
             )
         }
 
-        composable<AppSelector> {
-            AppSelectorScreen(
-                onSelect = vm::selectApp,
-                onStorageSelect = vm::selectApp,
-                onBackClick = navController::popBackStackSafe
-            )
-        }
-
         composable<Patcher> {
             PatcherScreen(
                 onBackClick = {

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

@@ -12,7 +12,6 @@ val viewModelModule = module {
     viewModelOf(::PatchesSelectorViewModel)
     viewModelOf(::GeneralSettingsViewModel)
     viewModelOf(::AdvancedSettingsViewModel)
-    viewModelOf(::AppSelectorViewModel)
     viewModelOf(::PatcherViewModel)
     viewModelOf(::UpdateViewModel)
     viewModelOf(::AnnouncementsViewModel)
@@ -22,7 +21,7 @@ val viewModelModule = module {
     viewModelOf(::DeveloperOptionsViewModel)
     viewModelOf(::ContributorViewModel)
     viewModelOf(::DownloadsViewModel)
-    viewModelOf(::InstalledAppsViewModel)
+    viewModelOf(::AppsViewModel)
     viewModelOf(::InstalledAppInfoViewModel)
     viewModelOf(::UpdatesSettingsViewModel)
     viewModelOf(::BundleListViewModel)

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

@@ -18,9 +18,6 @@ object Onboarding
 @Serializable
 object Dashboard
 
-@Serializable
-object AppSelector
-
 @Serializable
 data class InstalledApplicationInfo(val packageName: String)