polish Android iOS-style issue skills and forms
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -1607,24 +1607,26 @@ fun MulticaCupertinoTextField(
|
|||||||
.semantics { this.contentDescription = fieldDescription }
|
.semantics { this.contentDescription = fieldDescription }
|
||||||
Column(
|
Column(
|
||||||
modifier = modifier.fillMaxWidth(),
|
modifier = modifier.fillMaxWidth(),
|
||||||
verticalArrangement = Arrangement.spacedBy(6.dp),
|
verticalArrangement = Arrangement.spacedBy(5.dp),
|
||||||
) {
|
) {
|
||||||
Text(
|
Text(
|
||||||
text = label,
|
text = label,
|
||||||
style = MaterialTheme.typography.labelMedium.copy(fontSize = 14.sp, lineHeight = 18.sp, fontWeight = FontWeight.SemiBold),
|
style = MaterialTheme.typography.labelMedium.copy(fontSize = 12.sp, lineHeight = 15.sp, fontWeight = FontWeight.SemiBold),
|
||||||
color = MulticaColors.TextTertiary,
|
color = MulticaColors.TextTertiary,
|
||||||
|
maxLines = 1,
|
||||||
|
overflow = TextOverflow.Ellipsis,
|
||||||
)
|
)
|
||||||
CupertinoBorderedTextField(
|
CupertinoBorderedTextField(
|
||||||
value = value,
|
value = value,
|
||||||
onValueChange = onValueChange,
|
onValueChange = onValueChange,
|
||||||
modifier = fieldModifier,
|
modifier = fieldModifier.heightIn(min = if (singleLine) 44.dp else 48.dp),
|
||||||
enabled = enabled,
|
enabled = enabled,
|
||||||
singleLine = singleLine,
|
singleLine = singleLine,
|
||||||
minLines = minLines,
|
minLines = minLines,
|
||||||
maxLines = maxLines,
|
maxLines = maxLines,
|
||||||
placeholder = { Text(label, color = MulticaColors.TextTertiary) },
|
placeholder = { Text(label, color = MulticaColors.TextTertiary) },
|
||||||
textStyle = MaterialTheme.typography.bodyLarge.copy(fontSize = 17.sp, lineHeight = 22.sp, color = MulticaColors.TextPrimary),
|
textStyle = MaterialTheme.typography.bodyLarge.copy(fontSize = 16.sp, lineHeight = 21.sp, color = MulticaColors.TextPrimary),
|
||||||
shape = RoundedCornerShape(12.dp),
|
shape = RoundedCornerShape(10.dp),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user