klinsmaya/park0er-multi-casual-android
1
0
Fork 0
forked from mirror/park0er-multi-casual-android
Code Pull Requests Activity

Make action sheet pickers scrollable

Browse Source
This commit is contained in:
Xisheng-Zhao
2026-06-19 20:39:43 +08:00
parent 014e4e7761
commit 45412e5fdd
1 changed files with 106 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/ai/multica/app/ui/components/MulticaComponents.kt
+106 -85
View File
@@ -1058,96 +1058,40 @@ fun MulticaCupertinoActionSheet(
) )
}, },
message = { message = {
if (!message.isNullOrBlank()) { Column(
Text( modifier = Modifier.fillMaxWidth(),
text = message, horizontalAlignment = Alignment.CenterHorizontally,
style = MaterialTheme.typography.bodySmall.copy(fontSize = 12.sp, lineHeight = 16.sp), ) {
color = MulticaColors.TextTertiary, if (!message.isNullOrBlank()) {
textAlign = TextAlign.Center, Text(
) text = message,
} style = MaterialTheme.typography.bodySmall.copy(fontSize = 12.sp, lineHeight = 16.sp),
}, color = MulticaColors.TextTertiary,
buttons = { textAlign = TextAlign.Center,
items.forEach { item -> )
action( Spacer(modifier = Modifier.height(8.dp))
onClick = { }
performMulticaTapFeedback(haptic) LazyColumn(
item.onClick() modifier = Modifier
onDismissRequest() .fillMaxWidth()
}, .heightIn(max = 420.dp),
style = if (item.destructive) AlertActionStyle.Destructive else AlertActionStyle.Default,
enabled = item.enabled,
) { ) {
Row( items(items.size) { index ->
modifier = Modifier val item = items[index]
.fillMaxWidth() MulticaCupertinoActionSheetItemContent(
.semantics(mergeDescendants = true) { item = item,
contentDescription = "Multica Cupertino Action Sheet ${item.contentDescription ?: item.title}" onClick = {
if (!item.enabled) return@MulticaCupertinoActionSheetItemContent
performMulticaTapFeedback(haptic)
item.onClick()
onDismissRequest()
}, },
horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.CenterHorizontally), )
verticalAlignment = Alignment.CenterVertically,
) {
item.icon?.let { icon ->
Icon(
imageVector = icon,
contentDescription = null,
tint = if (item.destructive) MulticaColors.Danger else MulticaColors.TextTertiary,
modifier = Modifier.size(16.dp),
)
}
if (!item.badgeText.isNullOrBlank()) {
Text(
text = item.badgeText,
modifier = Modifier
.clip(RoundedCornerShape(999.dp))
.background(item.badgeColor.copy(alpha = 0.16f))
.border(1.dp, item.badgeColor.copy(alpha = 0.32f), RoundedCornerShape(999.dp))
.padding(horizontal = 7.dp, vertical = 3.dp),
style = MaterialTheme.typography.labelSmall.copy(
fontSize = 10.sp,
lineHeight = 12.sp,
fontWeight = FontWeight.SemiBold,
),
color = item.badgeColor,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
)
}
Column(horizontalAlignment = Alignment.CenterHorizontally) {
Text(
text = item.title,
style = MaterialTheme.typography.bodyMedium.copy(
fontSize = 15.sp,
lineHeight = 19.sp,
fontWeight = if (item.selected) FontWeight.SemiBold else FontWeight.Normal,
),
color = if (item.destructive) MulticaColors.Danger else MulticaColors.TextPrimary,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
textAlign = TextAlign.Center,
)
if (!item.subtitle.isNullOrBlank()) {
Text(
text = item.subtitle,
style = MaterialTheme.typography.labelSmall.copy(fontSize = 11.sp, lineHeight = 13.sp),
color = MulticaColors.TextTertiary,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
textAlign = TextAlign.Center,
)
}
}
if (item.selected) {
Icon(
imageVector = Icons.Outlined.CheckCircle,
contentDescription = null,
tint = MulticaColors.Accent,
modifier = Modifier.size(16.dp),
)
}
} }
} }
} }
},
buttons = {
if (!cancelText.isNullOrBlank()) { if (!cancelText.isNullOrBlank()) {
action( action(
onClick = { onClick = {
@@ -1168,6 +1112,83 @@ fun MulticaCupertinoActionSheet(
) )
} }
@Composable
private fun MulticaCupertinoActionSheetItemContent(
item: MulticaCupertinoActionSheetItem,
onClick: () -> Unit,
) {
Row(
modifier = Modifier
.fillMaxWidth()
.clickable(enabled = item.enabled, onClick = onClick)
.padding(horizontal = 12.dp, vertical = 11.dp)
.semantics(mergeDescendants = true) {
contentDescription = "Multica Cupertino Action Sheet ${item.contentDescription ?: item.title}"
},
horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.CenterHorizontally),
verticalAlignment = Alignment.CenterVertically,
) {
item.icon?.let { icon ->
Icon(
imageVector = icon,
contentDescription = null,
tint = if (item.destructive) MulticaColors.Danger else MulticaColors.TextTertiary,
modifier = Modifier.size(16.dp),
)
}
if (!item.badgeText.isNullOrBlank()) {
Text(
text = item.badgeText,
modifier = Modifier
.clip(RoundedCornerShape(999.dp))
.background(item.badgeColor.copy(alpha = 0.16f))
.border(1.dp, item.badgeColor.copy(alpha = 0.32f), RoundedCornerShape(999.dp))
.padding(horizontal = 7.dp, vertical = 3.dp),
style = MaterialTheme.typography.labelSmall.copy(
fontSize = 10.sp,
lineHeight = 12.sp,
fontWeight = FontWeight.SemiBold,
),
color = item.badgeColor,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
)
}
Column(horizontalAlignment = Alignment.CenterHorizontally) {
Text(
text = item.title,
style = MaterialTheme.typography.bodyMedium.copy(
fontSize = 15.sp,
lineHeight = 19.sp,
fontWeight = if (item.selected) FontWeight.SemiBold else FontWeight.Normal,
),
color = if (item.destructive) MulticaColors.Danger else MulticaColors.TextPrimary,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
textAlign = TextAlign.Center,
)
if (!item.subtitle.isNullOrBlank()) {
Text(
text = item.subtitle,
style = MaterialTheme.typography.labelSmall.copy(fontSize = 11.sp, lineHeight = 13.sp),
color = MulticaColors.TextTertiary,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
textAlign = TextAlign.Center,
)
}
}
if (item.selected) {
Icon(
imageVector = Icons.Outlined.CheckCircle,
contentDescription = null,
tint = MulticaColors.Accent,
modifier = Modifier.size(16.dp),
)
}
}
}
@Composable @Composable
@OptIn(ExperimentalCupertinoApi::class) @OptIn(ExperimentalCupertinoApi::class)
fun MulticaCupertinoAlertDialog( fun MulticaCupertinoAlertDialog(