Merge branch 'change-server-function-not-working-on-mullvad-android-t…

…v-droid-1373'
mullvad · Sep 23, 2024 · 42c19f2 · 42c19f2
2 parents e4b423e + 349cbaa
commit 42c19f2
Showing 1 changed file with 17 additions and 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
@@ -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(