diff options
| author | David Göransson <david.goransson@mullvad.net> | 2024-09-23 15:22:19 +0200 |
|---|---|---|
| committer | David Göransson <david.goransson@mullvad.net> | 2024-09-23 15:22:19 +0200 |
| commit | 42c19f2b8dbcd3eed0fbc5ecbc276294fc6b5870 (patch) | |
| tree | 9a5ee91c096ee08ff497bc4f6a7f83bde47a652f /android | |
| parent | e4b423e862e89c8a8ace7c43eda871fd2c934b1e (diff) | |
| parent | 349cbaa7a572d438f7257963428f13a71702b841 (diff) | |
| download | mullvadvpn-42c19f2b8dbcd3eed0fbc5ecbc276294fc6b5870.tar.xz mullvadvpn-42c19f2b8dbcd3eed0fbc5ecbc276294fc6b5870.zip | |
Merge branch 'change-server-function-not-working-on-mullvad-android-tv-droid-1373'
Diffstat (limited to 'android')
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/RelayLocationCell.kt | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/RelayLocationCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/RelayLocationCell.kt index 24e368a201..3ae3487526 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/RelayLocationCell.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/RelayLocationCell.kt @@ -140,19 +140,26 @@ fun RelayItemCell( isSelected -> MaterialTheme.colorScheme.selected else -> depth.toBackgroundColor() } - ) - .combinedClickable( - enabled = item.active, - onClick = onClick, - onLongClick = onLongClick, - ) - .padding(start = startPadding), + ), verticalAlignment = Alignment.CenterVertically, ) { - if (leadingContent != null) { - leadingContent() + // Duplicate row is needed for selection of the item on TV. + Row( + modifier = + Modifier.combinedClickable( + enabled = item.active, + onClick = onClick, + onLongClick = onLongClick, + ) + .padding(start = startPadding) + .weight(1f), + verticalAlignment = Alignment.CenterVertically, + ) { + if (leadingContent != null) { + leadingContent() + } + Name(relay = item) } - Name(modifier = Modifier.weight(1f), relay = item) if (item.hasChildren) { ExpandButton( |