From 6656399112f91ce78dbda29e335044fa78829c8a Mon Sep 17 00:00:00 2001 From: tarsin Date: Thu, 4 May 2023 18:15:49 +0800 Subject: [PATCH] Cleanup code --- .../main/java/com/hippo/ehviewer/ui/widget/Dialog.kt | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/hippo/ehviewer/ui/widget/Dialog.kt b/app/src/main/java/com/hippo/ehviewer/ui/widget/Dialog.kt index 57e0fd73e..a43477863 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/widget/Dialog.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/widget/Dialog.kt @@ -28,10 +28,16 @@ class DialogState : DialogScope { } suspend fun show(block: @Composable DialogScope.() -> Unit) { - suspendCancellableCoroutine { + return suspendCancellableCoroutine { cont -> + cont.invokeOnCancellation { dismiss() } content = { - AlertDialog(onDismissRequest = { dismiss() }, confirmButton = { /*TODO*/ }) - block() + AlertDialog( + onDismissRequest = { + dismiss() + cont.resume(Unit) + }, + content = { block() }, + ) } } }