Ling0925
/
TiebaLite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 确认对话框 `onCancel` 重复执行

This commit is contained in:
HuanCheng65 2023-07-13 18:27:46 +08:00
parent 46becf58b7
commit 170a4f8049
No known key found for this signature in database
GPG Key ID: 5EC9DD60A32C7360
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/huanchengfly/tieba/post/ui/page/main/home/HomePage.kt
View File

@ -249,7 +249,7 @@ private fun ForumItem(
dialogState = dialogState, dialogState = dialogState,
onConfirm = { viewModel.send(HomeUiIntent.Unfollow(item.forumId, item.forumName)) }, onConfirm = { viewModel.send(HomeUiIntent.Unfollow(item.forumId, item.forumName)) },
modifier = Modifier, modifier = Modifier,
onCancel = { onDismiss = {
willUnfollow = false willUnfollow = false
}, },
title = { title = {

3
app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/Dialogs.kt
View File

@ -189,6 +189,7 @@ fun ConfirmDialog(
onConfirm: () -> Unit, onConfirm: () -> Unit,
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
onCancel: (() -> Unit)? = null, onCancel: (() -> Unit)? = null,
onDismiss: (() -> Unit)? = null,
confirmText: String = stringResource(id = R.string.button_sure_default), confirmText: String = stringResource(id = R.string.button_sure_default),
cancelText: String = stringResource(id = R.string.button_cancel), cancelText: String = stringResource(id = R.string.button_cancel),
title: @Composable (DialogScope.() -> Unit) = {}, title: @Composable (DialogScope.() -> Unit) = {},
@ -197,7 +198,7 @@ fun ConfirmDialog(
Dialog( Dialog(
modifier = modifier, modifier = modifier,
dialogState = dialogState, dialogState = dialogState,
onDismiss = onCancel, onDismiss = onDismiss,
title = title, title = title,
buttons = { buttons = {
DialogPositiveButton(text = confirmText, onClick = onConfirm) DialogPositiveButton(text = confirmText, onClick = onConfirm)