From 94747da3d015335207762ad668815674d5499b07 Mon Sep 17 00:00:00 2001 From: FooIbar <118464521+FooIbar@users.noreply.github.com> Date: Tue, 11 Jul 2023 13:54:48 +0800 Subject: [PATCH] Tweak the layout of the favorite dialog --- .../main/java/com/hippo/ehviewer/ui/tools/Dialog.kt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/hippo/ehviewer/ui/tools/Dialog.kt b/app/src/main/java/com/hippo/ehviewer/ui/tools/Dialog.kt index 8a3a65de1..ddb513e2f 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/tools/Dialog.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/tools/Dialog.kt @@ -202,6 +202,7 @@ class DialogState { @StringRes title: Int, @StringRes hint: Int, maxChar: Int, + adjustTextPosition: Boolean = true, ): Pair = showNoButton(false) { Column { Text(text = stringResource(id = title), modifier = Modifier.padding(horizontal = 16.dp).padding(top = 16.dp), style = MaterialTheme.typography.titleMedium) @@ -243,8 +244,13 @@ class DialogState { modifier = Modifier.clip(IconWithTextCorner).clickable { dismissWith(index to note) }, horizontalAlignment = Alignment.CenterHorizontally, ) { - Icon(imageVector = icon, contentDescription = null, tint = AlertDialogDefaults.iconContentColor) - Text(text = text, style = MaterialTheme.typography.bodySmall) + if (index == 0 && adjustTextPosition) { + Text(text = text, style = MaterialTheme.typography.bodySmall) + Icon(imageVector = icon, contentDescription = null, tint = AlertDialogDefaults.iconContentColor) + } else { + Icon(imageVector = icon, contentDescription = null, tint = AlertDialogDefaults.iconContentColor) + Text(text = text, style = MaterialTheme.typography.bodySmall) + } } } }