summaryrefslogtreecommitdiffhomepage
path: root/android
diff options
context:
space:
mode:
Diffstat (limited to 'android')
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/RelayLocationCell.kt27
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(