android/SukiSU-Ultra
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

manager: allow uninstall when update module

Browse Source
This commit is contained in:
tiann
2023-01-05 10:57:25 +08:00
parent b4e8371b04
commit 0a1247b835
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Module.kt
View File

@@ -84,6 +84,8 @@ fun ModuleScreen(navigator: DestinationsNavigator) {
) { innerPadding ->
val failedEnable = stringResource(R.string.module_failed_to_enable)
val failedDisable = stringResource(R.string.module_failed_to_disable)
val failedUninstall = stringResource(R.string.module_uninstall_failed)
val successUninstall = stringResource(R.string.module_uninstall_success)
val swipeState = rememberSwipeRefreshState(viewModel.isRefreshing)
// TODO: Replace SwipeRefresh with RefreshIndicator when it's ready
if (Natives.getVersion() < 8) {
@@ -116,6 +118,13 @@ fun ModuleScreen(navigator: DestinationsNavigator) {
onUninstall = {
scope.launch {
val result = uninstallModule(module.id)
snackBarHost.showSnackbar(
if (result) {
successUninstall.format(module.name)
} else {
failedUninstall.format(module.name)
}
)
}
},
onCheckChanged = {
@@ -224,7 +233,7 @@ private fun ModuleItem(
Spacer(modifier = Modifier.weight(1f, true))
TextButton(
enabled = !module.update && !module.remove,
enabled = !module.remove,
onClick = { onUninstall(module) },
) {
Text(

2
manager/app/src/main/res/values/strings.xml
View File

@@ -40,5 +40,7 @@
<string name="settings_system_rw_summary">Use overlayfs to make system partition writable, reboot to take effect.</string>
<string name="about">About</string>
<string name="require_kernel_version_8">Require KernelSU version 8+</string>
<string name="module_uninstall_success">%s uninstalled</string>
<string name="module_uninstall_failed">Failed to uninstall: %s</string>
</resources>