From 76143012f11eb1535db049b8c4f336b650c17374 Mon Sep 17 00:00:00 2001 From: jeongjaino Date: Mon, 5 Aug 2024 01:35:41 +0900 Subject: [PATCH] =?UTF-8?q?[FEATURE]#74=20:=20Dialog=20=EC=99=B8=EA=B3=BD?= =?UTF-8?q?=20=EB=88=8C=EB=A0=80=EC=9D=84=20=EB=95=8C=20=EB=8B=AB=ED=9E=88?= =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entire/screen/screen/AccountSettingScreen.kt | 2 +- .../bff/wespot/entire/screen/screen/BlockListScreen.kt | 10 +++++----- .../entire/screen/screen/revoke/RevokeConfirmScreen.kt | 2 +- .../wespot/message/screen/send/MessageEditScreen.kt | 6 +++--- .../wespot/message/screen/send/MessageWriteScreen.kt | 2 +- .../message/screen/send/ReceiverSelectionScreen.kt | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/feature/entire/src/main/java/com/bff/wespot/entire/screen/screen/AccountSettingScreen.kt b/feature/entire/src/main/java/com/bff/wespot/entire/screen/screen/AccountSettingScreen.kt index d939e692..69c20623 100644 --- a/feature/entire/src/main/java/com/bff/wespot/entire/screen/screen/AccountSettingScreen.kt +++ b/feature/entire/src/main/java/com/bff/wespot/entire/screen/screen/AccountSettingScreen.kt @@ -92,7 +92,7 @@ fun AccountSettingScreen( cancelButtonText = stringResource(id = R.string.sign_out), okButtonClick = { showDialog = false }, cancelButtonClick = { action(EntireAction.OnSignOutButtonClicked) }, - onDismissRequest = { showDialog = false }, + onDismissRequest = { }, ) } } diff --git a/feature/entire/src/main/java/com/bff/wespot/entire/screen/screen/BlockListScreen.kt b/feature/entire/src/main/java/com/bff/wespot/entire/screen/screen/BlockListScreen.kt index 419f7170..5c1534e4 100644 --- a/feature/entire/src/main/java/com/bff/wespot/entire/screen/screen/BlockListScreen.kt +++ b/feature/entire/src/main/java/com/bff/wespot/entire/screen/screen/BlockListScreen.kt @@ -87,14 +87,14 @@ fun BlockListScreen( WSDialog( title = stringResource(R.string.unblock_dialog_title), subTitle = "", - okButtonText = stringResource(R.string.unblock), - cancelButtonText = stringResource(R.string.close), - okButtonClick = { + okButtonText = stringResource(R.string.close), + cancelButtonText = stringResource(R.string.unblock), + okButtonClick = { showDialog = false }, + cancelButtonClick = { action(EntireAction.UnBlockMessage) showDialog = false }, - cancelButtonClick = { showDialog = false }, - onDismissRequest = { showDialog = false }, + onDismissRequest = { }, ) } } diff --git a/feature/entire/src/main/java/com/bff/wespot/entire/screen/screen/revoke/RevokeConfirmScreen.kt b/feature/entire/src/main/java/com/bff/wespot/entire/screen/screen/revoke/RevokeConfirmScreen.kt index 1d6d2262..d18421fa 100644 --- a/feature/entire/src/main/java/com/bff/wespot/entire/screen/screen/revoke/RevokeConfirmScreen.kt +++ b/feature/entire/src/main/java/com/bff/wespot/entire/screen/screen/revoke/RevokeConfirmScreen.kt @@ -146,7 +146,7 @@ fun RevokeConfirmScreen( cancelButtonClick = { action(EntireAction.OnRevokeButtonClicked) }, - onDismissRequest = { showDialog = false }, + onDismissRequest = { }, ) } } diff --git a/feature/message/src/main/kotlin/com/bff/wespot/message/screen/send/MessageEditScreen.kt b/feature/message/src/main/kotlin/com/bff/wespot/message/screen/send/MessageEditScreen.kt index 4121bb1a..b13d556e 100644 --- a/feature/message/src/main/kotlin/com/bff/wespot/message/screen/send/MessageEditScreen.kt +++ b/feature/message/src/main/kotlin/com/bff/wespot/message/screen/send/MessageEditScreen.kt @@ -229,7 +229,7 @@ fun MessageEditScreen( navigator.navigateMessageScreen(args = MessageScreenArgs(false)) }, cancelButtonClick = { exitDialog = false }, - onDismissRequest = { exitDialog = false }, + onDismissRequest = { }, ) } @@ -241,7 +241,7 @@ fun MessageEditScreen( cancelButtonText = stringResource(R.string.cancel), okButtonClick = { action(SendAction.OnSendButtonClicked) }, cancelButtonClick = { reserveDialog = false }, - onDismissRequest = { reserveDialog = false }, + onDismissRequest = { }, ) } @@ -255,7 +255,7 @@ fun MessageEditScreen( navigator.navigateMessageScreen(args = MessageScreenArgs(false)) }, cancelButtonClick = { timeoutDialog = false }, - onDismissRequest = { timeoutDialog = false }, + onDismissRequest = { }, ) } } diff --git a/feature/message/src/main/kotlin/com/bff/wespot/message/screen/send/MessageWriteScreen.kt b/feature/message/src/main/kotlin/com/bff/wespot/message/screen/send/MessageWriteScreen.kt index 1341aa81..92e00cd5 100644 --- a/feature/message/src/main/kotlin/com/bff/wespot/message/screen/send/MessageWriteScreen.kt +++ b/feature/message/src/main/kotlin/com/bff/wespot/message/screen/send/MessageWriteScreen.kt @@ -176,7 +176,7 @@ fun MessageWriteScreen( navigator.navigateMessageScreen(args = MessageScreenArgs(false)) }, cancelButtonClick = { dialogState = false }, - onDismissRequest = { dialogState = false }, + onDismissRequest = { }, ) } diff --git a/feature/message/src/main/kotlin/com/bff/wespot/message/screen/send/ReceiverSelectionScreen.kt b/feature/message/src/main/kotlin/com/bff/wespot/message/screen/send/ReceiverSelectionScreen.kt index 1c9358fc..2f22dab7 100644 --- a/feature/message/src/main/kotlin/com/bff/wespot/message/screen/send/ReceiverSelectionScreen.kt +++ b/feature/message/src/main/kotlin/com/bff/wespot/message/screen/send/ReceiverSelectionScreen.kt @@ -229,7 +229,7 @@ fun ReceiverSelectionScreen( navigator.navigateMessageScreen(args = MessageScreenArgs(false)) }, cancelButtonClick = { dialogState = false }, - onDismissRequest = { dialogState = false }, + onDismissRequest = { }, ) }