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

modernize SpinnerSelectionDialog with Material 3 styling

Browse Source
This commit is contained in:
davotoula
2026-03-20 12:05:49 +01:00
parent 4f80fbfae4
commit 460ccc2d02
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/TextSpinner.kt
+4 -11
View File
@@ -20,7 +20,6 @@
*/ */
package com.vitorpamplona.amethyst.ui.components package com.vitorpamplona.amethyst.ui.components
import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.clickable import androidx.compose.foundation.clickable
import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
@@ -34,7 +33,6 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.itemsIndexed import androidx.compose.foundation.lazy.itemsIndexed
import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.Surface import androidx.compose.material3.Surface
@@ -61,7 +59,6 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.window.Dialog import androidx.compose.ui.window.Dialog
import com.vitorpamplona.amethyst.R import com.vitorpamplona.amethyst.R
import com.vitorpamplona.amethyst.ui.stringRes import com.vitorpamplona.amethyst.ui.stringRes
import com.vitorpamplona.amethyst.ui.theme.DividerThickness
import com.vitorpamplona.amethyst.ui.theme.Font14SP import com.vitorpamplona.amethyst.ui.theme.Font14SP
import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.ImmutableList
@@ -211,14 +208,14 @@ fun <T> SpinnerSelectionDialog(
) { ) {
Dialog(onDismissRequest = onDismiss) { Dialog(onDismissRequest = onDismiss) {
Surface( Surface(
border = BorderStroke(0.25.dp, Color.LightGray), shape = RoundedCornerShape(28.dp),
shape = RoundedCornerShape(5.dp), color = MaterialTheme.colorScheme.surfaceContainerHigh,
) { ) {
LazyColumn { LazyColumn {
title?.let { title?.let {
item { item {
Row( Row(
modifier = Modifier.fillMaxWidth().padding(16.dp, 16.dp), modifier = Modifier.fillMaxWidth().padding(20.dp),
horizontalArrangement = Arrangement.Center, horizontalArrangement = Arrangement.Center,
) { ) {
Text( Text(
@@ -227,7 +224,6 @@ fun <T> SpinnerSelectionDialog(
fontWeight = FontWeight.Bold, fontWeight = FontWeight.Bold,
) )
} }
HorizontalDivider(color = Color.LightGray, thickness = DividerThickness)
} }
} }
itemsIndexed(options) { index, item -> itemsIndexed(options) { index, item ->
@@ -237,7 +233,7 @@ fun <T> SpinnerSelectionDialog(
Modifier Modifier
.fillMaxWidth() .fillMaxWidth()
.clickable { onSelect(index) } .clickable { onSelect(index) }
.padding(16.dp, 16.dp) .padding(horizontal = 16.dp, vertical = 12.dp)
.semantics { .semantics {
role = Role.Button role = Role.Button
contentDescription = optionsOfLabel contentDescription = optionsOfLabel
@@ -245,9 +241,6 @@ fun <T> SpinnerSelectionDialog(
) { ) {
Column { onRenderItem(item) } Column { onRenderItem(item) }
} }
if (index < options.lastIndex) {
HorizontalDivider(color = Color.LightGray, thickness = DividerThickness)
}
} }
} }
} }