Merge remote-tracking branch 'maryam/wip_relay_location_cell_bugs'

mullvad · Dec 1, 2023 · 5b232d6 · 5b232d6
2 parents 9fcd047 + 946f749
commit 5b232d6
Showing 1 changed file with 4 additions and 3 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
@@ -19,7 +19,7 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
@@ -163,8 +163,9 @@ fun RelayLocationCell(
             RelayItemType.City -> Dimens.cityRowPadding
             RelayItemType.Relay -> Dimens.relayRowPadding
         }
-    val selected = selectedItem == relay
-    val expanded = remember(key1 = relay.expanded.toString()) { mutableStateOf(relay.expanded) }
+    val selected = selectedItem?.code == relay.code
+    val expanded =
+        rememberSaveable(key = relay.expanded.toString()) { mutableStateOf(relay.expanded) }
     val backgroundColor =
         when {
             selected -> MaterialTheme.colorScheme.inversePrimary