Skip to content

🔨 Redesign FilledDropdown component to match prototype design #4000

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
guiyanakuang merged 1 commit into from
Mar 8, 2026
Merged

🔨 Redesign FilledDropdown component to match prototype design #4000

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
215 changes: 85 additions & 130 deletions app/src/commonMain/kotlin/com/crosspaste/ui/base/FilledDropdown.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,40 +1,41 @@
package com.crosspaste.ui.base

import androidx.compose.foundation.background
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.wrapContentWidth
import androidx.compose.foundation.text.BasicTextField
import androidx.compose.material3.DropdownMenu
import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.ExposedDropdownMenuAnchorType
import androidx.compose.material3.ExposedDropdownMenuBox
import androidx.compose.material3.ExposedDropdownMenuDefaults
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.MenuDefaults
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.material3.TextFieldDefaults
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.SolidColor
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.draw.clip
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.input.VisualTransformation
import androidx.compose.ui.text.rememberTextMeasurer
import com.crosspaste.ui.theme.AppUISize.medium
import com.crosspaste.ui.theme.AppUISize.xxxxLarge
import androidx.compose.ui.unit.sp
import com.composables.icons.materialsymbols.MaterialSymbols
import com.composables.icons.materialsymbols.rounded.Check
import com.composables.icons.materialsymbols.rounded.Expand_more
import com.crosspaste.ui.theme.AppUISize.small
import com.crosspaste.ui.theme.AppUISize.small3X
import com.crosspaste.ui.theme.AppUISize.tiny2X
import com.crosspaste.ui.theme.AppUISize.tiny5X
import com.crosspaste.ui.theme.AppUISize.tinyRoundedCornerShape
import com.crosspaste.ui.theme.AppUISize.xxLarge

@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun FilledDropdown(
selectedIndex: Int,
Expand All @@ -43,130 +44,84 @@ fun FilledDropdown(
modifier: Modifier = Modifier,
) {
var expanded by remember { mutableStateOf(false) }

val selectedOptionText = options.getOrNull(selectedIndex) ?: ""

val textMeasurer = rememberTextMeasurer()
val textStyle =
MaterialTheme.typography.bodyLarge.copy(
fontWeight = FontWeight.Medium,
fontFamily = FontFamily.Monospace,
)
val density = LocalDensity.current

val calculatedWidth =
remember(options, textStyle) {
val maxTextWidthPx =
options.maxOfOrNull {
textMeasurer.measure(it, style = textStyle).size.width
} ?: 0

with(density) {
maxTextWidthPx.toDp() + medium + xxxxLarge
}
}

val interactionSource = remember { MutableInteractionSource() }
val colorScheme = MaterialTheme.colorScheme

Box(
modifier = modifier.wrapContentWidth(),
contentAlignment = Alignment.CenterEnd,
) {
ExposedDropdownMenuBox(
expanded = expanded,
onExpandedChange = { expanded = !expanded },
modifier = Modifier.width(calculatedWidth),
Surface(
shape = tinyRoundedCornerShape,
color = colorScheme.surface,
border = BorderStroke(tiny5X, colorScheme.outlineVariant),
) {
val colors =
TextFieldDefaults.colors(
focusedContainerColor = MaterialTheme.colorScheme.surfaceContainerHighest,
unfocusedContainerColor = MaterialTheme.colorScheme.surfaceContainerHighest,
disabledContainerColor = MaterialTheme.colorScheme.surfaceContainerLow,
focusedIndicatorColor = MaterialTheme.colorScheme.primary,
unfocusedIndicatorColor = MaterialTheme.colorScheme.outlineVariant,
)

BasicTextField(
value = selectedOptionText,
onValueChange = {},
readOnly = true,
Row(
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(tiny2X),
modifier =
Modifier
.menuAnchor(ExposedDropdownMenuAnchorType.PrimaryNotEditable)
.fillMaxWidth()
.height(xxxxLarge),
textStyle =
textStyle.copy(
color = MaterialTheme.colorScheme.onSurface,
),
interactionSource = interactionSource,
cursorBrush = SolidColor(MaterialTheme.colorScheme.primary),
decorationBox = { innerTextField ->
TextFieldDefaults.DecorationBox(
value = selectedOptionText,
innerTextField = innerTextField,
enabled = true,
singleLine = true,
visualTransformation = VisualTransformation.None,
interactionSource = interactionSource,
trailingIcon = {
ExposedDropdownMenuDefaults.TrailingIcon(expanded = expanded)
},
colors = colors,
contentPadding = PaddingValues(start = medium),
container = {
TextFieldDefaults.Container(
enabled = true,
isError = false,
interactionSource = interactionSource,
colors = colors,
shape = MaterialTheme.shapes.extraSmall,
)
},
)
},
)

ExposedDropdownMenu(
expanded = expanded,
onDismissRequest = { expanded = false },
modifier = Modifier.background(MaterialTheme.colorScheme.surfaceContainer),
.clip(tinyRoundedCornerShape)
.clickable { expanded = !expanded }
.padding(horizontal = small3X, vertical = tiny2X),
) {
options.forEachIndexed { index, selectionOption ->
val isSelected = index == selectedIndex
DropdownMenuItem(
text = {
Text(
text = selectionOption,
style = MaterialTheme.typography.bodyLarge,
fontWeight = if (isSelected) FontWeight.SemiBold else FontWeight.Normal,
color =
if (isSelected) {
MaterialTheme.colorScheme.onSecondaryContainer
} else {
MaterialTheme.colorScheme.onSurface
},
)
},
onClick = {
expanded = false
onSelected(index)
},
colors =
MenuDefaults.itemColors(
textColor = MaterialTheme.colorScheme.onSurface,
),
modifier =
Modifier.background(
Text(
text = selectedOptionText,
fontSize = 13.sp,
fontWeight = FontWeight.Medium,
color = colorScheme.onSurface,
)
Icon(
imageVector = MaterialSymbols.Rounded.Expand_more,
contentDescription = "Expand",
modifier = Modifier.size(small),
tint = colorScheme.onSurfaceVariant,
)
}
}

DropdownMenu(
expanded = expanded,
onDismissRequest = { expanded = false },
containerColor = colorScheme.surface,
shape = tinyRoundedCornerShape,
) {
options.forEachIndexed { index, option ->
val isSelected = index == selectedIndex
DropdownMenuItem(
text = {
Text(
text = option,
fontSize = 13.sp,
fontWeight = if (isSelected) FontWeight.Medium else FontWeight.Normal,
color =
if (isSelected) {
MaterialTheme.colorScheme.secondaryContainer
colorScheme.primary
} else {
MaterialTheme.colorScheme.surfaceContainer
colorScheme.onSurface
},
),
contentPadding = ExposedDropdownMenuDefaults.ItemContentPadding,
)
}
)
},
onClick = {
expanded = false
onSelected(index)
},
trailingIcon =
if (isSelected) {
{
Icon(
imageVector = MaterialSymbols.Rounded.Check,
contentDescription = null,
modifier = Modifier.size(small),
tint = colorScheme.primary,
)
}
} else {
null
},
contentPadding = PaddingValues(horizontal = small3X, vertical = tiny2X),
modifier = Modifier.height(xxLarge),
)
}
}
}
Expand Down