Add local APK to version and source selector

.github/workflows/pull_strings.yml

@@ -1,43 +0,0 @@
-name: Pull strings
-
-on:
-  schedule:
-    - cron: "0 0 * * 0"
-  workflow_dispatch:
-
-jobs:
-  pull:
-    name: Pull strings
-    permissions:
-      contents: write
-      pull-requests: write
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v5
-        with:
-          ref: dev
-          clean: true
-
-      - name: Pull strings
-        uses: crowdin/github-action@v2
-        with:
-          config: crowdin.yml
-          upload_sources: false
-          download_translations: true
-          skip_ref_checkout: true
-          localization_branch_name: feat/translations
-          create_pull_request: false
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
-          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
-
-      - name: Open pull request
-        if: github.event_name == 'workflow_dispatch'
-        uses: repo-sync/pull-request@v2
-        with:
-          source_branch: feat/translations
-          destination_branch: dev
-          pr_title: "chore: Sync translations"
-          pr_body: "Sync translations from [crowdin.com/project/revanced](https://crowdin.com/project/revanced)"

.github/workflows/push_strings.yml

@@ -1,26 +0,0 @@
-name: Push strings
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - dev
-    paths:
-      - app/src/main/res/values/strings.xml
-
-jobs:
-  push:
-    name: Push strings
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v5
-
-      - name: Push strings
-        uses: crowdin/github-action@v2
-        with:
-          config: crowdin.yml
-          upload_sources: true
-        env:
-          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
-          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}

app/CHANGELOG.md

@@ -1,29 +1,3 @@
-# app [1.26.0-dev.19](https://github.com/ReVanced/revanced-manager/compare/v1.26.0-dev.18...v1.26.0-dev.19) (2026-01-08)
-
-
-### Bug Fixes
-
-* **locales:** use buildconfig instead of generating kt file ([72b1db9](https://github.com/ReVanced/revanced-manager/commit/72b1db9a2f33ab5d5fffd8ba83c05901eff19bea))
-
-# app [1.26.0-dev.18](https://github.com/ReVanced/revanced-manager/compare/v1.26.0-dev.17...v1.26.0-dev.18) (2026-01-08)
-
-
-### Bug Fixes
-
-* Prevent trailing comma when no locales are generated ([b16931c](https://github.com/ReVanced/revanced-manager/commit/b16931ca79d5ce4d17c75f6dd3bf6f976b8ff7be))
-
-
-### Features
-
-* Add language settings ([#2913](https://github.com/ReVanced/revanced-manager/issues/2913)) ([df31b39](https://github.com/ReVanced/revanced-manager/commit/df31b39cc8c1fbf00bc3301468e8e7e4b283caf2))
-
-# app [1.26.0-dev.17](https://github.com/ReVanced/revanced-manager/compare/v1.26.0-dev.16...v1.26.0-dev.17) (2026-01-06)
-
-
-### Bug Fixes
-
-* allow updating patches on metered networks ([9d9a0e8](https://github.com/ReVanced/revanced-manager/commit/9d9a0e81dbc9e73e6e3181f6bea9cabb69e49ea8))
-
 # app [1.26.0-dev.16](https://github.com/ReVanced/revanced-manager/compare/v1.26.0-dev.15...v1.26.0-dev.16) (2025-12-30)
 
 

app/build.gradle.kts

@@ -143,25 +143,13 @@ android {
                     (preRelease?.substringAfterLast('.')?.toInt() ?: 99)
         }
         vectorDrawables.useSupportLibrary = true
-
-        val resDir = file("src/main/res")
-        val locales = resDir.listFiles()
-            .orEmpty()
-            //noinspection WrongGradleMethod
-            .filter { it.isDirectory && it.name.matches(Regex("values-[a-z]{2}(-r[A-Z]{2})?")) }
-            //noinspection WrongGradleMethod
-            .map { it.name.removePrefix("values-").replace("-r", "-") }
-            .sorted()
-            //noinspection WrongGradleMethod
-            .joinToString(prefix = "{", separator = ",", postfix = "}") { "\"$it\"" }
-
-        buildConfigField("String[]", "SUPPORTED_LOCALES", locales)
     }
 
     buildTypes {
         debug {
             applicationIdSuffix = ".debug"
             resValue("string", "app_name", "ReVanced Manager (Debug)")
+            isPseudoLocalesEnabled = true
 
             buildConfigField("long", "BUILD_ID", "${Random.nextLong()}L")
         }
@@ -243,8 +231,10 @@ android {
         buildConfig = true
     }
 
-    androidResources {
-        generateLocaleConfig = true
+    android {
+        androidResources {
+            generateLocaleConfig = true
+        }
     }
 
     externalNativeBuild {

app/gradle.properties

@@ -1 +1 @@
-version = 1.26.0-dev.19
+version = 1.26.0-dev.16

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

@@ -3,11 +3,11 @@ package app.revanced.manager
 import android.content.ActivityNotFoundException
 import android.os.Bundle
 import android.os.Parcelable
+import androidx.activity.ComponentActivity
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.animation.slideInHorizontally
 import androidx.compose.animation.slideOutHorizontally
@@ -30,7 +30,7 @@ import app.revanced.manager.ui.model.navigation.ComplexParameter
 import app.revanced.manager.ui.model.navigation.Dashboard
 import app.revanced.manager.ui.model.navigation.InstalledApplicationInfo
 import app.revanced.manager.ui.model.navigation.Patcher
-import app.revanced.manager.ui.model.navigation.SelectedApplicationInfo
+import app.revanced.manager.ui.model.navigation.SelectedAppInfo
 import app.revanced.manager.ui.model.navigation.Settings
 import app.revanced.manager.ui.model.navigation.Update
 import app.revanced.manager.ui.screen.AppSelectorScreen
@@ -41,7 +41,9 @@ import app.revanced.manager.ui.screen.PatchesSelectorScreen
 import app.revanced.manager.ui.screen.RequiredOptionsScreen
 import app.revanced.manager.ui.screen.SelectedAppInfoScreen
 import app.revanced.manager.ui.screen.SettingsScreen
+import app.revanced.manager.ui.screen.SourceSelectorScreen
 import app.revanced.manager.ui.screen.UpdateScreen
+import app.revanced.manager.ui.screen.VersionSelectorScreen
 import app.revanced.manager.ui.screen.settings.AboutSettingsScreen
 import app.revanced.manager.ui.screen.settings.AdvancedSettingsScreen
 import app.revanced.manager.ui.screen.settings.ContributorSettingsScreen
@@ -63,7 +65,7 @@ import org.koin.androidx.compose.navigation.koinNavViewModel
 import org.koin.core.parameter.parametersOf
 import org.koin.androidx.viewmodel.ext.android.getViewModel as getActivityViewModel
 
-class MainActivity : AppCompatActivity() {
+class MainActivity : ComponentActivity() {
     @ExperimentalAnimationApi
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -95,23 +97,16 @@ class MainActivity : AppCompatActivity() {
                 dynamicColor = dynamicColor,
                 pureBlackTheme = pureBlackTheme
             ) {
-                ReVancedManager(vm)
+                ReVancedManager()
             }
         }
     }
 }
 
 @Composable
-private fun ReVancedManager(vm: MainViewModel) {
+private fun ReVancedManager() {
     val navController = rememberNavController()
 
-    EventEffect(vm.appSelectFlow) { app ->
-        navController.navigateComplex(
-            SelectedApplicationInfo,
-            SelectedApplicationInfo.ViewModelParams(app)
-        )
-    }
-
     NavHost(
         navController = navController,
         startDestination = Dashboard,
@@ -142,7 +137,12 @@ private fun ReVancedManager(vm: MainViewModel) {
             val data = it.toRoute<InstalledApplicationInfo>()
 
             InstalledAppInfoScreen(
-                onPatchClick = vm::selectApp,
+                onPatchClick = { packageName ->
+                    navController.navigateComplex(
+                        SelectedAppInfo,
+                        SelectedAppInfo.ViewModelParams(packageName)
+                    )
+                },
                 onBackClick = navController::popBackStack,
                 viewModel = koinViewModel { parametersOf(data.packageName) }
             )
@@ -150,8 +150,20 @@ private fun ReVancedManager(vm: MainViewModel) {
 
         composable<AppSelector> {
             AppSelectorScreen(
-                onSelect = vm::selectApp,
-                onStorageSelect = vm::selectApp,
+                onSelect = { packageName ->
+                    navController.navigateComplex(
+                        SelectedAppInfo,
+                        SelectedAppInfo.ViewModelParams(packageName)
+                    )
+                },
+                onStorageSelect = { packageName, localPath ->
+                    navController.navigateComplex(
+                        SelectedAppInfo,
+                        SelectedAppInfo.ViewModelParams(
+                            packageName, localPath
+                        )
+                    )
+                },
                 onBackClick = navController::popBackStack
             )
         }
@@ -179,11 +191,11 @@ private fun ReVancedManager(vm: MainViewModel) {
             )
         }
 
-        navigation<SelectedApplicationInfo>(startDestination = SelectedApplicationInfo.Main) {
-            composable<SelectedApplicationInfo.Main> {
+        navigation<SelectedAppInfo>(startDestination = SelectedAppInfo.Main) {
+            composable<SelectedAppInfo.Main> {
                 val parentBackStackEntry = navController.navGraphEntry(it)
                 val data =
-                    parentBackStackEntry.getComplexArg<SelectedApplicationInfo.ViewModelParams>()
+                    parentBackStackEntry.getComplexArg<SelectedAppInfo.ViewModelParams>()
                 val viewModel =
                     koinNavViewModel<SelectedAppInfoViewModel>(viewModelStoreOwner = parentBackStackEntry) {
                         parametersOf(data)
@@ -199,23 +211,47 @@ private fun ReVancedManager(vm: MainViewModel) {
                             )
                         }
                     },
-                    onPatchSelectorClick = { app, patches, options ->
+                    onPatchSelectorClick = { packageName, version, patchSelection, options ->
                         navController.navigateComplex(
-                            SelectedApplicationInfo.PatchesSelector,
-                            SelectedApplicationInfo.PatchesSelector.ViewModelParams(
-                                app,
-                                patches,
-                                options
+                            SelectedAppInfo.PatchesSelector,
+                            SelectedAppInfo.PatchesSelector.ViewModelParams(
+                                packageName,
+                                version,
+                                patchSelection,
+                                options,
                             )
                         )
                     },
-                    onRequiredOptions = { app, patches, options ->
+                    onRequiredOptions = { packageName, version, patchSelection, options ->
                         navController.navigateComplex(
-                            SelectedApplicationInfo.RequiredOptions,
-                            SelectedApplicationInfo.PatchesSelector.ViewModelParams(
-                                app,
-                                patches,
-                                options
+                            SelectedAppInfo.RequiredOptions,
+                            SelectedAppInfo.PatchesSelector.ViewModelParams(
+                                packageName,
+                                version,
+                                patchSelection,
+                                options,
+                            )
+                        )
+                    },
+                    onVersionClick = { packageName, patchSelection, selectedVersion, local ->
+                        navController.navigateComplex(
+                            SelectedAppInfo.VersionSelector,
+                            SelectedAppInfo.VersionSelector.ViewModelParams(
+                                packageName,
+                                patchSelection,
+                                selectedVersion,
+                                local,
+                            )
+                        )
+                    },
+                    onSourceClick = { packageName, version, selectedSource, local ->
+                        navController.navigateComplex(
+                            SelectedAppInfo.SourceSelector,
+                            SelectedAppInfo.SourceSelector.ViewModelParams(
+                                packageName,
+                                version,
+                                selectedSource,
+                                local,
                             )
                         )
                     },
@@ -223,9 +259,9 @@ private fun ReVancedManager(vm: MainViewModel) {
                 )
             }
 
-            composable<SelectedApplicationInfo.PatchesSelector> {
+            composable<SelectedAppInfo.PatchesSelector> {
                 val data =
-                    it.getComplexArg<SelectedApplicationInfo.PatchesSelector.ViewModelParams>()
+                    it.getComplexArg<SelectedAppInfo.PatchesSelector.ViewModelParams>()
                 val selectedAppInfoVm = koinNavViewModel<SelectedAppInfoViewModel>(
                     viewModelStoreOwner = navController.navGraphEntry(it)
                 )
@@ -240,9 +276,43 @@ private fun ReVancedManager(vm: MainViewModel) {
                 )
             }
 
-            composable<SelectedApplicationInfo.RequiredOptions> {
+            composable<SelectedAppInfo.VersionSelector> {
                 val data =
-                    it.getComplexArg<SelectedApplicationInfo.PatchesSelector.ViewModelParams>()
+                    it.getComplexArg<SelectedAppInfo.VersionSelector.ViewModelParams>()
+                val selectedAppInfoVm = koinNavViewModel<SelectedAppInfoViewModel>(
+                    viewModelStoreOwner = navController.navGraphEntry(it)
+                )
+
+                VersionSelectorScreen(
+                    onBackClick = navController::popBackStack,
+                    onSave = { version ->
+                        selectedAppInfoVm.updateVersion(version)
+                        navController.popBackStack()
+                    },
+                    viewModel = koinViewModel { parametersOf(data) }
+                )
+            }
+
+            composable<SelectedAppInfo.SourceSelector> {
+                val data =
+                    it.getComplexArg<SelectedAppInfo.SourceSelector.ViewModelParams>()
+                val selectedAppInfoVm = koinNavViewModel<SelectedAppInfoViewModel>(
+                    viewModelStoreOwner = navController.navGraphEntry(it)
+                )
+
+                SourceSelectorScreen(
+                    onBackClick = navController::popBackStack,
+                    onSave = { source ->
+                        selectedAppInfoVm.updateSource(source)
+                        navController.popBackStack()
+                    },
+                    viewModel = koinViewModel { parametersOf(data) }
+                )
+            }
+
+            composable<SelectedAppInfo.RequiredOptions> {
+                val data =
+                    it.getComplexArg<SelectedAppInfo.PatchesSelector.ViewModelParams>()
                 val selectedAppInfoVm = koinNavViewModel<SelectedAppInfoViewModel>(
                     viewModelStoreOwner = navController.navGraphEntry(it)
                 )

app/src/main/java/app/revanced/manager/data/platform/NetworkInfo.kt

@@ -15,5 +15,5 @@ class NetworkInfo(app: Application) {
     /**
      * Returns true if it is safe to download large files.
      */
-    fun isSafe(ignoreMetered: Boolean) = isConnected() && (ignoreMetered || isUnmetered())
+    fun isSafe() = isConnected() && isUnmetered()
 }

app/src/main/java/app/revanced/manager/data/room/apps/downloaded/DownloadedAppDao.kt

@@ -2,7 +2,6 @@ package app.revanced.manager.data.room.apps.downloaded
 
 import androidx.room.Dao
 import androidx.room.Delete
-import androidx.room.Insert
 import androidx.room.Query
 import androidx.room.Upsert
 import kotlinx.coroutines.flow.Flow
@@ -12,6 +11,9 @@ interface DownloadedAppDao {
     @Query("SELECT * FROM downloaded_app")
     fun getAllApps(): Flow<List<DownloadedApp>>
 
+    @Query("SELECT * FROM downloaded_app WHERE package_name = :packageName")
+    fun get(packageName: String): Flow<List<DownloadedApp>>
+
     @Query("SELECT * FROM downloaded_app WHERE package_name = :packageName AND version = :version")
     suspend fun get(packageName: String, version: String): DownloadedApp?
 

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

@@ -24,4 +24,6 @@ val viewModelModule = module {
     viewModelOf(::InstalledAppInfoViewModel)
     viewModelOf(::UpdatesSettingsViewModel)
     viewModelOf(::BundleListViewModel)
+    viewModelOf(::VersionSelectorViewModel)
+    viewModelOf(::SourceSelectorViewModel)
 }

app/src/main/java/app/revanced/manager/domain/manager/PreferencesManager.kt

@@ -34,6 +34,4 @@ class PreferencesManager(
     val acknowledgedDownloaderPlugins = stringSetPreference("acknowledged_downloader_plugins", emptySet())
 
     val showDeveloperSettings = booleanPreference("show_developer_settings", context.isDebuggable)
-
-    val allowMeteredNetworks = booleanPreference("allow_metered_networks", false)
 }

app/src/main/java/app/revanced/manager/domain/repository/DownloadedAppRepository.kt

@@ -30,6 +30,8 @@ class DownloadedAppRepository(
 
     fun getAll() = dao.getAllApps().distinctUntilChanged()
 
+    fun get(packageName: String) = dao.get(packageName)
+
     fun getApkFileForApp(app: DownloadedApp): File =
         getApkFileForDir(dir.resolve(app.directory))
 

app/src/main/java/app/revanced/manager/domain/repository/PatchBundleRepository.kt

@@ -26,6 +26,7 @@ import app.revanced.manager.domain.manager.PreferencesManager
 import app.revanced.manager.patcher.patch.PatchInfo
 import app.revanced.manager.patcher.patch.PatchBundle
 import app.revanced.manager.patcher.patch.PatchBundleInfo
+import app.revanced.manager.util.PatchSelection
 import app.revanced.manager.util.simpleMessage
 import app.revanced.manager.util.tag
 import app.revanced.manager.util.toast
@@ -74,6 +75,17 @@ class PatchBundleRepository(
 
     val patchCountsFlow = bundleInfoFlow.map { it.mapValues { (_, info) -> info.patches.size } }
 
+    fun suggestedVersions(packageName: String, patchSelection: PatchSelection) =
+        bundleInfoFlow.map {
+            val allPatches = patchSelection.flatMap { (uid, patches) ->
+                val bundle = it[uid] ?: return@flatMap emptyList()
+                bundle.patches.filter { patch -> patches.contains(patch.name) }
+                    .map(PatchInfo::toPatcherPatch)
+            }.toSet()
+
+            allPatches.mostCommonCompatibleVersions(countUnusedPatches = true)[packageName]
+        }
+
     val suggestedVersions = bundleInfoFlow.map {
         val allPatches =
             it.values.flatMap { bundle -> bundle.patches.map(PatchInfo::toPatcherPatch) }.toSet()
@@ -286,29 +298,28 @@ class PatchBundleRepository(
             State(sources.toPersistentMap(), info.toPersistentMap())
         }
 
-    suspend fun createLocal(createStream: suspend () -> InputStream) =
-        dispatchAction("Add bundle") {
-            with(createEntity("", SourceInfo.Local).load() as LocalPatchBundle) {
-                try {
-                    createStream().use { patches -> replace(patches) }
-                } catch (e: Exception) {
-                    if (e is CancellationException) throw e
-                    Log.e(tag, "Got exception while importing bundle", e)
-                    withContext(Dispatchers.Main) {
-                        app.toast(app.getString(R.string.patches_replace_fail, e.simpleMessage()))
-                    }
-
-                    deleteLocalFile()
+    suspend fun createLocal(createStream: suspend () -> InputStream) = dispatchAction("Add bundle") {
+        with(createEntity("", SourceInfo.Local).load() as LocalPatchBundle) {
+            try {
+                createStream().use { patches -> replace(patches) }
+            } catch (e: Exception) {
+                if (e is CancellationException) throw e
+                Log.e(tag, "Got exception while importing bundle", e)
+                withContext(Dispatchers.Main) {
+                    app.toast(app.getString(R.string.patches_replace_fail, e.simpleMessage()))
                 }
-            }
 
-            doReload()
+                deleteLocalFile()
+            }
         }
 
+        doReload()
+    }
+
     suspend fun createRemote(url: String, autoUpdate: Boolean) =
         dispatchAction("Add bundle ($url)") { state ->
             val src = createEntity("", SourceInfo.from(url), autoUpdate).load() as RemotePatchBundle
-            update(src, force = true)
+            update(src)
             state.copy(sources = state.sources.put(src.uid, src))
         }
 
@@ -330,38 +341,32 @@ class PatchBundleRepository(
             state.copy(sources = state.sources.put(uid, newSrc))
         }
 
-    suspend fun update(
-        vararg sources: RemotePatchBundle,
-        showToast: Boolean = false,
-        force: Boolean = false
-    ) {
+    suspend fun update(vararg sources: RemotePatchBundle, showToast: Boolean = false) {
         val uids = sources.map { it.uid }.toSet()
-        store.dispatch(Update(showToast = showToast, force = force) { it.uid in uids })
+        store.dispatch(Update(showToast = showToast) { it.uid in uids })
     }
 
-    suspend fun redownloadRemoteBundles() = store.dispatch(Update(force = true, redownload = true))
+    suspend fun redownloadRemoteBundles() = store.dispatch(Update(force = true))
 
     /**
      * Updates all bundles that should be automatically updated.
      */
-    suspend fun updateCheck() =
-        store.dispatch(Update(force = prefs.allowMeteredNetworks.get()) { it.autoUpdate })
+    suspend fun updateCheck() = store.dispatch(Update { it.autoUpdate })
 
     private inner class Update(
         private val force: Boolean = false,
-        private val redownload: Boolean = false,
         private val showToast: Boolean = false,
         private val predicate: (bundle: RemotePatchBundle) -> Boolean = { true },
     ) : Action<State> {
         private suspend fun toast(@StringRes id: Int, vararg args: Any?) =
             withContext(Dispatchers.Main) { app.toast(app.getString(id, *args)) }
 
-        override fun toString() = if (redownload) "Redownload remote bundles" else "Update check"
+        override fun toString() = if (force) "Redownload remote bundles" else "Update check"
 
         override suspend fun ActionContext.execute(
             current: State
         ) = coroutineScope {
-            if (!networkInfo.isSafe(force)) {
+            if (!networkInfo.isSafe()) {
                 Log.d(tag, "Skipping update check because the network is down or metered.")
                 return@coroutineScope current
             }
@@ -374,7 +379,7 @@ class PatchBundleRepository(
                         Log.d(tag, "Updating patch bundle: ${it.name}")
 
                         val newVersion = with(it) {
-                            if (redownload) downloadLatest() else update()
+                            if (force) downloadLatest() else update()
                         } ?: return@async null
 
                         it to newVersion

app/src/main/java/app/revanced/manager/domain/repository/PatchSelectionRepository.kt

@@ -16,7 +16,7 @@ class PatchSelectionRepository(db: AppDatabase) {
             packageName = packageName
         ).also { dao.createSelection(it) }.uid
 
-    suspend fun getSelection(packageName: String): Map<Int, Set<String>> =
+    suspend fun getSelection(packageName: String): app.revanced.manager.util.PatchSelection =
         dao.getSelectedPatches(packageName).mapValues { it.value.toSet() }
 
     suspend fun updateSelection(packageName: String, selection: Map<Int, Set<String>>) =

app/src/main/java/app/revanced/manager/patcher/patch/PatchInfo.kt

@@ -40,7 +40,7 @@ data class PatchInfo(
             if (pkg.packageName != packageName) return@any false
             if (pkg.versions == null) return@any true
 
-            versionName != null && versionName in pkg.versions
+            versionName == null || versionName in pkg.versions
         }
     }
 

app/src/main/java/app/revanced/manager/patcher/worker/PatcherWorker.kt

@@ -39,7 +39,7 @@ import app.revanced.manager.patcher.toRemoteError
 import app.revanced.manager.plugin.downloader.GetScope
 import app.revanced.manager.plugin.downloader.PluginHostApi
 import app.revanced.manager.plugin.downloader.UserInteractionException
-import app.revanced.manager.ui.model.SelectedApp
+import app.revanced.manager.ui.model.SelectedSource
 import app.revanced.manager.util.Options
 import app.revanced.manager.util.PM
 import app.revanced.manager.util.PatchSelection
@@ -67,7 +67,9 @@ class PatcherWorker(
     private val rootInstaller: RootInstaller by inject()
 
     class Args(
-        val input: SelectedApp,
+        val packageName: String,
+        val version: String?,
+        val source: SelectedSource,
         val output: String,
         val selectedPatches: PatchSelection,
         val options: Options,
@@ -75,9 +77,7 @@ class PatcherWorker(
         val handleStartActivityRequest: suspend (LoadedDownloaderPlugin, Intent) -> ActivityResult,
         val setInputFile: suspend (File) -> Unit,
         val onEvent: (ProgressEvent) -> Unit,
-    ) {
-        val packageName get() = input.packageName
-    }
+    )
 
     override suspend fun getForegroundInfo() =
         ForegroundInfo(
@@ -142,7 +142,7 @@ class PatcherWorker(
         val patchedApk = fs.tempDir.resolve("patched.apk")
 
         return try {
-            if (args.input is SelectedApp.Installed) {
+            if (args.source is SelectedSource.Installed) {
                 installedAppRepository.get(args.packageName)?.let {
                     if (it.installType == InstallType.MOUNT) {
                         rootInstaller.unmount(args.packageName)
@@ -155,32 +155,23 @@ class PatcherWorker(
                     plugin,
                     data,
                     args.packageName,
-                    args.input.version,
+                    args.version,
                     prefs.suggestedVersionSafeguard.get(),
                     !prefs.disablePatchVersionCompatCheck.get(),
-                    onDownload = { progress ->
-                        args.onEvent(
-                            ProgressEvent.Progress(
-                                stepId = StepId.DownloadAPK,
-                                current = progress.first,
-                                total = progress.second
-                            )
+                ) { progress ->
+                    args.onEvent(
+                        ProgressEvent.Progress(
+                            stepId = StepId.DownloadAPK,
+                            current = progress.first,
+                            total = progress.second
                         )
-                    }
-                ).also { args.setInputFile(it) }
+                    )
+                }.also { args.setInputFile(it) }
 
-            val inputFile = when (val selectedApp = args.input) {
-                is SelectedApp.Download -> {
-                    runStep(StepId.DownloadAPK, args.onEvent) {
-                        val (plugin, data) = downloaderPluginRepository.unwrapParceledData(
-                            selectedApp.data
-                        )
+            val inputFile = when (val source = args.source) {
+                is SelectedSource.Auto -> throw Exception("Auto source is not supported in worker.")
 
-                        download(plugin, data)
-                    }
-                }
-
-                is SelectedApp.Search -> {
+                is SelectedSource.Plugin -> {
                     runStep(StepId.DownloadAPK, args.onEvent) {
                         downloaderPluginRepository.loadedPluginsFlow.first()
                             .firstNotNullOfOrNull { plugin ->
@@ -206,10 +197,10 @@ class PatcherWorker(
                                     withContext(Dispatchers.IO) {
                                         plugin.get(
                                             getScope,
-                                            selectedApp.packageName,
-                                            selectedApp.version
+                                            args.packageName,
+                                            args.version
                                         )
-                                    }?.takeIf { (_, version) -> selectedApp.version == null || version == selectedApp.version }
+                                    }?.takeIf { (_, version) -> args.version == null || version == args.version }
                                 } catch (e: UserInteractionException.Activity.NotCompleted) {
                                     throw e
                                 } catch (_: UserInteractionException) {
@@ -219,8 +210,10 @@ class PatcherWorker(
                     }
                 }
 
-                is SelectedApp.Local -> selectedApp.file.also { args.setInputFile(it) }
-                is SelectedApp.Installed -> File(pm.getPackageInfo(selectedApp.packageName)!!.applicationInfo!!.sourceDir)
+                is SelectedSource.Downloaded -> File(source.path)
+                is SelectedSource.Local -> File(source.path)
+
+                is SelectedSource.Installed -> File(pm.getPackageInfo(args.packageName)!!.applicationInfo!!.sourceDir)
             }
 
             val runtime = if (prefs.useProcessRuntime.get()) {
@@ -258,9 +251,7 @@ class PatcherWorker(
             Result.failure()
         } finally {
             patchedApk.delete()
-            if (args.input is SelectedApp.Local && args.input.temporary) {
-                args.input.file.delete()
-            }
+            if (args.source is SelectedSource.Local) File(args.source.path).delete()
         }
     }
 

app/src/main/java/app/revanced/manager/ui/component/AppLabel.kt

@@ -15,6 +15,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.style.TextOverflow
 import app.revanced.manager.R
 import io.github.fornewid.placeholder.material3.placeholder
 import kotlinx.coroutines.Dispatchers
@@ -47,6 +48,8 @@ fun AppLabel(
                 shape = RoundedCornerShape(100)
             )
             .then(modifier),
-        style = style
+        style = style,
+        maxLines = 1,
+        overflow = TextOverflow.Ellipsis,
     )
 }

app/src/main/java/app/revanced/manager/ui/model/SelectedApp.kt

@@ -1,35 +0,0 @@
-package app.revanced.manager.ui.model
-
-import android.os.Parcelable
-import app.revanced.manager.network.downloader.ParceledDownloaderData
-import kotlinx.parcelize.Parcelize
-import java.io.File
-
-sealed interface SelectedApp : Parcelable {
-    val packageName: String
-    val version: String?
-
-    @Parcelize
-    data class Download(
-        override val packageName: String,
-        override val version: String?,
-        val data: ParceledDownloaderData
-    ) : SelectedApp
-
-    @Parcelize
-    data class Search(override val packageName: String, override val version: String?) : SelectedApp
-
-    @Parcelize
-    data class Local(
-        override val packageName: String,
-        override val version: String,
-        val file: File,
-        val temporary: Boolean
-    ) : SelectedApp
-
-    @Parcelize
-    data class Installed(
-        override val packageName: String,
-        override val version: String
-    ) : SelectedApp
-}

app/src/main/java/app/revanced/manager/ui/model/SelectedSource.kt

@@ -0,0 +1,13 @@
+package app.revanced.manager.ui.model
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+sealed class SelectedSource : Parcelable {
+    data object Auto : SelectedSource()
+    data object Installed : SelectedSource()
+    data class Downloaded(val path: String, val version: String) : SelectedSource()
+    data class Local(val path: String) : SelectedSource()
+    data class Plugin(val packageName: String?) : SelectedSource()
+}

app/src/main/java/app/revanced/manager/ui/model/SelectedVersion.kt

@@ -0,0 +1,11 @@
+package app.revanced.manager.ui.model
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+sealed class SelectedVersion : Parcelable {
+    data object Auto : SelectedVersion()
+    data object Any : SelectedVersion()
+    data class Specific(val version: String) : SelectedVersion()
+}

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

@@ -1,7 +1,8 @@
 package app.revanced.manager.ui.model.navigation
 
 import android.os.Parcelable
-import app.revanced.manager.ui.model.SelectedApp
+import app.revanced.manager.ui.model.SelectedSource
+import app.revanced.manager.ui.model.SelectedVersion
 import app.revanced.manager.util.Options
 import app.revanced.manager.util.PatchSelection
 import kotlinx.parcelize.Parcelize
@@ -23,10 +24,11 @@ data class InstalledApplicationInfo(val packageName: String)
 data class Update(val downloadOnScreenEntry: Boolean = false)
 
 @Serializable
-data object SelectedApplicationInfo : ComplexParameter<SelectedApplicationInfo.ViewModelParams> {
+data object SelectedAppInfo : ComplexParameter<SelectedAppInfo.ViewModelParams> {
     @Parcelize
     data class ViewModelParams(
-        val app: SelectedApp,
+        val packageName: String,
+        val localPath: String? = null,
         val patches: PatchSelection? = null
     ) : Parcelable
 
@@ -37,12 +39,35 @@ data object SelectedApplicationInfo : ComplexParameter<SelectedApplicationInfo.V
     data object PatchesSelector : ComplexParameter<PatchesSelector.ViewModelParams> {
         @Parcelize
         data class ViewModelParams(
-            val app: SelectedApp,
-            val currentSelection: PatchSelection?,
+            val packageName: String,
+            val version: String?,
+            val patchSelection: PatchSelection?,
             val options: @RawValue Options,
         ) : Parcelable
     }
 
+    @Serializable
+    data object VersionSelector : ComplexParameter<VersionSelector.ViewModelParams> {
+        @Parcelize
+        data class ViewModelParams(
+            val packageName: String,
+            val patchSelection: PatchSelection,
+            val selectedVersion: SelectedVersion,
+            val localPath: String? = null,
+        ) : Parcelable
+    }
+
+    @Serializable
+    data object SourceSelector : ComplexParameter<SourceSelector.ViewModelParams> {
+        @Parcelize
+        data class ViewModelParams(
+            val packageName: String,
+            val version: String?,
+            val selectedSource: SelectedSource,
+            val localPath: String? = null,
+        ) : Parcelable
+    }
+
     @Serializable
     data object RequiredOptions : ComplexParameter<PatchesSelector.ViewModelParams>
 }
@@ -51,7 +76,9 @@ data object SelectedApplicationInfo : ComplexParameter<SelectedApplicationInfo.V
 data object Patcher : ComplexParameter<Patcher.ViewModelParams> {
     @Parcelize
     data class ViewModelParams(
-        val selectedApp: SelectedApp,
+        val packageName: String,
+        val version: String?,
+        val selectedSource: SelectedSource,
         val selectedPatches: PatchSelection,
         val options: @RawValue Options
     ) : Parcelable

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

@@ -44,7 +44,6 @@ import app.revanced.manager.ui.component.LazyColumnWithScrollbar
 import app.revanced.manager.ui.component.LoadingIndicator
 import app.revanced.manager.ui.component.NonSuggestedVersionDialog
 import app.revanced.manager.ui.component.SearchView
-import app.revanced.manager.ui.model.SelectedApp
 import app.revanced.manager.ui.viewmodel.AppSelectorViewModel
 import app.revanced.manager.util.APK_MIMETYPE
 import app.revanced.manager.util.EventEffect
@@ -54,13 +53,13 @@ import org.koin.androidx.compose.koinViewModel
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun AppSelectorScreen(
-    onSelect: (String) -> Unit,
-    onStorageSelect: (SelectedApp.Local) -> Unit,
+    onSelect: (packageName: String) -> Unit,
+    onStorageSelect: (packageName: String, path: String) -> Unit,
     onBackClick: () -> Unit,
     vm: AppSelectorViewModel = koinViewModel()
 ) {
     EventEffect(flow = vm.storageSelectionFlow) {
-        onStorageSelect(it)
+        onStorageSelect(it.first, it.second)
     }
 
     val pickApkLauncher =
@@ -83,12 +82,12 @@ fun AppSelectorScreen(
         }
     }
 
-    vm.nonSuggestedVersionDialogSubject?.let {
-        NonSuggestedVersionDialog(
-            suggestedVersion = suggestedVersions[it.packageName].orEmpty(),
-            onDismiss = vm::dismissNonSuggestedVersionDialog
-        )
-    }
+//    vm.nonSuggestedVersionDialogSubject?.let {
+//        NonSuggestedVersionDialog(
+//            suggestedVersion = suggestedVersions[it.packageName].orEmpty(),
+//            onDismiss = vm::dismissNonSuggestedVersionDialog
+//        )
+//    }
 
     if (search)
         SearchView(
@@ -115,8 +114,7 @@ fun AppSelectorScreen(
                                 )
                             },
                             headlineContent = { AppLabel(app.packageInfo) },
-                            supportingContent = { Text(app.packageName) },
-                            trailingContent = app.patches?.let {
+                            supportingContent = app.patches?.let {
                                 {
                                     Text(
                                         pluralStringResource(
@@ -214,12 +212,7 @@ fun AppSelectorScreen(
                                 defaultText = app.packageName
                             )
                         },
-                        supportingContent = {
-                            suggestedVersions[app.packageName]?.let {
-                                Text(stringResource(R.string.suggested_version_info, it))
-                            }
-                        },
-                        trailingContent = app.patches?.let {
+                        supportingContent = app.patches?.let {
                             {
                                 Text(
                                     pluralStringResource(

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

@@ -498,7 +498,7 @@ private fun PatchItem(
     leadingContent = {
         HapticCheckbox(
             checked = selected,
-            onCheckedChange = { onToggle() },
+            onCheckedChange = null,
             enabled = compatible
         )
     },

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

@@ -1,16 +1,12 @@
 package app.revanced.manager.ui.screen
 
-import androidx.activity.compose.rememberLauncherForActivityResult
-import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.StringRes
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.outlined.ArrowRight
 import androidx.compose.material.icons.filled.AutoFixHigh
@@ -21,11 +17,9 @@ import androidx.compose.material3.ListItem
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
@@ -37,33 +31,30 @@ import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import app.revanced.manager.R
 import app.revanced.manager.data.platform.NetworkInfo
-import app.revanced.manager.data.room.apps.installed.InstallType
-import app.revanced.manager.data.room.apps.installed.InstalledApp
-import app.revanced.manager.network.downloader.LoadedDownloaderPlugin
-import app.revanced.manager.ui.component.AlertDialogExtended
 import app.revanced.manager.ui.component.AppInfo
 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.NotificationCard
 import app.revanced.manager.ui.component.haptics.HapticExtendedFloatingActionButton
-import app.revanced.manager.ui.model.SelectedApp
+import app.revanced.manager.ui.model.SelectedSource
+import app.revanced.manager.ui.model.SelectedVersion
 import app.revanced.manager.ui.viewmodel.SelectedAppInfoViewModel
-import app.revanced.manager.util.EventEffect
 import app.revanced.manager.util.Options
 import app.revanced.manager.util.PatchSelection
 import app.revanced.manager.util.enabled
+import app.revanced.manager.util.patchCount
 import app.revanced.manager.util.toast
-import app.revanced.manager.util.transparentListItemColors
 import kotlinx.coroutines.launch
 import org.koin.compose.koinInject
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun SelectedAppInfoScreen(
-    onPatchSelectorClick: (SelectedApp, PatchSelection?, Options) -> Unit,
-    onRequiredOptions: (SelectedApp, PatchSelection?, Options) -> Unit,
+    onPatchSelectorClick: (packageName: String, version: String?, PatchSelection?, Options) -> Unit,
+    onRequiredOptions: (packageName: String, version: String?, PatchSelection?, Options) -> Unit,
     onPatchClick: () -> Unit,
+    onVersionClick: (packageName: String, patchSelection: PatchSelection, selectedVersion: SelectedVersion, localPath: String?) -> Unit,
+    onSourceClick: (packageName: String, version: String?, SelectedSource, localPath: String?) -> Unit,
     onBackClick: () -> Unit,
     vm: SelectedAppInfoViewModel
 ) {
@@ -72,29 +63,23 @@ fun SelectedAppInfoScreen(
     val networkConnected = remember { networkInfo.isConnected() }
     val networkMetered = remember { !networkInfo.isUnmetered() }
 
-    val packageName = vm.selectedApp.packageName
-    val version = vm.selectedApp.version
-    val bundles by vm.bundleInfoFlow.collectAsStateWithLifecycle(emptyList())
-
-    val allowIncompatiblePatches by vm.prefs.disablePatchVersionCompatCheck.getAsState()
-    val patches by remember {
-        derivedStateOf {
-            vm.getPatches(bundles, allowIncompatiblePatches)
-        }
-    }
-    val selectedPatchCount = patches.values.sumOf { it.size }
-
-    val launcher = rememberLauncherForActivityResult(
-        contract = ActivityResultContracts.StartActivityForResult(),
-        onResult = vm::handlePluginActivityResult
-    )
-    EventEffect(flow = vm.launchActivityFlow) { intent ->
-        launcher.launch(intent)
-    }
+    val packageName = vm.packageName
     val composableScope = rememberCoroutineScope()
 
     val error by vm.errorFlow.collectAsStateWithLifecycle(null)
 
+    val selectedVersion by vm.selectedVersion.collectAsStateWithLifecycle()
+    val resolvedVersion by vm.resolvedVersion.collectAsStateWithLifecycle(null)
+
+    val selectedSource by vm.selectedSource.collectAsStateWithLifecycle()
+    val resolvedSource by vm.resolvedSource.collectAsStateWithLifecycle(null)
+
+    val customSelection by vm.customSelection.collectAsStateWithLifecycle(null)
+    val fullPatchSelection by vm.patchSelection.collectAsStateWithLifecycle(emptyMap())
+    val patchCount = fullPatchSelection.patchCount
+
+    val incompatibleCount by vm.incompatiblePatchCount.collectAsStateWithLifecycle(0)
+
     val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState())
 
     Scaffold(
@@ -117,18 +102,18 @@ fun SelectedAppInfoScreen(
                     )
                 },
                 onClick = patchClick@{
-                    if (selectedPatchCount == 0) {
+                    if (patchCount == 0) {
                         context.toast(context.getString(R.string.no_patches_selected))
-
                         return@patchClick
                     }
 
                     composableScope.launch {
-                        if (!vm.hasSetRequiredOptions(patches)) {
+                        if (!vm.hasSetRequiredOptions(fullPatchSelection)) {
                             onRequiredOptions(
-                                vm.selectedApp,
-                                vm.getCustomPatches(bundles, allowIncompatiblePatches),
-                                vm.options
+                                vm.packageName,
+                                resolvedVersion,
+                                customSelection,
+                                vm.options,
                             )
                             return@launch
                         }
@@ -140,94 +125,96 @@ fun SelectedAppInfoScreen(
         },
         modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
     ) { paddingValues ->
-        val plugins by vm.plugins.collectAsStateWithLifecycle(emptyList())
-
-        if (vm.showSourceSelector) {
-            val requiredVersion by vm.requiredVersion.collectAsStateWithLifecycle(null)
-
-            AppSourceSelectorDialog(
-                plugins = plugins,
-                installedApp = vm.installedAppData,
-                searchApp = SelectedApp.Search(
-                    vm.packageName,
-                    vm.desiredVersion
-                ),
-                activeSearchJob = vm.activePluginAction,
-                hasRoot = vm.hasRoot,
-                onDismissRequest = vm::dismissSourceSelector,
-                onSelectPlugin = vm::searchUsingPlugin,
-                requiredVersion = requiredVersion,
-                onSelect = {
-                    vm.selectedApp = it
-                    vm.dismissSourceSelector()
-                }
-            )
-        }
-
         ColumnWithScrollbar(
             modifier = Modifier
                 .fillMaxSize()
                 .padding(paddingValues)
         ) {
             AppInfo(vm.selectedAppInfo, placeholderLabel = packageName) {
-                Text(
-                    version ?: stringResource(R.string.selected_app_meta_any_version),
-                    color = MaterialTheme.colorScheme.onSurfaceVariant,
-                    style = MaterialTheme.typography.bodyMedium,
-                )
+                vm.selectedAppInfo?.let {
+                    Text(
+                        it.packageName,
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
+                        style = MaterialTheme.typography.bodyMedium,
+                    )
+                }
             }
 
             PageItem(
                 R.string.patch_selector_item,
-                stringResource(
-                    R.string.patch_selector_item_description,
-                    selectedPatchCount
-                ),
+                stringResource(R.string.patch_selector_item_description, patchCount),
                 onClick = {
                     onPatchSelectorClick(
-                        vm.selectedApp,
-                        vm.getCustomPatches(
-                            bundles,
-                            allowIncompatiblePatches
-                        ),
+                        vm.packageName,
+                        resolvedVersion,
+                        customSelection,
                         vm.options
                     )
-                }
+                },
+                extraDescription = if (incompatibleCount > 0) { {
+                    Text(
+                        "$incompatibleCount incompatible",
+                        color = MaterialTheme.colorScheme.error,
+                        style = MaterialTheme.typography.bodyMedium,
+                    )
+                } } else null,
             )
+
+            val versionText = resolvedVersion ?: "Any available version"
+            val versionDescription = if (selectedVersion is SelectedVersion.Auto)
+                "Auto ($versionText)" // stringResource(R.string.selected_app_meta_auto_version, actualVersion)
+            else versionText
+
+            PageItem(
+                R.string.version_selector_item,
+                versionDescription,
+                onClick = {
+                    onVersionClick(
+                        packageName,
+                        fullPatchSelection,
+                        selectedVersion,
+                        vm.localPath,
+                    )
+                },
+            )
+
+            val sourceText = when (val source = resolvedSource) {
+                is SelectedSource.Installed -> "Installed APK"
+                is SelectedSource.Downloaded -> "Downloaded APK"
+                is SelectedSource.Local -> "Local APK"
+                is SelectedSource.Plugin -> {
+                    source.packageName ?: "Any available downloader"
+                }
+                else -> "Auto"
+            }
+            val sourceDescription = if (selectedSource is SelectedSource.Auto)
+                "Auto ($sourceText)" // stringResource(R.string.selected_app_meta_auto_version, actualVersion)
+            else sourceText
+
             PageItem(
                 R.string.apk_source_selector_item,
-                when (val app = vm.selectedApp) {
-                    is SelectedApp.Search -> stringResource(R.string.apk_source_auto)
-                    is SelectedApp.Installed -> stringResource(R.string.apk_source_installed)
-                    is SelectedApp.Download -> stringResource(
-                        R.string.apk_source_downloader,
-                        plugins.find { it.packageName == app.data.pluginPackageName }?.name
-                            ?: app.data.pluginPackageName
-                    )
-
-                    is SelectedApp.Local -> stringResource(R.string.apk_source_local)
-                },
-                onClick = {
-                    vm.showSourceSelector()
-                }
+                sourceDescription,
+                onClick = { onSourceClick(
+                    packageName,
+                    resolvedVersion,
+                    selectedSource,
+                    vm.localPath,
+                ) },
             )
+
             error?.let {
                 Text(
                     stringResource(it.resourceId),
                     color = MaterialTheme.colorScheme.error,
-                    modifier = Modifier.padding(horizontal = 24.dp)
+                    modifier = Modifier.padding(horizontal = 16.dp)
                 )
             }
 
-            Column(
-                modifier = Modifier.padding(horizontal = 24.dp),
+            if (resolvedSource is SelectedSource.Plugin) Column(
+                modifier = Modifier.padding(horizontal = 24.dp, vertical = 16.dp),
                 verticalArrangement = Arrangement.spacedBy(16.dp)
             ) {
-                val needsInternet =
-                    vm.selectedApp.let { it is SelectedApp.Search || it is SelectedApp.Download }
-
                 when {
-                    !needsInternet -> {}
                     !networkConnected -> {
                         NotificationCard(
                             isWarning = true,
@@ -236,7 +223,6 @@ fun SelectedAppInfoScreen(
                             onDismiss = null
                         )
                     }
-
                     networkMetered -> {
                         NotificationCard(
                             isWarning = true,
@@ -252,11 +238,17 @@ fun SelectedAppInfoScreen(
 }
 
 @Composable
-private fun PageItem(@StringRes title: Int, description: String, onClick: () -> Unit) {
+private fun PageItem(
+    @StringRes title: Int,
+    description: String,
+    onClick: () -> Unit,
+    enabled: Boolean = true,
+    extraDescription: @Composable (ColumnScope.() -> Unit)? = null,
+) {
     ListItem(
         modifier = Modifier
-            .clickable(onClick = onClick)
-            .padding(start = 8.dp),
+            .clickable(enabled, onClick = onClick)
+            .enabled(enabled),
         headlineContent = {
             Text(
                 stringResource(title),
@@ -265,99 +257,17 @@ private fun PageItem(@StringRes title: Int, description: String, onClick: () ->
             )
         },
         supportingContent = {
-            Text(
-                description,
-                color = MaterialTheme.colorScheme.outline,
-                style = MaterialTheme.typography.bodyMedium
-            )
+            Column {
+                Text(
+                    description,
+                    color = MaterialTheme.colorScheme.outline,
+                    style = MaterialTheme.typography.bodyMedium
+                )
+                extraDescription?.invoke(this)
+            }
         },
         trailingContent = {
             Icon(Icons.AutoMirrored.Outlined.ArrowRight, null)
         }
     )
-}
-
-@Composable
-private fun AppSourceSelectorDialog(
-    plugins: List<LoadedDownloaderPlugin>,
-    installedApp: Pair<SelectedApp.Installed, InstalledApp?>?,
-    searchApp: SelectedApp.Search,
-    activeSearchJob: String?,
-    hasRoot: Boolean,
-    requiredVersion: String?,
-    onDismissRequest: () -> Unit,
-    onSelectPlugin: (LoadedDownloaderPlugin) -> Unit,
-    onSelect: (SelectedApp) -> Unit,
-) {
-    val canSelect = activeSearchJob == null
-
-    AlertDialogExtended(
-        onDismissRequest = onDismissRequest,
-        confirmButton = {
-            TextButton(onClick = onDismissRequest) {
-                Text(stringResource(R.string.cancel))
-            }
-        },
-        title = { Text(stringResource(R.string.app_source_dialog_title)) },
-        textHorizontalPadding = PaddingValues(horizontal = 0.dp),
-        text = {
-            LazyColumn {
-                item(key = "auto") {
-                    val hasPlugins = plugins.isNotEmpty()
-                    ListItem(
-                        modifier = Modifier
-                            .clickable(enabled = canSelect && hasPlugins) { onSelect(searchApp) }
-                            .enabled(hasPlugins),
-                        headlineContent = { Text(stringResource(R.string.app_source_dialog_option_auto)) },
-                        supportingContent = {
-                            Text(
-                                if (hasPlugins)
-                                    stringResource(R.string.app_source_dialog_option_auto_description)
-                                else
-                                    stringResource(R.string.app_source_dialog_option_auto_unavailable)
-                            )
-                        },
-                        colors = transparentListItemColors
-                    )
-                }
-
-                installedApp?.let { (app, meta) ->
-                    item(key = "installed") {
-                        val (usable, text) = when {
-                            // Mounted apps must be unpatched before patching, which cannot be done without root access.
-                            meta?.installType == InstallType.MOUNT && !hasRoot -> false to stringResource(
-                                R.string.app_source_dialog_option_installed_no_root
-                            )
-                            // Patching already patched apps is not allowed because patches expect unpatched apps.
-                            meta?.installType == InstallType.DEFAULT -> false to stringResource(R.string.already_patched)
-                            // Version does not match suggested version.
-                            requiredVersion != null && app.version != requiredVersion -> false to stringResource(
-                                R.string.app_source_dialog_option_installed_version_not_suggested,
-                                app.version
-                            )
-
-                            else -> true to app.version
-                        }
-                        ListItem(
-                            modifier = Modifier
-                                .clickable(enabled = canSelect && usable) { onSelect(app) }
-                                .enabled(usable),
-                            headlineContent = { Text(stringResource(R.string.installed)) },
-                            supportingContent = { Text(text) },
-                            colors = transparentListItemColors
-                        )
-                    }
-                }
-
-                items(plugins, key = { "plugin_${it.packageName}" }) { plugin ->
-                    ListItem(
-                        modifier = Modifier.clickable(enabled = canSelect) { onSelectPlugin(plugin) },
-                        headlineContent = { Text(plugin.name) },
-                        trailingContent = (@Composable { LoadingIndicator() }).takeIf { activeSearchJob == plugin.packageName },
-                        colors = transparentListItemColors
-                    )
-                }
-            }
-        }
-    )
 }

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

@@ -0,0 +1,154 @@
+package app.revanced.manager.ui.screen
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Save
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.ListItem
+import androidx.compose.material3.RadioButton
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import app.revanced.manager.R
+import app.revanced.manager.ui.component.AppTopBar
+import app.revanced.manager.ui.component.LazyColumnWithScrollbar
+import app.revanced.manager.ui.component.haptics.HapticExtendedFloatingActionButton
+import app.revanced.manager.ui.model.SelectedSource
+import app.revanced.manager.ui.viewmodel.SourceSelectorViewModel
+import app.revanced.manager.util.enabled
+import app.revanced.manager.util.transparentListItemColors
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun SourceSelectorScreen(
+    onBackClick: () -> Unit,
+    onSave: (source: SelectedSource) -> Unit,
+    viewModel: SourceSelectorViewModel,
+) {
+    val downloadedApps by viewModel.downloadedApps.collectAsStateWithLifecycle(emptyList())
+    val plugins by viewModel.plugins.collectAsStateWithLifecycle(emptyList())
+
+    Scaffold(
+        topBar = {
+            AppTopBar(
+                title = { Text("Select source") },
+                onBackClick = onBackClick,
+            )
+        },
+        floatingActionButton = {
+            HapticExtendedFloatingActionButton(
+                text = { Text(stringResource(R.string.save)) },
+                icon = { Icon(Icons.Outlined.Save, null) },
+                onClick = { onSave(viewModel.selectedSource) },
+            )
+        }
+    ) { paddingValues ->
+        LazyColumnWithScrollbar (
+            contentPadding = paddingValues,
+        ) {
+            item {
+                SourceOption(
+                    isSelected = viewModel.selectedSource == SelectedSource.Auto,
+                    onSelect = { viewModel.selectSource(SelectedSource.Auto) },
+                    headlineContent = { Text("Auto (Recommended)") },
+                    supportingContent = { Text("Automatically select the best available source") }
+                )
+            }
+            item {
+                SourceOption(
+                    isSelected = viewModel.selectedSource == SelectedSource.Plugin(null),
+                    onSelect = { viewModel.selectSource(SelectedSource.Plugin(null)) },
+                    headlineContent = { Text("Any available downloader") },
+                )
+            }
+
+            viewModel.localApp?.let { option ->
+                item {
+                    HorizontalDivider()
+                    SourceOption(
+                        sourceOption = option,
+                        isSelected = viewModel.selectedSource == option.source,
+                        onSelect = viewModel::selectSource,
+                    )
+                }
+            }
+
+            viewModel.installedSource?.let { option ->
+                item {
+                    HorizontalDivider()
+                    SourceOption(
+                        sourceOption = option,
+                        isSelected = viewModel.selectedSource == option.source,
+                        onSelect = viewModel::selectSource,
+                    )
+                }
+            }
+
+            if (downloadedApps.isNotEmpty()) item { HorizontalDivider() }
+            items(downloadedApps, key = { it.key }) { option ->
+                SourceOption(
+                    sourceOption = option,
+                    isSelected = viewModel.selectedSource == option.source,
+                    onSelect = viewModel::selectSource,
+                )
+            }
+
+            if (plugins.isNotEmpty()) item { HorizontalDivider() }
+            items(plugins, key = { it.key }) { option ->
+                SourceOption(
+                    sourceOption = option,
+                    isSelected = viewModel.selectedSource == option.source,
+                    onSelect = viewModel::selectSource,
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun SourceOption(
+    sourceOption: SourceSelectorViewModel.SourceOption,
+    isSelected: Boolean,
+    onSelect: (SelectedSource) -> Unit,
+) = SourceOption(
+    isSelected = isSelected,
+    onSelect = { onSelect(sourceOption.source) },
+    overlineContent = sourceOption.category?.let {{ Text(it) }},
+    headlineContent = { Text(sourceOption.title, maxLines = 1, overflow = TextOverflow.Ellipsis) },
+    supportingContent = sourceOption.disableReason?.let {{ Text(it.message) }},
+    enabled = sourceOption.disableReason == null,
+)
+
+@Composable
+private fun SourceOption(
+    isSelected: Boolean,
+    onSelect: () -> Unit,
+    headlineContent: @Composable (() -> Unit),
+    supportingContent: @Composable (() -> Unit)? = null,
+    overlineContent: @Composable (() -> Unit)? = null,
+    enabled: Boolean = true,
+) {
+    ListItem(
+        modifier = Modifier
+            .clickable(enabled) { onSelect() }
+            .enabled(enabled),
+        leadingContent = {
+            RadioButton(
+                selected = isSelected,
+                onClick = null
+            )
+        },
+        headlineContent = headlineContent,
+        supportingContent = supportingContent,
+        overlineContent = overlineContent,
+        colors = transparentListItemColors
+    )
+}

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

@@ -0,0 +1,139 @@
+package app.revanced.manager.ui.screen
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.MoreVert
+import androidx.compose.material.icons.outlined.Save
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.ListItem
+import androidx.compose.material3.RadioButton
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import app.revanced.manager.R
+import app.revanced.manager.ui.component.AppTopBar
+import app.revanced.manager.ui.component.haptics.HapticExtendedFloatingActionButton
+import app.revanced.manager.ui.model.SelectedVersion
+import app.revanced.manager.ui.viewmodel.VersionSelectorViewModel
+import app.revanced.manager.util.transparentListItemColors
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun VersionSelectorScreen(
+    onBackClick: () -> Unit,
+    onSave: (version: SelectedVersion) -> Unit,
+    viewModel: VersionSelectorViewModel,
+) {
+    val versions by viewModel.availableVersions.collectAsStateWithLifecycle(emptyList())
+    val downloadedVersions by viewModel.downloadedVersions.collectAsStateWithLifecycle(emptyList())
+    val localVersion by viewModel.localVersion.collectAsStateWithLifecycle(null)
+
+    Scaffold(
+        topBar = {
+            AppTopBar(
+                title = { Text("Select version") },
+                onBackClick = onBackClick,
+                actions = {
+                    IconButton({}) {
+                        Icon(Icons.Outlined.MoreVert, contentDescription = null)
+                    }
+                }
+            )
+        },
+        floatingActionButton = {
+            HapticExtendedFloatingActionButton(
+                text = { Text(stringResource(R.string.save)) },
+                icon = { Icon(Icons.Outlined.Save, contentDescription = null) },
+                onClick = { onSave(viewModel.selectedVersion) }
+            )
+        }
+    ) { paddingValues ->
+        Column(
+            modifier = Modifier.padding(paddingValues)
+        ) {
+            VersionOption(
+                version = SelectedVersion.Auto,
+                isSelected = viewModel.selectedVersion is SelectedVersion.Auto,
+                onSelect = viewModel::selectVersion,
+                headlineContent = { Text("Auto (Recommended)") },
+                supportingContent = { Text("Automatically select the best available version") }
+            )
+            HorizontalDivider()
+
+            if (versions.isNotEmpty()) {
+                LazyColumn {
+                    items(versions, key = { it.first.version }) { version ->
+                        val isDownloaded = downloadedVersions.contains(version.first.version)
+                        val isInstalled = viewModel.installedAppVersion == version.first.version
+                        val isLocal = localVersion == version.first.version
+
+                        val overlineText = when {
+                            isLocal -> "Local"
+                            isDownloaded && isInstalled -> "Downloaded, Installed"
+                            isDownloaded -> "Downloaded"
+                            isInstalled -> "Installed"
+                            else -> null
+                        }
+
+                        VersionOption(
+                            version = version.first,
+                            isSelected = viewModel.selectedVersion == version.first,
+                            onSelect = viewModel::selectVersion,
+                            headlineContent = { Text(version.first.version) },
+                            supportingContent = {
+                                Text(
+                                    "${version.second.let { if (it == 0) "No" else it }} incompatible patches"
+                                )
+                            },
+                            overlineContent = overlineText?.let { { Text(it) } }
+                        )
+                    }
+                }
+            } else {
+                VersionOption(
+                    version = SelectedVersion.Any,
+                    isSelected = viewModel.selectedVersion is SelectedVersion.Any,
+                    onSelect = viewModel::selectVersion,
+                    headlineContent = { Text("Any available version") },
+                    supportingContent = { Text("Use any available version regardless of compatibility") }
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun VersionOption(
+    version: SelectedVersion,
+    isSelected: Boolean,
+    onSelect: (SelectedVersion) -> Unit,
+    headlineContent: @Composable (() -> Unit),
+    supportingContent: @Composable (() -> Unit)? = null,
+    overlineContent: @Composable (() -> Unit)? = null,
+) {
+    ListItem(
+        modifier = Modifier
+            .clickable { onSelect(version) },
+        leadingContent = {
+            RadioButton(
+                selected = isSelected,
+                onClick = null
+            )
+        },
+        headlineContent = headlineContent,
+        supportingContent = supportingContent,
+        trailingContent = overlineContent,
+        colors = transparentListItemColors
+    )
+}

app/src/main/java/app/revanced/manager/ui/screen/settings/GeneralSettingsScreen.kt

@@ -8,8 +8,6 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.FilledTonalButton
@@ -21,7 +19,6 @@ import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
@@ -41,7 +38,6 @@ import app.revanced.manager.ui.theme.Theme
 import app.revanced.manager.ui.viewmodel.GeneralSettingsViewModel
 import org.koin.androidx.compose.koinViewModel
 import org.koin.compose.koinInject
-import java.util.Locale
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -52,7 +48,6 @@ fun GeneralSettingsScreen(
     val prefs = viewModel.prefs
     val coroutineScope = viewModel.viewModelScope
     var showThemePicker by rememberSaveable { mutableStateOf(false) }
-    var showLanguagePicker by rememberSaveable { mutableStateOf(false) }
 
     if (showThemePicker) {
         ThemePicker(
@@ -60,17 +55,6 @@ fun GeneralSettingsScreen(
             onConfirm = { viewModel.setTheme(it) }
         )
     }
-
-    if (showLanguagePicker) {
-        LanguagePicker(
-            supportedLocales = viewModel.getSupportedLocales(),
-            currentLocale = viewModel.getCurrentLocale(),
-            onDismiss = { showLanguagePicker = false },
-            onConfirm = { viewModel.setLocale(it) },
-            getDisplayName = { viewModel.getLocaleDisplayName(it) }
-        )
-    }
-
     val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState())
 
     Scaffold(
@@ -90,24 +74,6 @@ fun GeneralSettingsScreen(
         ) {
             GroupHeader(stringResource(R.string.appearance))
 
-            val currentLocale = viewModel.getCurrentLocale()
-            val currentLanguageDisplay = remember(currentLocale) {
-                currentLocale?.let { viewModel.getLocaleDisplayName(it) }
-            }
-            SettingsListItem(
-                modifier = Modifier.clickable { showLanguagePicker = true },
-                headlineContent = stringResource(R.string.language),
-                supportingContent = stringResource(R.string.language_description),
-                trailingContent = {
-                    FilledTonalButton(onClick = { showLanguagePicker = true }) {
-                        Text(
-                            currentLanguageDisplay
-                                ?: stringResource(R.string.language_system_default)
-                        )
-                    }
-                }
-            )
-
             val theme by prefs.theme.getAsState()
             SettingsListItem(
                 modifier = Modifier.clickable { showThemePicker = true },
@@ -139,14 +105,6 @@ fun GeneralSettingsScreen(
                     description = R.string.pure_black_theme_description
                 )
             }
-
-            GroupHeader(stringResource(R.string.networking))
-            BooleanItem(
-                preference = prefs.allowMeteredNetworks,
-                coroutineScope = coroutineScope,
-                headline = R.string.allow_metered_networks,
-                description = R.string.allow_metered_networks_description
-            )
         }
     }
 }
@@ -190,64 +148,4 @@ private fun ThemePicker(
             }
         }
     )
-}
-
-@Composable
-private fun LanguagePicker(
-    supportedLocales: List<Locale>,
-    currentLocale: Locale?,
-    onDismiss: () -> Unit,
-    onConfirm: (Locale?) -> Unit,
-    getDisplayName: (Locale) -> String
-) {
-    var selectedLocale by remember { mutableStateOf(currentLocale) }
-    val systemDefaultString = stringResource(R.string.language_system_default)
-
-    AlertDialog(
-        onDismissRequest = onDismiss,
-        title = { Text(stringResource(R.string.language)) },
-        text = {
-            Column(
-                modifier = Modifier.verticalScroll(rememberScrollState())
-            ) {
-                Row(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .clickable { selectedLocale = null },
-                    verticalAlignment = Alignment.CenterVertically
-                ) {
-                    HapticRadioButton(
-                        selected = selectedLocale == null,
-                        onClick = { selectedLocale = null }
-                    )
-                    Text(systemDefaultString)
-                }
-
-                supportedLocales.forEach { locale ->
-                    Row(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .clickable { selectedLocale = locale },
-                        verticalAlignment = Alignment.CenterVertically
-                    ) {
-                        HapticRadioButton(
-                            selected = selectedLocale == locale,
-                            onClick = { selectedLocale = locale }
-                        )
-                        Text(getDisplayName(locale))
-                    }
-                }
-            }
-        },
-        confirmButton = {
-            TextButton(
-                onClick = {
-                    onConfirm(selectedLocale)
-                    onDismiss()
-                }
-            ) {
-                Text(stringResource(R.string.apply))
-            }
-        }
-    )
 }

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

@@ -3,9 +3,6 @@ package app.revanced.manager.ui.viewmodel
 import android.app.Application
 import android.content.pm.PackageInfo
 import android.net.Uri
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.setValue
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
@@ -14,7 +11,6 @@ import androidx.lifecycle.viewmodel.compose.saveable
 import app.revanced.manager.R
 import app.revanced.manager.data.platform.Filesystem
 import app.revanced.manager.domain.repository.PatchBundleRepository
-import app.revanced.manager.ui.model.SelectedApp
 import app.revanced.manager.util.PM
 import app.revanced.manager.util.toast
 import kotlinx.coroutines.Dispatchers
@@ -31,7 +27,7 @@ class AppSelectorViewModel(
     private val app: Application,
     private val pm: PM,
     fs: Filesystem,
-    private val patchBundleRepository: PatchBundleRepository,
+    patchBundleRepository: PatchBundleRepository,
     savedStateHandle: SavedStateHandle,
 ) : ViewModel() {
     private val inputFile = savedStateHandle.saveable(key = "inputFile") {
@@ -42,19 +38,19 @@ class AppSelectorViewModel(
     }
     val appList = pm.appList
 
-    private val storageSelectionChannel = Channel<SelectedApp.Local>()
+    private val storageSelectionChannel = Channel<Pair<String, String>>()
     val storageSelectionFlow = storageSelectionChannel.receiveAsFlow()
 
     val suggestedAppVersions = patchBundleRepository.suggestedVersions.flowOn(Dispatchers.Default)
 
-    var nonSuggestedVersionDialogSubject by mutableStateOf<SelectedApp.Local?>(null)
-        private set
+//    var nonSuggestedVersionDialogSubject by mutableStateOf<SelectedApp.Local?>(null)
+//        private set
 
     fun loadLabel(app: PackageInfo?) = with(pm) { app?.label() ?: "Not installed" }
 
-    fun dismissNonSuggestedVersionDialog() {
-        nonSuggestedVersionDialogSubject = null
-    }
+//    fun dismissNonSuggestedVersionDialog() {
+//        nonSuggestedVersionDialogSubject = null
+//    }
 
     fun handleStorageResult(uri: Uri) = viewModelScope.launch {
         val selectedApp = withContext(Dispatchers.IO) {
@@ -66,11 +62,8 @@ class AppSelectorViewModel(
             return@launch
         }
 
-        if (patchBundleRepository.isVersionAllowed(selectedApp.packageName, selectedApp.version)) {
-            storageSelectionChannel.send(selectedApp)
-        } else {
-            nonSuggestedVersionDialogSubject = selectedApp
-        }
+        // TODO: Disallow if 0 patches are compatible
+        storageSelectionChannel.send(selectedApp)
     }
 
     private fun loadSelectedFile(uri: Uri) =
@@ -80,12 +73,7 @@ class AppSelectorViewModel(
                 Files.copy(stream, toPath())
 
                 pm.getPackageInfo(this)?.let { packageInfo ->
-                    SelectedApp.Local(
-                        packageName = packageInfo.packageName,
-                        version = packageInfo.versionName!!,
-                        file = this,
-                        temporary = true
-                    )
+                    Pair(packageInfo.packageName, path)
                 }
             }
         }

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

@@ -54,7 +54,6 @@ class BundleListViewModel : ViewModel(), KoinComponent {
                 patchBundleRepository.update(
                     *getSelectedSources().filterIsInstance<RemotePatchBundle>().toTypedArray(),
                     showToast = true,
-                    force = true
                 )
             }
         }
@@ -66,7 +65,7 @@ class BundleListViewModel : ViewModel(), KoinComponent {
     fun update(src: PatchBundleSource) = viewModelScope.launch {
         if (src !is RemotePatchBundle) return@launch
 
-        patchBundleRepository.update(src, showToast = true, force = true)
+        patchBundleRepository.update(src, showToast = true)
     }
 
     enum class Event {

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

@@ -1,26 +1,17 @@
 package app.revanced.manager.ui.viewmodel
 
-import android.app.Application
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import app.revanced.manager.domain.manager.PreferencesManager
 import app.revanced.manager.ui.theme.Theme
-import app.revanced.manager.util.SupportedLocales
 import app.revanced.manager.util.resetListItemColorsCached
 import kotlinx.coroutines.launch
-import java.util.Locale
 
 class GeneralSettingsViewModel(
-    private val app: Application,
     val prefs: PreferencesManager
 ) : ViewModel() {
     fun setTheme(theme: Theme) = viewModelScope.launch {
         prefs.theme.update(theme)
         resetListItemColorsCached()
     }
-
-    fun getSupportedLocales() = SupportedLocales.getSupportedLocales(app)
-    fun getCurrentLocale() = SupportedLocales.getCurrentLocale()
-    fun setLocale(locale: Locale?) = SupportedLocales.setLocale(locale)
-    fun getLocaleDisplayName(locale: Locale) = SupportedLocales.getDisplayName(locale)
 }

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

@@ -12,11 +12,9 @@ import app.revanced.manager.R
 import app.revanced.manager.domain.bundles.PatchBundleSource.Extensions.asRemoteOrNull
 import app.revanced.manager.domain.manager.KeystoreManager
 import app.revanced.manager.domain.manager.PreferencesManager
-import app.revanced.manager.domain.repository.DownloadedAppRepository
 import app.revanced.manager.domain.repository.PatchBundleRepository
 import app.revanced.manager.domain.repository.PatchSelectionRepository
 import app.revanced.manager.domain.repository.SerializedSelection
-import app.revanced.manager.ui.model.SelectedApp
 import app.revanced.manager.ui.theme.Theme
 import app.revanced.manager.util.tag
 import app.revanced.manager.util.toast
@@ -31,44 +29,14 @@ import kotlinx.serialization.json.Json
 class MainViewModel(
     private val patchBundleRepository: PatchBundleRepository,
     private val patchSelectionRepository: PatchSelectionRepository,
-    private val downloadedAppRepository: DownloadedAppRepository,
     private val keystoreManager: KeystoreManager,
     private val app: Application,
     val prefs: PreferencesManager,
     private val json: Json
 ) : ViewModel() {
-    private val appSelectChannel = Channel<SelectedApp>()
-    val appSelectFlow = appSelectChannel.receiveAsFlow()
     private val legacyImportActivityChannel = Channel<Intent>()
     val legacyImportActivityFlow = legacyImportActivityChannel.receiveAsFlow()
 
-    private suspend fun suggestedVersion(packageName: String) =
-        patchBundleRepository.suggestedVersions.first()[packageName]
-
-    private suspend fun findDownloadedApp(app: SelectedApp): SelectedApp.Local? {
-        if (app !is SelectedApp.Search) return null
-
-        val suggestedVersion = suggestedVersion(app.packageName) ?: return null
-
-        val downloadedApp =
-            downloadedAppRepository.get(app.packageName, suggestedVersion, markUsed = true)
-                ?: return null
-        return SelectedApp.Local(
-            downloadedApp.packageName,
-            downloadedApp.version,
-            downloadedAppRepository.getApkFileForApp(downloadedApp),
-            false
-        )
-    }
-
-    fun selectApp(app: SelectedApp) = viewModelScope.launch {
-        appSelectChannel.send(findDownloadedApp(app) ?: app)
-    }
-
-    fun selectApp(packageName: String) = viewModelScope.launch {
-        selectApp(SelectedApp.Search(packageName, suggestedVersion(packageName)))
-    }
-
     init {
         viewModelScope.launch {
             if (!prefs.firstLaunch.get()) return@launch

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

@@ -37,7 +37,7 @@ import app.revanced.manager.patcher.worker.PatcherWorker
 import app.revanced.manager.plugin.downloader.PluginHostApi
 import app.revanced.manager.plugin.downloader.UserInteractionException
 import app.revanced.manager.ui.model.InstallerModel
-import app.revanced.manager.ui.model.SelectedApp
+import app.revanced.manager.ui.model.SelectedSource
 import app.revanced.manager.ui.model.State
 import app.revanced.manager.ui.model.StepCategory
 import app.revanced.manager.ui.model.Step
@@ -93,9 +93,8 @@ class PatcherViewModel(
     private val ackpineInstaller: PackageInstaller = get()
 
     private var installedApp: InstalledApp? = null
-    private val selectedApp = input.selectedApp
-    val packageName = selectedApp.packageName
-    val version = selectedApp.version
+    val packageName = input.packageName
+    val version = input.version
 
     var installedPackageName by savedStateHandle.saveable(
         key = "installedPackageName",
@@ -160,7 +159,7 @@ class PatcherViewModel(
     }
 
     val steps by savedStateHandle.saveable(saver = snapshotStateListSaver()) {
-        generateSteps(app, input.selectedApp, input.selectedPatches).toMutableStateList()
+        generateSteps(app, input.selectedSource, input.selectedPatches).toMutableStateList()
     }
 
     val progress by derivedStateOf {
@@ -178,7 +177,9 @@ class PatcherViewModel(
         ParcelUuid(
             workerRepository.launchExpedited<PatcherWorker, PatcherWorker.Args>(
                 "patching", PatcherWorker.Args(
-                    input.selectedApp,
+                    input.packageName,
+                    input.version,
+                    input.selectedSource,
                     outputFile.path,
                     input.selectedPatches,
                     input.options,
@@ -257,7 +258,7 @@ class PatcherViewModel(
         super.onCleared()
         workManager.cancelWorkById(patcherWorkerId.uuid)
 
-        if (input.selectedApp is SelectedApp.Installed && installedApp?.installType == InstallType.MOUNT) {
+        if (input.selectedSource is SelectedSource.Installed && installedApp?.installType == InstallType.MOUNT) {
             GlobalScope.launch(Dispatchers.Main) {
                 uiSafe(app, R.string.failed_to_mount, "Failed to mount") {
                     withTimeout(Duration.ofMinutes(1L)) {
@@ -381,7 +382,7 @@ class PatcherViewModel(
                 installedAppRepository.addOrUpdate(
                     installerPkgName,
                     packageName,
-                    input.selectedApp.version
+                    input.version
                         ?: withContext(Dispatchers.IO) { pm.getPackageInfo(outputFile)?.versionName!! },
                     InstallType.DEFAULT,
                     input.selectedPatches
@@ -443,7 +444,7 @@ class PatcherViewModel(
                             }
                         }
 
-                        val inputVersion = input.selectedApp.version
+                        val inputVersion = input.version
                             ?: withContext(Dispatchers.IO) { inputFile?.let(pm::getPackageInfo)?.versionName }
                             ?: throw Exception("Failed to determine input APK version")
 
@@ -535,10 +536,10 @@ class PatcherViewModel(
 
         fun generateSteps(
             context: Context,
-            selectedApp: SelectedApp,
+            selectedSource: SelectedSource,
             selectedPatches: PatchSelection
         ): List<Step> = buildList {
-            if (selectedApp is SelectedApp.Download || selectedApp is SelectedApp.Search)
+            if (selectedSource is SelectedSource.Plugin)
                 add(
                     Step(
                         StepId.DownloadAPK,

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

@@ -20,7 +20,7 @@ import app.revanced.manager.domain.repository.PatchBundleRepository
 import app.revanced.manager.patcher.patch.PatchBundleInfo
 import app.revanced.manager.patcher.patch.PatchBundleInfo.Extensions.toPatchSelection
 import app.revanced.manager.patcher.patch.PatchInfo
-import app.revanced.manager.ui.model.navigation.SelectedApplicationInfo
+import app.revanced.manager.ui.model.navigation.SelectedAppInfo
 import app.revanced.manager.util.Options
 import app.revanced.manager.util.PatchSelection
 import app.revanced.manager.util.saver.Nullable
@@ -45,14 +45,14 @@ import org.koin.core.component.KoinComponent
 import org.koin.core.component.get
 
 @OptIn(SavedStateHandleSaveableApi::class)
-class PatchesSelectorViewModel(input: SelectedApplicationInfo.PatchesSelector.ViewModelParams) :
+class PatchesSelectorViewModel(input: SelectedAppInfo.PatchesSelector.ViewModelParams) :
     ViewModel(), KoinComponent {
     private val app: Application = get()
     private val savedStateHandle: SavedStateHandle = get()
     private val prefs: PreferencesManager = get()
 
-    private val packageName = input.app.packageName
-    val appVersion = input.app.version
+    private val packageName = input.packageName
+    val appVersion = input.version
 
     var selectionWarningEnabled by mutableStateOf(true)
         private set
@@ -62,7 +62,7 @@ class PatchesSelectorViewModel(input: SelectedApplicationInfo.PatchesSelector.Vi
     val allowIncompatiblePatches =
         get<PreferencesManager>().disablePatchVersionCompatCheck.getBlocking()
     val bundlesFlow =
-        get<PatchBundleRepository>().scopedBundleInfoFlow(packageName, input.app.version)
+        get<PatchBundleRepository>().scopedBundleInfoFlow(packageName, input.version)
 
     init {
         viewModelScope.launch {
@@ -88,7 +88,7 @@ class PatchesSelectorViewModel(input: SelectedApplicationInfo.PatchesSelector.Vi
         key = "selection",
         stateSaver = selectionSaver,
     ) {
-        mutableStateOf(input.currentSelection?.toPersistentPatchSelection())
+        mutableStateOf(input.patchSelection?.toPersistentPatchSelection())
     }
 
     private val patchOptions: PersistentOptions by savedStateHandle.saveable(

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

@@ -1,130 +1,188 @@
 package app.revanced.manager.ui.viewmodel
 
-import android.app.Activity
-import android.app.Application
-import android.content.Intent
 import android.content.pm.PackageInfo
 import android.os.Parcelable
-import android.util.Log
-import androidx.activity.result.ActivityResult
 import androidx.annotation.StringRes
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
-import androidx.compose.runtime.snapshotFlow
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import androidx.lifecycle.viewmodel.compose.SavedStateHandleSaveableApi
 import androidx.lifecycle.viewmodel.compose.saveable
 import app.revanced.manager.R
-import app.revanced.manager.data.room.apps.installed.InstalledApp
-import app.revanced.manager.domain.installer.RootInstaller
 import app.revanced.manager.domain.manager.PreferencesManager
+import app.revanced.manager.domain.repository.DownloadedAppRepository
 import app.revanced.manager.domain.repository.DownloaderPluginRepository
 import app.revanced.manager.domain.repository.InstalledAppRepository
 import app.revanced.manager.domain.repository.PatchBundleRepository
 import app.revanced.manager.domain.repository.PatchOptionsRepository
 import app.revanced.manager.domain.repository.PatchSelectionRepository
 import app.revanced.manager.patcher.patch.PatchBundleInfo
-import app.revanced.manager.patcher.patch.PatchBundleInfo.Extensions.toPatchSelection
-import app.revanced.manager.network.downloader.LoadedDownloaderPlugin
-import app.revanced.manager.network.downloader.ParceledDownloaderData
 import app.revanced.manager.patcher.patch.PatchBundleInfo.Extensions.requiredOptionsSet
-import app.revanced.manager.plugin.downloader.GetScope
+import app.revanced.manager.patcher.patch.PatchBundleInfo.Extensions.toPatchSelection
 import app.revanced.manager.plugin.downloader.PluginHostApi
-import app.revanced.manager.plugin.downloader.UserInteractionException
-import app.revanced.manager.ui.model.SelectedApp
+import app.revanced.manager.ui.model.SelectedSource
+import app.revanced.manager.ui.model.SelectedVersion
 import app.revanced.manager.ui.model.navigation.Patcher
-import app.revanced.manager.ui.model.navigation.SelectedApplicationInfo
+import app.revanced.manager.ui.model.navigation.SelectedAppInfo
 import app.revanced.manager.util.Options
 import app.revanced.manager.util.PM
 import app.revanced.manager.util.PatchSelection
-import app.revanced.manager.util.simpleMessage
-import app.revanced.manager.util.tag
-import app.revanced.manager.util.toast
-import kotlinx.coroutines.CancellationException
-import kotlinx.coroutines.CompletableDeferred
+import app.revanced.manager.util.patchCount
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.async
-import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.receiveAsFlow
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlinx.parcelize.Parcelize
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.get
+import java.io.File
 
 @OptIn(SavedStateHandleSaveableApi::class, PluginHostApi::class)
 class SelectedAppInfoViewModel(
-    input: SelectedApplicationInfo.ViewModelParams
+    private val input: SelectedAppInfo.ViewModelParams
 ) : ViewModel(), KoinComponent {
-    private val app: Application = get()
     private val bundleRepository: PatchBundleRepository = get()
     private val selectionRepository: PatchSelectionRepository = get()
     private val optionsRepository: PatchOptionsRepository = get()
     private val pluginsRepository: DownloaderPluginRepository = get()
     private val installedAppRepository: InstalledAppRepository = get()
-    private val rootInstaller: RootInstaller = get()
+    private val downloadedAppRepository: DownloadedAppRepository = get()
     private val pm: PM = get()
     private val savedStateHandle: SavedStateHandle = get()
-    val prefs: PreferencesManager = get()
+    private val prefs: PreferencesManager = get()
     val plugins = pluginsRepository.loadedPluginsFlow
-    val desiredVersion = input.app.version
-    val packageName = input.app.packageName
-
+    val packageName = input.packageName
+    val localPath = input.localPath
     private val persistConfiguration = input.patches == null
 
-    val hasRoot = rootInstaller.hasRootAccess()
-    var installedAppData: Pair<SelectedApp.Installed, InstalledApp?>? by mutableStateOf(null)
-        private set
 
-    private var _selectedApp by savedStateHandle.saveable {
-        mutableStateOf(input.app)
+    // User selection
+    private var selectionFlow = MutableStateFlow(
+        input.patches?.let { selection ->
+            SelectionState.Customized(selection)
+        } ?: SelectionState.Default
+    )
+
+    private val _selectedVersion = MutableStateFlow<SelectedVersion>(SelectedVersion.Auto)
+    val selectedVersion: StateFlow<SelectedVersion> = _selectedVersion
+
+    private val _selectedSource = MutableStateFlow<SelectedSource>(SelectedSource.Auto)
+    val selectedSource: StateFlow<SelectedSource> = _selectedSource
+
+    fun updateVersion(version: SelectedVersion) {
+        _selectedVersion.value = version
+    }
+    fun updateSource(source: SelectedSource) {
+        _selectedSource.value = source
+    }
+    fun updateConfiguration(
+        selection: PatchSelection?,
+        selectedOptions: Options
+    ) = viewModelScope.launch {
+        selectionFlow.value = selection?.let(SelectionState::Customized) ?: SelectionState.Default
+
+        val filteredOptions = selectedOptions.filtered(bundleInfoFlow.first())
+        options = filteredOptions
+
+        if (persistConfiguration) {
+            selection?.let { selectionRepository.updateSelection(packageName, it) }
+                ?: selectionRepository.resetSelectionForPackage(packageName)
+
+            optionsRepository.saveOptions(packageName, filteredOptions)
+        }
     }
 
-    var selectedAppInfo: PackageInfo? by mutableStateOf(null)
-        private set
 
-    var selectedApp
-        get() = _selectedApp
-        set(value) {
-            _selectedApp = value
-            invalidateSelectedAppInfo()
+    // All patches for package
+    val bundles = bundleRepository.scopedBundleInfoFlow(packageName, null)
+
+    // Selection derived from selectionFlow
+    val patchSelection = combine(
+        selectionFlow,
+        bundles,
+    ) { selection, bundles ->
+        selection.patches(bundles, allowIncompatible = true)
+    }
+
+    val customSelection = combine(
+        selectionFlow,
+        bundles,
+    ) { selection, bundles ->
+        (selection as? SelectionState.Customized)?.patches(bundles, allowIncompatible = true)
+    }
+
+    // Most compatible versions based on patch selection
+    @OptIn(ExperimentalCoroutinesApi::class)
+    val mostCompatibleVersions = patchSelection.flatMapLatest { patchSelection ->
+        bundleRepository.suggestedVersions(
+            packageName,
+            patchSelection
+        )
+    }
+
+    // Resolve actual version from user selection
+    val resolvedVersion = combine(
+        _selectedVersion,
+        mostCompatibleVersions,
+    ) { selected, mostCompatible ->
+        when (selected) {
+            is SelectedVersion.Specific -> selected.version
+            is SelectedVersion.Any -> null
+            is SelectedVersion.Auto -> mostCompatible?.maxWithOrNull(
+                compareBy<Map.Entry<String, Int>> { it.value }
+                    .thenBy { it.key }
+            )?.key
         }
+    }
 
-    init {
-        invalidateSelectedAppInfo()
-        viewModelScope.launch(Dispatchers.Main) {
-            val packageInfo = async(Dispatchers.IO) { pm.getPackageInfo(packageName) }
-            val installedAppDeferred =
-                async(Dispatchers.IO) { installedAppRepository.get(packageName) }
+    @OptIn(ExperimentalCoroutinesApi::class)
+    val scopedBundles = resolvedVersion.flatMapLatest { version ->
+        bundleRepository.scopedBundleInfoFlow(packageName, version)
+    }
 
-            installedAppData =
-                packageInfo.await()?.let {
-                    SelectedApp.Installed(
-                        packageName,
-                        it.versionName!!
-                    ) to installedAppDeferred.await()
+    val incompatiblePatchCount = scopedBundles.map { bundles ->
+        bundles.sumOf { bundle ->
+            bundle.incompatible.size
+        }
+    }
+
+    // Resolve actual source from user selection
+    val resolvedSource = combine(
+        _selectedSource,
+        resolvedVersion
+    ) { source, version ->
+        when (source) {
+            is SelectedSource.Installed -> source
+            is SelectedSource.Local -> source
+            is SelectedSource.Downloaded -> source
+            is SelectedSource.Plugin -> source
+            is SelectedSource.Auto -> {
+                val app = version?.let {
+                    downloadedAppRepository.get(packageName, it)
                 }
+                val file = app?.let {
+                    downloadedAppRepository.getApkFileForApp(it)
+                }
+
+                file?.let { SelectedSource.Downloaded(it.path, version) }
+                    ?: SelectedSource.Plugin(null)
+            }
         }
     }
 
-    val requiredVersion = combine(
-        prefs.suggestedVersionSafeguard.flow,
-        bundleRepository.suggestedVersions
-    ) { suggestedVersionSafeguard, suggestedVersions ->
-        if (!suggestedVersionSafeguard) return@combine null
-
-        suggestedVersions[input.app.packageName]
-    }
-
     val bundleInfoFlow by derivedStateOf {
-        bundleRepository.scopedBundleInfoFlow(packageName, selectedApp.version)
+        bundleRepository.scopedBundleInfoFlow(packageName, null)
     }
 
     var options: Options by savedStateHandle.saveable {
@@ -142,121 +200,42 @@ class SelectedAppInfoViewModel(
     }
         private set
 
-    private var selectionState: SelectionState by savedStateHandle.saveable {
-        if (input.patches != null)
-            return@saveable mutableStateOf(SelectionState.Customized(input.patches))
 
-        // Try to get the previous selection if customization is enabled.
-        viewModelScope.launch {
-            if (!prefs.disableSelectionWarning.get()) return@launch
-
-            val previous = selectionRepository.getSelection(packageName)
-            if (previous.values.sumOf { it.size } == 0) return@launch
-            selectionState = SelectionState.Customized(previous)
-        }
-
-        mutableStateOf(SelectionState.Default)
-    }
-
-    var showSourceSelector by mutableStateOf(false)
-        private set
-    private var pluginAction: Pair<LoadedDownloaderPlugin, Job>? by mutableStateOf(null)
-    val activePluginAction get() = pluginAction?.first?.packageName
-    private var launchedActivity by mutableStateOf<CompletableDeferred<ActivityResult>?>(null)
-    private val launchActivityChannel = Channel<Intent>()
-    val launchActivityFlow = launchActivityChannel.receiveAsFlow()
-
-    val errorFlow = combine(plugins, snapshotFlow { selectedApp }) { pluginsList, app ->
+    val errorFlow = combine(
+        plugins,
+        resolvedSource,
+    ) { pluginsList, source ->
         when {
-            app is SelectedApp.Search && pluginsList.isEmpty() -> Error.NoPlugins
+            source is SelectedSource.Plugin && pluginsList.isEmpty() -> Error.NoPlugins
             else -> null
         }
     }
 
-    fun showSourceSelector() {
-        dismissSourceSelector()
-        showSourceSelector = true
+
+
+//    var installedAppData: Pair<SelectedApp.Installed, InstalledApp?>? by mutableStateOf(null)
+//        private set
+
+    private var _selectedApp by savedStateHandle.saveable {
+        mutableStateOf(null)
     }
 
-    private fun cancelPluginAction() {
-        pluginAction?.second?.cancel()
-        pluginAction = null
-    }
+    var selectedAppInfo: PackageInfo? by mutableStateOf(null)
+        private set
 
-    fun dismissSourceSelector() {
-        cancelPluginAction()
-        showSourceSelector = false
-    }
-
-    fun searchUsingPlugin(plugin: LoadedDownloaderPlugin) {
-        cancelPluginAction()
-        pluginAction = plugin to viewModelScope.launch {
-            try {
-                val scope = object : GetScope {
-                    override val hostPackageName = app.packageName
-                    override val pluginPackageName = plugin.packageName
-                    override suspend fun requestStartActivity(intent: Intent) =
-                        withContext(Dispatchers.Main) {
-                            if (launchedActivity != null) error("Previous activity has not finished")
-                            try {
-                                val result = with(CompletableDeferred<ActivityResult>()) {
-                                    launchedActivity = this
-                                    launchActivityChannel.send(intent)
-                                    await()
-                                }
-                                when (result.resultCode) {
-                                    Activity.RESULT_OK -> result.data
-                                    Activity.RESULT_CANCELED -> throw UserInteractionException.Activity.Cancelled()
-                                    else -> throw UserInteractionException.Activity.NotCompleted(
-                                        result.resultCode,
-                                        result.data
-                                    )
-                                }
-                            } finally {
-                                launchedActivity = null
-                            }
-                        }
-                }
-
-                withContext(Dispatchers.IO) {
-                    plugin.get(scope, packageName, desiredVersion)
-                }?.let { (data, version) ->
-                    if (desiredVersion != null && version != desiredVersion) {
-                        app.toast(app.getString(R.string.downloader_invalid_version))
-                        return@launch
-                    }
-                    selectedApp = SelectedApp.Download(
-                        packageName,
-                        version,
-                        ParceledDownloaderData(plugin, data)
-                    )
-                } ?: app.toast(app.getString(R.string.downloader_app_not_found))
-            } catch (e: UserInteractionException.Activity) {
-                app.toast(e.message!!)
-            } catch (e: CancellationException) {
-                throw e
-            } catch (e: Exception) {
-                app.toast(app.getString(R.string.downloader_error, e.simpleMessage()))
-                Log.e(tag, "Downloader.get threw an exception", e)
-            } finally {
-                pluginAction = null
-                dismissSourceSelector()
-            }
+    var selectedApp
+        get() = _selectedApp
+        set(value) {
+            _selectedApp = value
+            invalidateSelectedAppInfo()
         }
-    }
 
-    fun handlePluginActivityResult(result: ActivityResult) {
-        launchedActivity?.complete(result)
-    }
 
+
+
+    // TODO: Load from local file or downloaded app
     private fun invalidateSelectedAppInfo() = viewModelScope.launch {
-        val info = when (val app = selectedApp) {
-            is SelectedApp.Local -> withContext(Dispatchers.IO) { pm.getPackageInfo(app.file) }
-            is SelectedApp.Installed -> withContext(Dispatchers.IO) { pm.getPackageInfo(app.packageName) }
-            else -> null
-        }
-
-        selectedAppInfo = info
+        selectedAppInfo = pm.getPackageInfo(packageName)
     }
 
     fun getOptionsFiltered(bundles: List<PatchBundleInfo.Scoped>) = options.filtered(bundles)
@@ -272,37 +251,50 @@ class SelectedAppInfoViewModel(
         val allowIncompatible = prefs.disablePatchVersionCompatCheck.get()
         val bundles = bundleInfoFlow.first()
         return Patcher.ViewModelParams(
-            selectedApp,
-            getPatches(bundles, allowIncompatible),
+            input.packageName,
+            resolvedVersion.first(),
+            resolvedSource.first(),
+            patchSelection.first(),
             getOptionsFiltered(bundles)
         )
     }
 
-    fun getPatches(bundles: List<PatchBundleInfo.Scoped>, allowIncompatible: Boolean) =
-        selectionState.patches(bundles, allowIncompatible)
+    init {
+        invalidateSelectedAppInfo()
 
-    fun getCustomPatches(
-        bundles: List<PatchBundleInfo.Scoped>,
-        allowIncompatible: Boolean
-    ): PatchSelection? =
-        (selectionState as? SelectionState.Customized)?.patches(bundles, allowIncompatible)
+        input.localPath?.let { local ->
+            viewModelScope.launch {
+                val packageInfo = pm.getPackageInfo(File(local))
 
+                _selectedVersion.value = SelectedVersion.Specific(
+                    packageInfo?.versionName ?: return@launch
+                )
+                _selectedSource.value = SelectedSource.Local(local)
+            }
+        }
 
-    fun updateConfiguration(
-        selection: PatchSelection?,
-        options: Options
-    ) = viewModelScope.launch {
-        selectionState = selection?.let(SelectionState::Customized) ?: SelectionState.Default
+        // Get the previous selection if customization is enabled.
+        viewModelScope.launch {
+            if (prefs.disableSelectionWarning.get()) {
+                val previous = selectionRepository.getSelection(packageName)
+                if (previous.patchCount == 0) return@launch
+                selectionFlow.value = SelectionState.Customized(previous)
+            }
+        }
 
-        val filteredOptions = options.filtered(bundleInfoFlow.first())
-        this@SelectedAppInfoViewModel.options = filteredOptions
+        // Get installed app info
+        viewModelScope.launch {
+            val packageInfo = async(Dispatchers.IO) { pm.getPackageInfo(packageName) }
+            val installedAppDeferred =
+                async(Dispatchers.IO) { installedAppRepository.get(packageName) }
 
-        if (!persistConfiguration) return@launch
-        viewModelScope.launch(Dispatchers.Default) {
-            selection?.let { selectionRepository.updateSelection(packageName, it) }
-                ?: selectionRepository.resetSelectionForPackage(packageName)
-
-            optionsRepository.saveOptions(packageName, filteredOptions)
+//            installedAppData =
+//                packageInfo.await()?.let {
+//                    SelectedApp.Installed(
+//                        packageName,
+//                        it.versionName!!
+//                    ) to installedAppDeferred.await()
+//                }
         }
     }
 

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

@@ -0,0 +1,136 @@
+package app.revanced.manager.ui.viewmodel
+
+import android.app.Application
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import app.revanced.manager.domain.repository.DownloadedAppRepository
+import app.revanced.manager.domain.repository.DownloaderPluginRepository
+import app.revanced.manager.domain.repository.InstalledAppRepository
+import app.revanced.manager.network.downloader.DownloaderPluginState
+import app.revanced.manager.ui.model.SelectedSource
+import app.revanced.manager.ui.model.navigation.SelectedAppInfo
+import app.revanced.manager.util.PM
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.launch
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.get
+import java.io.File
+
+class SourceSelectorViewModel(
+    val input: SelectedAppInfo.SourceSelector.ViewModelParams
+) : ViewModel(), KoinComponent {
+    private val app: Application = get()
+    private val downloadedAppRepository: DownloadedAppRepository = get()
+    private val pluginRepository: DownloaderPluginRepository = get()
+    private val installedAppRepository: InstalledAppRepository = get()
+    private val pm: PM = get()
+
+    var selectedSource by mutableStateOf(input.selectedSource)
+        private set
+
+    fun selectSource(source: SelectedSource) {
+        selectedSource = source
+    }
+
+    var localApp by mutableStateOf<SourceOption?>(null)
+        private set
+
+    val downloadedApps = downloadedAppRepository.get(input.packageName)
+        .map { apps ->
+            apps.sortedByDescending { app -> app.version }
+                .map {
+                    SourceOption(
+                        source = SelectedSource.Downloaded(
+                            path = downloadedAppRepository.getApkFileForApp(it).path,
+                            version = it.version
+                        ),
+                        title = it.version,
+                        category = "Downloaded",
+                        key = it.version,
+                        disableReason = if (input.version != null && it.version != input.version) {
+                            DisableReason.VERSION_NOT_MATCHING
+                        } else null
+                    )
+                }
+        }
+
+    val plugins = pluginRepository.pluginStates.map { plugins ->
+        plugins.toList().sortedByDescending { it.second is DownloaderPluginState.Loaded }
+            .map {
+                val packageInfo = pm.getPackageInfo(it.first)
+                val label = packageInfo?.applicationInfo?.loadLabel(app.packageManager)
+                    ?.toString()
+
+                SourceOption(
+                    source = SelectedSource.Plugin(it.first),
+                    title = label ?: it.first,
+                    category = "Plugin",
+                    key = it.first,
+                    disableReason = when (it.second) {
+                        is DownloaderPluginState.Loaded -> null
+                        is DownloaderPluginState.Untrusted -> DisableReason.NOT_TRUSTED
+                        is DownloaderPluginState.Failed -> DisableReason.FAILED_TO_LOAD
+                    }
+                )
+            }
+    }
+
+    fun getPackageInfo(packageName: String) = pm.getPackageInfo(packageName)
+
+    var installedSource by mutableStateOf<SourceOption?>(null)
+        private set
+
+    init {
+        viewModelScope.launch {
+            val packageInfo = pm.getPackageInfo(input.packageName) ?: return@launch
+
+            val installedApp = installedAppRepository.get(input.packageName)
+
+            installedSource = SourceOption(
+                source = SelectedSource.Installed,
+                title = packageInfo.versionName.toString(),
+                category = "Installed",
+                key = input.packageName,
+                disableReason = when {
+                    installedApp != null -> DisableReason.ALREADY_PATCHED
+                    input.version != null && packageInfo.versionName != input.version -> DisableReason.VERSION_NOT_MATCHING
+                    else -> null
+                }
+            )
+        }
+        input.localPath?.let { local ->
+            viewModelScope.launch {
+                val packageInfo = pm.getPackageInfo(File(local))
+                    ?: return@launch
+
+                localApp = SourceOption(
+                    source = SelectedSource.Local(local),
+                    title = packageInfo.versionName.toString(),
+                    category = "Local",
+                    key = "local",
+                    disableReason = if (input.version != null && packageInfo.versionName != input.version) {
+                        DisableReason.VERSION_NOT_MATCHING
+                    } else null
+                )
+            }
+        }
+    }
+
+    enum class DisableReason(val message: String) {
+        VERSION_NOT_MATCHING("Does not match the selected version"),
+        ALREADY_PATCHED("Already patched"),
+        NOT_TRUSTED("Not trusted"),
+        FAILED_TO_LOAD("Failed to load"),
+    }
+
+    data class SourceOption(
+        val source: SelectedSource,
+        val title: String,
+        val category: String? = null,
+        val key: String,
+        val disableReason: DisableReason? = null
+    )
+}

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

@@ -82,7 +82,7 @@ class UpdateViewModel(
         uiSafe(app, R.string.failed_to_download_update, "Failed to download update") {
             val release = releaseInfo!!
             withContext(Dispatchers.IO) {
-                if (!networkInfo.isSafe(false) && !ignoreInternetCheck) {
+                if (!networkInfo.isSafe() && !ignoreInternetCheck) {
                     showInternetCheckDialog = true
                 } else {
                     state = State.DOWNLOADING

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

@@ -0,0 +1,85 @@
+package app.revanced.manager.ui.viewmodel
+
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import app.revanced.manager.domain.repository.DownloadedAppRepository
+import app.revanced.manager.domain.repository.InstalledAppRepository
+import app.revanced.manager.domain.repository.PatchBundleRepository
+import app.revanced.manager.ui.model.SelectedVersion
+import app.revanced.manager.ui.model.navigation.SelectedAppInfo
+import app.revanced.manager.util.PM
+import app.revanced.manager.util.patchCount
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.launch
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.get
+import java.io.File
+
+class VersionSelectorViewModel(
+    val input: SelectedAppInfo.VersionSelector.ViewModelParams
+) : ViewModel(), KoinComponent {
+    private val patchBundleRepository: PatchBundleRepository = get()
+    private val downloadedAppsRepository: DownloadedAppRepository = get()
+    private val installedAppRepository: InstalledAppRepository = get()
+    private val pm: PM = get()
+
+    val patchCount = input.patchSelection.patchCount
+
+    val downloadedVersions = downloadedAppsRepository.get(input.packageName)
+        .map { apps ->
+            apps.map { it.version }
+        }
+
+    private val _localVersion = MutableStateFlow<String?>(null)
+    val localVersion: StateFlow<String?> = _localVersion
+
+    val availableVersions = combine(
+        patchBundleRepository.suggestedVersions(input.packageName, input.patchSelection),
+        _localVersion,
+    ) { versions, local ->
+        versions.orEmpty()
+            .let { versions ->
+                local?.let {
+                    versions.toMutableMap().also { it.putIfAbsent(local, 0) }
+                } ?: versions
+            }
+            .map { (key, value) -> SelectedVersion.Specific(key) to patchCount - value }
+            .sortedWith(
+                compareBy<Pair<SelectedVersion.Specific, Int>>{ it.second }
+                    .thenByDescending { it.first.version }
+            )
+    }
+
+    var installedAppVersion by mutableStateOf<String?>(null)
+
+    init {
+        viewModelScope.launch {
+            val currentApp = pm.getPackageInfo(input.packageName)
+            val patchedApp = installedAppRepository.get(input.packageName)
+
+            // Skip if installed app is patched
+            if (patchedApp?.currentPackageName == input.packageName) return@launch
+
+            installedAppVersion = currentApp?.versionName
+        }
+        input.localPath?.let { local ->
+            viewModelScope.launch {
+                val packageInfo = pm.getPackageInfo(File(local))
+                _localVersion.value = packageInfo?.versionName
+            }
+        }
+    }
+
+    var selectedVersion by mutableStateOf(input.selectedVersion)
+        private set
+
+    fun selectVersion(version: SelectedVersion) {
+        selectedVersion = version
+    }
+}

app/src/main/java/app/revanced/manager/util/SupportedLocales.kt

@@ -1,40 +0,0 @@
-package app.revanced.manager.util
-
-import android.app.LocaleConfig
-import android.content.Context
-import android.os.Build
-import android.os.LocaleList
-import androidx.appcompat.app.AppCompatDelegate
-import androidx.core.os.LocaleListCompat
-import app.revanced.manager.BuildConfig
-import java.util.Locale
-
-object SupportedLocales {
-    fun getSupportedLocales(context: Context): List<Locale> {
-        var result: List<Locale>? = null
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) result = runCatching {
-            LocaleConfig(context).supportedLocales?.toList()
-        }.getOrNull()
-
-        return result ?: generated
-    }
-
-    fun getCurrentLocale(): Locale? =
-        AppCompatDelegate.getApplicationLocales().takeIf { !it.isEmpty }?.get(0)
-
-    fun setLocale(locale: Locale?) = AppCompatDelegate.setApplicationLocales(
-        locale?.let { LocaleListCompat.create(it) } ?: LocaleListCompat.getEmptyLocaleList()
-    )
-
-    fun getDisplayName(locale: Locale) =
-        locale.getDisplayName(locale).replaceFirstChar { it.uppercase(locale) }
-
-    private fun LocaleList.toList() = (0 until size()).map { get(it) }
-
-    private val generated by lazy {
-        listOf(
-            Locale.ENGLISH,
-            *BuildConfig.SUPPORTED_LOCALES.map(Locale::forLanguageTag).toTypedArray()
-        )
-    }
-}

app/src/main/java/app/revanced/manager/util/Util.kt

@@ -58,6 +58,9 @@ import kotlin.reflect.KProperty
 typealias PatchSelection = Map<Int, Set<String>>
 typealias Options = Map<Int, Map<String, Map<String, Any?>>>
 
+val PatchSelection.patchCount
+    get() = this.values.sumOf { it.size }
+
 val Context.isDebuggable get() = 0 != applicationInfo.flags and ApplicationInfo.FLAG_DEBUGGABLE
 
 fun Context.openUrl(url: String) {

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

@@ -14,7 +14,7 @@ Second \"item\" text"</string>
 -->
 <resources>
     <string name="app_name">ReVanced Manager</string>
-    <string name="patcher">Patcher test</string>
+    <string name="patcher">Patcher</string>
     <string name="patches">Patches</string>
     <string name="cli">CLI</string>
     <string name="manager">Manager</string>
@@ -61,14 +61,15 @@ Second \"item\" text"</string>
     <string name="app_source_dialog_option_installed_version_not_suggested">Version %s does not match the suggested version</string>
 
     <string name="patch_item_description">Start patching the application</string>
-    <string name="patch_selector_item">Select patches</string>
-    <string name="patch_selector_item_description">%d patches selected</string>
+    <string name="patch_selector_item">Patches</string>
+    <string name="patch_selector_item_description">%d selected</string>
     <string name="no_patches_selected">No patches selected</string>
+    <string name="version_selector_item">Version</string>
 
     <string name="network_unavailable_warning">Your device is not connected to the internet. Downloading will fail later.</string>
     <string name="network_metered_warning">You are currently on a metered connection. Data charges from your service provider may apply.</string>
 
-    <string name="apk_source_selector_item">Select APK source</string>
+    <string name="apk_source_selector_item">APK source</string>
     <string name="apk_source_auto">Using all APK downloaders</string>
     <string name="apk_source_downloader">Using %s</string>
     <string name="apk_source_installed">Using installed APK</string>
@@ -83,7 +84,7 @@ Second \"item\" text"</string>
     <string name="auto_updates_dialog_note">These settings can be changed later.</string>
 
     <string name="general">General</string>
-    <string name="general_description">Language, theme, dynamic color</string>
+    <string name="general_description">Theme, dynamic color</string>
     <string name="updates">Updates</string>
     <string name="updates_description">Check for updates and view changelogs</string>
     <string name="downloads">Downloads</string>
@@ -104,9 +105,6 @@ Second \"item\" text"</string>
     <string name="pure_black_theme_description">Use pure black backgrounds for dark theme</string>
     <string name="theme">Theme</string>
     <string name="theme_description">Choose between light or dark theme</string>
-    <string name="language">Language</string>
-    <string name="language_description">Choose the app display language</string>
-    <string name="language_system_default">System default</string>
     <string name="safeguards">Safeguards</string>
     <string name="patch_compat_check">Disable version compatibility check</string>
     <string name="patch_compat_check_description">Do not restrict patches to compatible app versions</string>
@@ -205,7 +203,7 @@ You will not be able to update the previously installed apps from this source."<
     <string name="share">Share</string>
     <string name="patch">Patch</string>
     <string name="select_from_storage">Select from storage</string>
-    <string name="select_from_storage_description">Select an APK file from storage using file picker</string>
+    <string name="select_from_storage_description">Select an APK file from storage</string>
     <string name="suggested_version_info">Suggested version: %s</string>
     <string name="type_anything">Type anything to continue</string>
     <string name="search">Search patches…</string>
@@ -220,10 +218,6 @@ You will not be able to update the previously installed apps from this source."<
     <string name="light">Light</string>
     <string name="dark">Dark</string>
     <string name="appearance">Appearance</string>
-    <string name="networking">Networking</string>
-    <string name="allow_metered_networks">Allow metered networks</string>
-    <string name="allow_metered_networks_description">Permits automatic updates on metered networks.
-    The application might still warn about metered networks for manual operations.</string>
     <string name="downloaded_apps">Downloaded apps</string>
     <string name="process_runtime">Run Patcher in another process (experimental)</string>
     <string name="process_runtime_description">This is faster and allows Patcher to use more memory</string>

crowdin.yml

@@ -1,9 +0,0 @@
-project_id_env: "CROWDIN_PROJECT_ID"
-api_token_env: "CROWDIN_PERSONAL_TOKEN"
-
-preserve_hierarchy: true
-files:
-    - source: app/src/main/res/values/strings.xml
-      dest: manager.xml
-      translation: app/src/main/res/values-%android_code%/strings.xml
-      skip_untranslated_strings: true