flutter/revanced-manager
1
0
Fork 0
mirror of https://github.com/ReVanced/revanced-manager.git synced 2025-08-06 18:24:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: Compilation

Browse Source
This commit is contained in:
validcube
2025-02-02 13:03:11 +07:00
parent c012a3e9c0
commit bbfd625ac1
4 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/app/revanced/manager/MainActivity.kt
View File

@ -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.BackupRestoreSettingsScreen
import app.revanced.manager.ui.screen.settings.LicensesScreen 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.ChangelogsScreen
import app.revanced.manager.ui.screen.settings.update.UpdatesSettingsScreen
import app.revanced.manager.ui.theme.ReVancedManagerTheme import app.revanced.manager.ui.theme.ReVancedManagerTheme
import app.revanced.manager.ui.theme.Theme import app.revanced.manager.ui.theme.Theme
import app.revanced.manager.ui.viewmodel.MainViewModel import app.revanced.manager.ui.viewmodel.MainViewModel
@ -270,20 +269,16 @@ private fun ReVancedManager(vm: MainViewModel) {
} }
composable<Settings.General> { composable<Settings.General> {
GeneralSettingsScreen(onBackClick = navController::popBackStack) GeneralSettingsScreen(
onBackClick = navController::popBackStack,
onUpdateClick = { navController.navigate(Update()) }
)
} }
composable<Settings.Advanced> { composable<Settings.Advanced> {
AdvancedSettingsScreen(onBackClick = navController::popBackStack) AdvancedSettingsScreen(onBackClick = navController::popBackStack)
} }
composable<Settings.Updates> {
UpdatesSettingsScreen(
onBackClick = navController::popBackStack,
onChangelogClick = { navController.navigate(Settings.Changelogs) },
onUpdateClick = { navController.navigate(Update()) }
)
}
composable<Settings.Downloads> { composable<Settings.Downloads> {
DownloadsSettingsScreen(onBackClick = navController::popBackStack) DownloadsSettingsScreen(onBackClick = navController::popBackStack)
@ -296,6 +291,7 @@ private fun ReVancedManager(vm: MainViewModel) {
composable<Settings.About> { composable<Settings.About> {
AboutSettingsScreen( AboutSettingsScreen(
onBackClick = navController::popBackStack, onBackClick = navController::popBackStack,
onChangelogClick = { navController.navigate(Settings.Changelogs) },
navigate = navController::navigate navigate = navController::navigate
) )
} }

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

@ -137,8 +137,8 @@ class MainViewModel(
updateCheck() updateCheck()
} }
} }
settings.patchesChangeEnabled?.let { disableSelectionWarning -> settings.patchesChangeEnabled?.let { allowChangingPatchSelection ->
prefs.disableSelectionWarning.update(disableSelectionWarning) prefs.allowChangingPatchSelection.update(allowChangingPatchSelection)
} }
settings.keystore?.let { keystore -> settings.keystore?.let { keystore ->
val keystoreBytes = Base64.decode(keystore, Base64.DEFAULT) val keystoreBytes = Base64.decode(keystore, Base64.DEFAULT)

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

@ -66,7 +66,7 @@ class PatchesSelectorViewModel(input: SelectedApplicationInfo.PatchesSelector.Vi
viewModelScope.launch { viewModelScope.launch {
universalPatchWarningEnabled = !prefs.allowUniversalPatch.get() universalPatchWarningEnabled = !prefs.allowUniversalPatch.get()
if (prefs.disableSelectionWarning.get()) { if (prefs.allowChangingPatchSelection.get()) {
selectionWarningEnabled = false selectionWarningEnabled = false
return@launch return@launch
} }

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

@ -151,7 +151,7 @@ class SelectedAppInfoViewModel(
// Try to get the previous selection if customization is enabled. // Try to get the previous selection if customization is enabled.
viewModelScope.launch { viewModelScope.launch {
if (!prefs.disableSelectionWarning.get()) return@launch if (!prefs.allowChangingPatchSelection.get()) return@launch
val previous = selectionRepository.getSelection(packageName) val previous = selectionRepository.getSelection(packageName)
if (previous.values.sumOf { it.size } == 0) return@launch if (previous.values.sumOf { it.size } == 0) return@launch