yenru0/EhViewer
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup code

Browse Source
This commit is contained in:
tarsin committed 2023-08-02 10:25:09 +08:00
1 parent 8f9d2adcfe
commit c0e2041efe
1 file changed
+7 -9
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/hippo/ehviewer/ui/tools/Dialog.kt
+7 -9
View File
@@ -71,7 +71,7 @@ class DialogState {
content = null
}
suspend inline fun <R> dialog(crossinline block: @Composable (CancellableContinuation<R>) -> Unit) = suspendCancellableCoroutine<R> { cont ->
suspend inline fun <R> dialog(crossinline block: @Composable (CancellableContinuation<R>) -> Unit) = suspendCancellableCoroutine { cont ->
cont.invokeOnCancellation { dismiss() }
val realContinuation = object : CancellableContinuation<R> by cont {
override fun resumeWith(result: Result<R>) {
@@ -93,7 +93,7 @@ class DialogState {
Text(text = stringResource(id = android.R.string.ok))
}
},
title = title?.let { { Text(text = stringResource(id = title)) } },
title = title.ifNotNullThen { Text(text = stringResource(id = title!!)) },
text = { block(impl) },
)
}
@@ -119,7 +119,7 @@ class DialogState {
Text(text = stringResource(id = android.R.string.ok))
}
},
title = title?.let { { Text(text = title) } },
title = title.ifNotNullThen { Text(text = title!!) },
text = {
OutlinedTextField(
value = state,
@@ -158,14 +158,12 @@ class DialogState {
Text(text = stringResource(id = confirmText ?: android.R.string.ok))
}
},
dismissButton = dismissText?.let {
{
TextButton(onClick = { cont.cancel() }) {
Text(text = stringResource(id = dismissText))
}
dismissButton = dismissText.ifNotNullThen {
TextButton(onClick = { cont.cancel() }) {
Text(text = stringResource(id = dismissText!!))
}
},
title = title?.let { { Text(text = stringResource(id = title)) } },
title = title.ifNotNullThen { Text(text = stringResource(id = title!!)) },
text = text,
)
}