From fa3c87bc3d92b90c25ddb3aab402bdf4797f51d4 Mon Sep 17 00:00:00 2001 From: HuanCheng65 <22636177+HuanCheng65@users.noreply.github.com> Date: Fri, 21 Jul 2023 15:34:28 +0800 Subject: [PATCH] =?UTF-8?q?pref:=20=E5=AF=B9=E8=AF=9D=E6=A1=86=E5=B8=83?= =?UTF-8?q?=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tieba/post/ui/widgets/compose/Dialogs.kt | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) 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 2c97229f..8e8e8d7b 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 @@ -192,7 +192,7 @@ fun ConfirmDialog( onDismiss: (() -> Unit)? = null, confirmText: String = stringResource(id = R.string.button_sure_default), cancelText: String = stringResource(id = R.string.button_cancel), - title: @Composable (DialogScope.() -> Unit) = {}, + title: @Composable (DialogScope.() -> Unit)? = null, content: @Composable (DialogScope.() -> Unit) = {}, ) { Dialog( @@ -205,7 +205,7 @@ fun ConfirmDialog( DialogNegativeButton(text = cancelText, onClick = onCancel) }, ) { - Column(modifier = Modifier.padding(horizontal = 12.dp)) { + Column(modifier = Modifier.padding(horizontal = 24.dp)) { ProvideTextStyle(value = MaterialTheme.typography.body1) { ProvideContentColor(color = ExtendedTheme.colors.text) { content() @@ -231,7 +231,7 @@ fun PromptDialog( onCancel: (() -> Unit)? = null, confirmText: String = stringResource(id = R.string.button_sure_default), cancelText: String = stringResource(id = R.string.button_cancel), - title: @Composable (DialogScope.() -> Unit) = {}, + title: @Composable (DialogScope.() -> Unit)? = null, content: @Composable (DialogScope.() -> Unit) = {}, ) { var textVal by remember { mutableStateOf(initialValue) } @@ -256,6 +256,7 @@ fun PromptDialog( .padding(horizontal = 24.dp) .padding(bottom = 16.dp), verticalArrangement = Arrangement.spacedBy(16.dp), + horizontalAlignment = Alignment.CenterHorizontally, ) { ProvideTextStyle(value = MaterialTheme.typography.body1) { ProvideContentColor(color = ExtendedTheme.colors.text) { @@ -297,7 +298,7 @@ fun Dialog( modifier: Modifier = Modifier, dialogState: DialogState = rememberDialogState(), onDismiss: (() -> Unit)? = null, - title: @Composable (DialogScope.() -> Unit) = {}, + title: @Composable (DialogScope.() -> Unit)? = null, cancelable: Boolean = true, cancelableOnTouchOutside: Boolean = true, buttons: @Composable (DialogScope.() -> Unit) = {}, @@ -344,13 +345,15 @@ fun Dialog( verticalArrangement = Arrangement.spacedBy(16.dp) ) { ProvideContentColor(color = ExtendedTheme.colors.text) { - Box( - modifier = Modifier - .padding(horizontal = 24.dp) - .align(Alignment.CenterHorizontally) - ) { - ProvideTextStyle(value = MaterialTheme.typography.h6.copy(fontWeight = FontWeight.Bold)) { - dialogScope.title() + if (title != null) { + Box( + modifier = Modifier + .padding(horizontal = 24.dp) + .align(Alignment.CenterHorizontally) + ) { + ProvideTextStyle(value = MaterialTheme.typography.h6.copy(fontWeight = FontWeight.Bold)) { + dialogScope.title() + } } } Box(modifier = Modifier.align(Alignment.CenterHorizontally)) {