From 170a4f8049387a109f42ef1df2f9e5aec18c38a2 Mon Sep 17 00:00:00 2001 From: HuanCheng65 <22636177+HuanCheng65@users.noreply.github.com> Date: Thu, 13 Jul 2023 18:27:46 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=A1=AE=E8=AE=A4=E5=AF=B9=E8=AF=9D?= =?UTF-8?q?=E6=A1=86=20`onCancel`=20=E9=87=8D=E5=A4=8D=E6=89=A7=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/huanchengfly/tieba/post/ui/page/main/home/HomePage.kt | 2 +- .../com/huanchengfly/tieba/post/ui/widgets/compose/Dialogs.kt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/huanchengfly/tieba/post/ui/page/main/home/HomePage.kt b/app/src/main/java/com/huanchengfly/tieba/post/ui/page/main/home/HomePage.kt index c82eac10..3bd66e07 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/ui/page/main/home/HomePage.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/ui/page/main/home/HomePage.kt @@ -249,7 +249,7 @@ private fun ForumItem( dialogState = dialogState, onConfirm = { viewModel.send(HomeUiIntent.Unfollow(item.forumId, item.forumName)) }, modifier = Modifier, - onCancel = { + onDismiss = { willUnfollow = false }, title = { diff --git a/app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/Dialogs.kt b/app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/Dialogs.kt index aedf733b..97f07247 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/Dialogs.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/Dialogs.kt @@ -189,6 +189,7 @@ fun ConfirmDialog( onConfirm: () -> Unit, modifier: Modifier = Modifier, onCancel: (() -> Unit)? = null, + onDismiss: (() -> Unit)? = null, confirmText: String = stringResource(id = R.string.button_sure_default), cancelText: String = stringResource(id = R.string.button_cancel), title: @Composable (DialogScope.() -> Unit) = {}, @@ -197,7 +198,7 @@ fun ConfirmDialog( Dialog( modifier = modifier, dialogState = dialogState, - onDismiss = onCancel, + onDismiss = onDismiss, title = title, buttons = { DialogPositiveButton(text = confirmText, onClick = onConfirm)