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

pref: 对话框布局

This commit is contained in:
HuanCheng65 2023-07-21 15:34:28 +08:00
parent 13b478ae90
commit fa3c87bc3d
No known key found for this signature in database
GPG Key ID: 5EC9DD60A32C7360
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -192,7 +192,7 @@ fun ConfirmDialog(
onDismiss: (() -> 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)? = null,
content: @Composable (DialogScope.() -> Unit) = {}, content: @Composable (DialogScope.() -> Unit) = {},
) { ) {
Dialog( Dialog(
@ -205,7 +205,7 @@ fun ConfirmDialog(
DialogNegativeButton(text = cancelText, onClick = onCancel) DialogNegativeButton(text = cancelText, onClick = onCancel)
}, },
) { ) {
Column(modifier = Modifier.padding(horizontal = 12.dp)) { Column(modifier = Modifier.padding(horizontal = 24.dp)) {
ProvideTextStyle(value = MaterialTheme.typography.body1) { ProvideTextStyle(value = MaterialTheme.typography.body1) {
ProvideContentColor(color = ExtendedTheme.colors.text) { ProvideContentColor(color = ExtendedTheme.colors.text) {
content() content()
@ -231,7 +231,7 @@ fun PromptDialog(
onCancel: (() -> Unit)? = null, onCancel: (() -> 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)? = null,
content: @Composable (DialogScope.() -> Unit) = {}, content: @Composable (DialogScope.() -> Unit) = {},
) { ) {
var textVal by remember { mutableStateOf(initialValue) } var textVal by remember { mutableStateOf(initialValue) }
@ -256,6 +256,7 @@ fun PromptDialog(
.padding(horizontal = 24.dp) .padding(horizontal = 24.dp)
.padding(bottom = 16.dp), .padding(bottom = 16.dp),
verticalArrangement = Arrangement.spacedBy(16.dp), verticalArrangement = Arrangement.spacedBy(16.dp),
horizontalAlignment = Alignment.CenterHorizontally,
) { ) {
ProvideTextStyle(value = MaterialTheme.typography.body1) { ProvideTextStyle(value = MaterialTheme.typography.body1) {
ProvideContentColor(color = ExtendedTheme.colors.text) { ProvideContentColor(color = ExtendedTheme.colors.text) {
@ -297,7 +298,7 @@ fun Dialog(
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
dialogState: DialogState = rememberDialogState(), dialogState: DialogState = rememberDialogState(),
onDismiss: (() -> Unit)? = null, onDismiss: (() -> Unit)? = null,
title: @Composable (DialogScope.() -> Unit) = {}, title: @Composable (DialogScope.() -> Unit)? = null,
cancelable: Boolean = true, cancelable: Boolean = true,
cancelableOnTouchOutside: Boolean = true, cancelableOnTouchOutside: Boolean = true,
buttons: @Composable (DialogScope.() -> Unit) = {}, buttons: @Composable (DialogScope.() -> Unit) = {},
@ -344,13 +345,15 @@ fun Dialog(
verticalArrangement = Arrangement.spacedBy(16.dp) verticalArrangement = Arrangement.spacedBy(16.dp)
) { ) {
ProvideContentColor(color = ExtendedTheme.colors.text) { ProvideContentColor(color = ExtendedTheme.colors.text) {
Box( if (title != null) {
modifier = Modifier Box(
.padding(horizontal = 24.dp) modifier = Modifier
.align(Alignment.CenterHorizontally) .padding(horizontal = 24.dp)
) { .align(Alignment.CenterHorizontally)
ProvideTextStyle(value = MaterialTheme.typography.h6.copy(fontWeight = FontWeight.Bold)) { ) {
dialogScope.title() ProvideTextStyle(value = MaterialTheme.typography.h6.copy(fontWeight = FontWeight.Bold)) {
dialogScope.title()
}
} }
} }
Box(modifier = Modifier.align(Alignment.CenterHorizontally)) { Box(modifier = Modifier.align(Alignment.CenterHorizontally)) {