null2264/yokai
1
0
Fork 0
mirror of https://github.com/null2264/yokai.git synced 2025-06-21 10:44:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(SettingsDataScreen): Dismiss the alert dialog

Browse source
This commit is contained in:
Ahmad Ansori Palembani 2024-06-10 19:32:53 +07:00
parent 1a0ee24c63
commit 27f42de963
Signed by: null2264
GPG key ID: BA64F8B60AF3EFB6
2 changed files with 24 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/java/dev/yokai/presentation/settings/screen/SettingsDataScreen.kt
View file

@ -140,7 +140,14 @@ object SettingsDataScreen : ComposableSettings {
} }
alertDialog.content = { alertDialog.content = {
RestoreBackup(context = context, uri = it, pair = results) RestoreBackup(
context = context,
uri = it,
pair = results,
onDismissRequest = {
alertDialog.content = null
}
)
} }
} }

23
app/src/main/java/dev/yokai/presentation/settings/screen/data/AlertDialogs.kt
View file

@ -13,7 +13,12 @@ import eu.kanade.tachiyomi.data.backup.restore.BackupRestoreJob
import eu.kanade.tachiyomi.util.system.toast import eu.kanade.tachiyomi.util.system.toast
@Composable @Composable
fun RestoreBackup(context: Context, uri: Uri, pair: Pair<Results?, Exception?>) { fun RestoreBackup(
context: Context,
uri: Uri,
pair: Pair<Results?, Exception?>,
onDismissRequest: () -> Unit,
) {
val (results, e) = pair val (results, e) = pair
if (results != null) { if (results != null) {
var message = stringResource(R.string.restore_content_full) var message = stringResource(R.string.restore_content_full)
@ -33,19 +38,20 @@ fun RestoreBackup(context: Context, uri: Uri, pair: Pair<Results?, Exception?>)
} }
AlertDialog( AlertDialog(
onDismissRequest = {}, onDismissRequest = onDismissRequest,
confirmButton = { confirmButton = {
TextButton( TextButton(
onClick = { onClick = {
context.toast(R.string.restoring_backup) context.toast(R.string.restoring_backup)
BackupRestoreJob.start(context, uri) BackupRestoreJob.start(context, uri)
onDismissRequest()
}, },
) { ) {
Text(text = stringResource(R.string.restore)) Text(text = stringResource(R.string.restore))
} }
}, },
dismissButton = { dismissButton = {
TextButton(onClick = {}) { TextButton(onClick = onDismissRequest) {
Text(text = stringResource(android.R.string.cancel)) Text(text = stringResource(android.R.string.cancel))
} }
}, },
@ -54,9 +60,9 @@ fun RestoreBackup(context: Context, uri: Uri, pair: Pair<Results?, Exception?>)
) )
} else { } else {
AlertDialog( AlertDialog(
onDismissRequest = {}, onDismissRequest = onDismissRequest,
confirmButton = { confirmButton = {
TextButton(onClick = {}) { TextButton(onClick = onDismissRequest) {
Text(text = stringResource(android.R.string.cancel)) Text(text = stringResource(android.R.string.cancel))
} }
}, },
@ -67,9 +73,12 @@ fun RestoreBackup(context: Context, uri: Uri, pair: Pair<Results?, Exception?>)
} }
@Composable @Composable
private fun CreateBackup(context: Context) { private fun CreateBackup(
context: Context,
onDismissRequest: () -> Unit,
) {
AlertDialog( AlertDialog(
onDismissRequest = {}, onDismissRequest = onDismissRequest,
confirmButton = {}, confirmButton = {},
) )
} }