diff options
| author | David Göransson <david.goransson@mullvad.net> | 2025-07-14 10:31:06 +0200 |
|---|---|---|
| committer | David Göransson <david.goransson@mullvad.net> | 2025-07-14 10:31:06 +0200 |
| commit | e6e985f38a0138b4c234974e8c1b9f00380583d4 (patch) | |
| tree | 81536521591b824f47c72f507056b071442cdc03 /android/lib/ui/component/src | |
| parent | 28b777889c6877501413aa0ee0029515991a409a (diff) | |
| parent | 7a409aa199e7aed5991432ddd817ca98a3b32c49 (diff) | |
| download | mullvadvpn-e6e985f38a0138b4c234974e8c1b9f00380583d4.tar.xz mullvadvpn-e6e985f38a0138b4c234974e8c1b9f00380583d4.zip | |
Merge branch 'select-location-follow-up-issue-droid-2072'
Diffstat (limited to 'android/lib/ui/component/src')
2 files changed, 24 insertions, 11 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/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/component/relaylist/SelectableRelayListItem.kt b/android/lib/ui/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/component/relaylist/SelectableRelayListItem.kt index e66bfbd359..ca70bf8a90 100644 --- a/android/lib/ui/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/component/relaylist/SelectableRelayListItem.kt +++ b/android/lib/ui/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/component/relaylist/SelectableRelayListItem.kt @@ -154,10 +154,12 @@ internal fun Name( @Composable internal fun Int.toBackgroundColor(): Color = when (this) { - 0 -> MaterialTheme.colorScheme.surfaceContainerHighest - 1 -> MaterialTheme.colorScheme.surfaceContainerHigh - 2 -> MaterialTheme.colorScheme.surfaceContainerLow - else -> MaterialTheme.colorScheme.surfaceContainerLowest + // Using primary is a workaround to ensure enough contrast between lowest depth (3) and the + // background. + 0 -> MaterialTheme.colorScheme.primary + 1 -> MaterialTheme.colorScheme.surfaceContainerHighest + 2 -> MaterialTheme.colorScheme.surfaceContainerHigh + else -> MaterialTheme.colorScheme.surfaceContainerLow } @Composable |