diff options
| author | David Göransson <david.goransson@mullvad.net> | 2025-07-09 12:14:09 +0200 |
|---|---|---|
| committer | David Göransson <david.goransson@mullvad.net> | 2025-07-14 09:38:52 +0200 |
| commit | 0e90d00bff5c8c5954dd993f8f6c1caaa17e06cb (patch) | |
| tree | 61234751547a7601b691fce9435dcc0a5659322b /android/lib | |
| parent | 28b777889c6877501413aa0ee0029515991a409a (diff) | |
| download | mullvadvpn-0e90d00bff5c8c5954dd993f8f6c1caaa17e06cb.tar.xz mullvadvpn-0e90d00bff5c8c5954dd993f8f6c1caaa17e06cb.zip | |
Adapt CheckableRelayListItem to new design
Diffstat (limited to 'android/lib')
2 files changed, 19 insertions, 37 deletions
diff --git a/android/lib/ui/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/component/relaylist/CheckableRelayListItem.kt b/android/lib/ui/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/component/relaylist/CheckableRelayListItem.kt index d92e978d5c..1f25432cf4 100644 --- a/android/lib/ui/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/component/relaylist/CheckableRelayListItem.kt +++ b/android/lib/ui/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/component/relaylist/CheckableRelayListItem.kt @@ -59,17 +59,28 @@ fun CheckableRelayLocationCell( selected = false, content = { Row( - modifier = - Modifier.padding(start = item.depth * Dimens.mediumPadding) - .padding(Dimens.mediumPadding), + modifier = Modifier.padding(start = item.depth * Dimens.mediumPadding), verticalAlignment = Alignment.CenterVertically, ) { - Name(name = item.item.name, state = null, active = true) + Checkbox( + modifier = Modifier.padding(Dimens.smallPadding), + checked = item.checked, + onCheckedChange = onRelayCheckedChange, + ) + + Name( + modifier = + Modifier.padding( + top = Dimens.mediumPadding, + bottom = Dimens.mediumPadding, + end = Dimens.mediumPadding, + ), + name = item.item.name, + state = null, + active = true, + ) } }, - leadingContent = { - Checkbox(checked = item.checked, onCheckedChange = onRelayCheckedChange) - }, onClick = { onRelayCheckedChange(!item.checked) }, onLongClick = null, trailingContent = { diff --git a/android/lib/ui/designsystem/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/designsystem/RelayListItem.kt b/android/lib/ui/designsystem/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/designsystem/RelayListItem.kt index c2e9664a18..9bc5513526 100644 --- a/android/lib/ui/designsystem/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/designsystem/RelayListItem.kt +++ b/android/lib/ui/designsystem/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/designsystem/RelayListItem.kt @@ -50,7 +50,6 @@ fun RelayListItem( enabled: Boolean = true, onClick: (() -> Unit) = {}, onLongClick: (() -> Unit)? = {}, - leadingContent: @Composable (() -> Unit)? = null, content: @Composable () -> Unit, trailingContent: @Composable (() -> Unit)? = null, colors: RelayListItemColors = RelayListItemDefaults.colors(), @@ -67,22 +66,6 @@ fun RelayListItem( horizontalArrangement = Arrangement.spacedBy(RelayListTokens.listItemSpacer), verticalAlignment = Alignment.CenterVertically, ) { - if (leadingContent != null) { - Box( - Modifier.background(colors.containerColor) - .width(RelayListTokens.listItemButtonWidth) - .fillMaxHeight(), - contentAlignment = Alignment.Center, - ) { - ProvideContentColorTextStyle( - colors.leadingIconColor, - MaterialTheme.typography.titleMedium, - ) { - leadingContent() - } - } - } - Row( Modifier.weight(1f, fill = true) .background(colors.containerColor) @@ -215,7 +198,7 @@ private fun PreviewLeadingRelayListItem() { overflow = TextOverflow.Ellipsis, ) }, - leadingContent = { + trailingContent = { Box( modifier = Modifier.fillMaxSize().clickable(onClick = { /* Handle click */ }), contentAlignment = Alignment.Center, @@ -284,18 +267,6 @@ private fun PreviewLeadingAndTrailingRelayListItem() { overflow = TextOverflow.Ellipsis, ) }, - leadingContent = { - Box( - modifier = Modifier.fillMaxSize().clickable(onClick = {}), - contentAlignment = Alignment.Center, - ) { - Icon( - modifier = Modifier.padding(16.dp), - imageVector = Icons.Default.KeyboardArrowDown, - contentDescription = null, - ) - } - }, trailingContent = { Box( modifier = Modifier.fillMaxSize().clickable(onClick = {}), |