diff --git a/app/src/main/java/app/revanced/manager/MainActivity.kt b/app/src/main/java/app/revanced/manager/MainActivity.kt index 563e0e0d01..6336df401d 100644 --- a/app/src/main/java/app/revanced/manager/MainActivity.kt +++ b/app/src/main/java/app/revanced/manager/MainActivity.kt @@ -51,7 +51,6 @@ import app.revanced.manager.ui.screen.settings.GeneralSettingsScreen import app.revanced.manager.ui.screen.settings.BackupRestoreSettingsScreen import app.revanced.manager.ui.screen.settings.LicensesScreen import app.revanced.manager.ui.screen.settings.update.ChangelogsScreen -import app.revanced.manager.ui.screen.settings.update.UpdatesSettingsScreen import app.revanced.manager.ui.theme.ReVancedManagerTheme import app.revanced.manager.ui.theme.Theme import app.revanced.manager.ui.viewmodel.MainViewModel @@ -270,20 +269,16 @@ private fun ReVancedManager(vm: MainViewModel) { } composable { - GeneralSettingsScreen(onBackClick = navController::popBackStack) + GeneralSettingsScreen( + onBackClick = navController::popBackStack, + onUpdateClick = { navController.navigate(Update()) } + ) } composable { AdvancedSettingsScreen(onBackClick = navController::popBackStack) } - composable { - UpdatesSettingsScreen( - onBackClick = navController::popBackStack, - onChangelogClick = { navController.navigate(Settings.Changelogs) }, - onUpdateClick = { navController.navigate(Update()) } - ) - } composable { DownloadsSettingsScreen(onBackClick = navController::popBackStack) @@ -296,6 +291,7 @@ private fun ReVancedManager(vm: MainViewModel) { composable { AboutSettingsScreen( onBackClick = navController::popBackStack, + onChangelogClick = { navController.navigate(Settings.Changelogs) }, navigate = navController::navigate ) } diff --git a/app/src/main/java/app/revanced/manager/ui/viewmodel/MainViewModel.kt b/app/src/main/java/app/revanced/manager/ui/viewmodel/MainViewModel.kt index a5e9b5e0c8..d42f7680f8 100644 --- a/app/src/main/java/app/revanced/manager/ui/viewmodel/MainViewModel.kt +++ b/app/src/main/java/app/revanced/manager/ui/viewmodel/MainViewModel.kt @@ -137,8 +137,8 @@ class MainViewModel( updateCheck() } } - settings.patchesChangeEnabled?.let { disableSelectionWarning -> - prefs.disableSelectionWarning.update(disableSelectionWarning) + settings.patchesChangeEnabled?.let { allowChangingPatchSelection -> + prefs.allowChangingPatchSelection.update(allowChangingPatchSelection) } settings.keystore?.let { keystore -> val keystoreBytes = Base64.decode(keystore, Base64.DEFAULT) diff --git a/app/src/main/java/app/revanced/manager/ui/viewmodel/PatchesSelectorViewModel.kt b/app/src/main/java/app/revanced/manager/ui/viewmodel/PatchesSelectorViewModel.kt index 7e24b55c96..1e0b1e62e9 100644 --- a/app/src/main/java/app/revanced/manager/ui/viewmodel/PatchesSelectorViewModel.kt +++ b/app/src/main/java/app/revanced/manager/ui/viewmodel/PatchesSelectorViewModel.kt @@ -66,7 +66,7 @@ class PatchesSelectorViewModel(input: SelectedApplicationInfo.PatchesSelector.Vi viewModelScope.launch { universalPatchWarningEnabled = !prefs.allowUniversalPatch.get() - if (prefs.disableSelectionWarning.get()) { + if (prefs.allowChangingPatchSelection.get()) { selectionWarningEnabled = false return@launch } diff --git a/app/src/main/java/app/revanced/manager/ui/viewmodel/SelectedAppInfoViewModel.kt b/app/src/main/java/app/revanced/manager/ui/viewmodel/SelectedAppInfoViewModel.kt index 33c306587e..0aac624425 100644 --- a/app/src/main/java/app/revanced/manager/ui/viewmodel/SelectedAppInfoViewModel.kt +++ b/app/src/main/java/app/revanced/manager/ui/viewmodel/SelectedAppInfoViewModel.kt @@ -151,7 +151,7 @@ class SelectedAppInfoViewModel( // Try to get the previous selection if customization is enabled. viewModelScope.launch { - if (!prefs.disableSelectionWarning.get()) return@launch + if (!prefs.allowChangingPatchSelection.get()) return@launch val previous = selectionRepository.getSelection(packageName) if (previous.values.sumOf { it.size } == 0) return@launch