nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Leaves some space to click when their is no space or new lines on the poll.

Browse Source
This commit is contained in:
Vitor Pamplona
2026-03-23 18:15:36 -04:00
parent 4c9f2de6f7
commit ec4f949782
1 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Poll.kt
+18 -15
View File
@@ -180,7 +180,7 @@ fun InnerRenderPoll(
}, },
) )
}, },
) { code, label, closed -> ) { code, label ->
TranslatableRichTextViewer( TranslatableRichTextViewer(
content = label, content = label,
canPreview = canPreview, canPreview = canPreview,
@@ -227,7 +227,7 @@ fun RenderPollCard(
pollState: PollResponsesCache, pollState: PollResponsesCache,
accountViewModel: AccountViewModel, accountViewModel: AccountViewModel,
galleryUser: @Composable RowScope.(user: User) -> Unit, galleryUser: @Composable RowScope.(user: User) -> Unit,
labelContent: @Composable ColumnScope.(code: String, label: String, closed: Boolean) -> Unit, labelContent: @Composable ColumnScope.(code: String, label: String) -> Unit,
) { ) {
val card = val card =
remember(event) { remember(event) {
@@ -280,7 +280,7 @@ fun RenderPollCard(
card: PollCard, card: PollCard,
onRespond: (Set<String>) -> Unit, onRespond: (Set<String>) -> Unit,
resultContent: @Composable RowScope.(user: User) -> Unit, resultContent: @Composable RowScope.(user: User) -> Unit,
labelContent: @Composable ColumnScope.(code: String, label: String, closed: Boolean) -> Unit, labelContent: @Composable ColumnScope.(code: String, label: String) -> Unit,
) { ) {
Column( Column(
verticalArrangement = SpacedBy5dp, verticalArrangement = SpacedBy5dp,
@@ -312,7 +312,7 @@ fun RenderPollCard(
@Composable @Composable
private fun ColumnScope.RenderSingleChoiceOptions( private fun ColumnScope.RenderSingleChoiceOptions(
card: PollCard, card: PollCard,
labelContent: @Composable (ColumnScope.(String, String, closed: Boolean) -> Unit), labelContent: @Composable (ColumnScope.(String, String) -> Unit),
onRespond: (Set<String>) -> Unit, onRespond: (Set<String>) -> Unit,
) { ) {
card.options.forEach { card.options.forEach {
@@ -334,12 +334,15 @@ private fun ColumnScope.RenderSingleChoiceOptions(
horizontalArrangement = Arrangement.SpaceBetween, horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
) { ) {
val hasSpaceToClick =
remember {
it.label.contains(' ') || it.label.contains('\n')
}
Column( Column(
modifier = modifier = if (hasSpaceToClick) Modifier.fillMaxWidth() else Modifier.fillMaxWidth(0.9f),
Modifier
.fillMaxWidth(),
) { ) {
labelContent(it.code, it.label, false) labelContent(it.code, it.label)
} }
} }
} }
@@ -349,7 +352,7 @@ private fun ColumnScope.RenderSingleChoiceOptions(
@Composable @Composable
private fun ColumnScope.RenderMultiChoiceOptions( private fun ColumnScope.RenderMultiChoiceOptions(
card: PollCard, card: PollCard,
labelContent: @Composable (ColumnScope.(String, String, closed: Boolean) -> Unit), labelContent: @Composable (ColumnScope.(String, String) -> Unit),
onRespond: (Set<String>) -> Unit, onRespond: (Set<String>) -> Unit,
) { ) {
var multichoice by var multichoice by
@@ -386,7 +389,7 @@ private fun ColumnScope.RenderMultiChoiceOptions(
Column( Column(
modifier = Modifier.weight(1f), modifier = Modifier.weight(1f),
) { ) {
labelContent(option.code, option.label, false) labelContent(option.code, option.label)
} }
} }
} }
@@ -407,11 +410,11 @@ private fun ColumnScope.RenderMultiChoiceOptions(
private fun RenderResults( private fun RenderResults(
card: PollCard, card: PollCard,
resultContent: @Composable RowScope.(user: User) -> Unit, resultContent: @Composable RowScope.(user: User) -> Unit,
labelContent: @Composable (ColumnScope.(code: String, label: String, closed: Boolean) -> Unit), labelContent: @Composable (ColumnScope.(code: String, label: String) -> Unit),
) { ) {
card.options.forEach { pollItem -> card.options.forEach { pollItem ->
RenderClosedItem(pollItem, resultContent) { RenderClosedItem(pollItem, resultContent) {
labelContent(pollItem.code, pollItem.label, true) labelContent(pollItem.code, pollItem.label)
} }
} }
} }
@@ -516,7 +519,7 @@ fun measure100PercentWidthModifier(textStyle: TextStyle): Modifier {
val density = LocalDensity.current val density = LocalDensity.current
val layoutDirection = LocalLayoutDirection.current val layoutDirection = LocalLayoutDirection.current
return remember(fontFamilyResolver, density, layoutDirection, textStyle) { return remember(fontFamilyResolver, density, textStyle) {
val widthPx = val widthPx =
TextMeasurer(fontFamilyResolver, density, layoutDirection, 1) TextMeasurer(fontFamilyResolver, density, layoutDirection, 1)
.measure("100%", style = textStyle.copy(fontWeight = FontWeight.Bold)) .measure("100%", style = textStyle.copy(fontWeight = FontWeight.Bold))
@@ -603,7 +606,7 @@ fun RenderPollManualPreview() {
ThemeComparisonColumn { ThemeComparisonColumn {
Column(Modifier.padding(10.dp)) { Column(Modifier.padding(10.dp)) {
RenderPollCard(poll, {}, {}) { _, label, closed -> RenderPollCard(poll, {}, {}) { _, label ->
Text( Text(
text = label, text = label,
) )
@@ -651,7 +654,7 @@ fun RenderPollManualLongPreview() {
ThemeComparisonColumn { ThemeComparisonColumn {
Column(Modifier.padding(10.dp)) { Column(Modifier.padding(10.dp)) {
RenderPollCard(poll, {}, {}) { _, label, closed -> RenderPollCard(poll, {}, {}) { _, label ->
Text( Text(
text = label, text = label,
) )