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

manager: Fix loading dialog

Browse Source
This commit is contained in:
weishu
2024-03-16 11:08:39 +08:00
parent 972d347a14
commit 7fd760f4f4
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Install.kt
View File

@@ -127,6 +127,9 @@ fun InstallScreen(navigator: DestinationsNavigator) {
onFileDownloaded(uri) onFileDownloaded(uri)
loadingDialog.hide() loadingDialog.hide()
} }
val failedMessage = stringResource(id = R.string.failed_to_fetch_lkm_url)
val downloadingMessage = stringResource(id = R.string.downloading)
Button( Button(
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
enabled = installMethod != null, enabled = installMethod != null,
@@ -138,18 +141,18 @@ fun InstallScreen(navigator: DestinationsNavigator) {
scope.launch(Dispatchers.Main) { scope.launch(Dispatchers.Main) {
Toast.makeText( Toast.makeText(
context, context,
"Failed to fetch LKM url: ${throwable.message}", failedMessage.format(throwable.message),
Toast.LENGTH_SHORT Toast.LENGTH_SHORT
).show() ).show()
} }
}.onSuccess { result -> }.onSuccess { result ->
loadingDialog.hide()
download( download(
context = context, context = context,
url = result.second, url = result.second,
fileName = result.first, fileName = result.first,
description = "Downloading ${result.first}", description = downloadingMessage.format(
result.first
),
onDownloaded = { uri -> onDownloaded = { uri ->
onFileDownloaded(uri) onFileDownloaded(uri)
loadingDialog.hide() loadingDialog.hide()
@@ -159,7 +162,10 @@ fun InstallScreen(navigator: DestinationsNavigator) {
} }
} }
}) { }) {
Text(stringResource(id = R.string.install_next), fontSize = MaterialTheme.typography.bodyMedium.fontSize) Text(
stringResource(id = R.string.install_next),
fontSize = MaterialTheme.typography.bodyMedium.fontSize
)
} }
} }
} }
@@ -231,6 +237,7 @@ private fun SelectInstallMethod(onSelected: (InstallMethod) -> Unit = {}) {
selectedOption = option selectedOption = option
onSelected(option) onSelected(option)
} }
is InstallMethod.DirectInstallToInactiveSlot -> { is InstallMethod.DirectInstallToInactiveSlot -> {
confirmDialog.showConfirm(dialogTitle, dialogContent) confirmDialog.showConfirm(dialogTitle, dialogContent)
} }

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

@@ -115,4 +115,6 @@
<string name="install_inactive_slot">Install to Inactive Slot (After OTA)</string> <string name="install_inactive_slot">Install to Inactive Slot (After OTA)</string>
<string name="install_inactive_slot_warning">Your device will be **FORCED** to boot to the current inactive slot after a reboot!\nOnly use this option after OTA is done.\nContinue?</string> <string name="install_inactive_slot_warning">Your device will be **FORCED** to boot to the current inactive slot after a reboot!\nOnly use this option after OTA is done.\nContinue?</string>
<string name="install_next">Next</string> <string name="install_next">Next</string>
<string name="failed_to_fetch_lkm_url">Failed to fetch LKM url: %1$s</string>
<string name="downloading">Downloading %1$s</string>
</resources> </resources>