diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2023-12-01 12:13:15 +0100 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2023-12-01 12:13:15 +0100 |
| commit | 5b232d6d8b76bd4a6ba68dfa0d32241e8ed2eec1 (patch) | |
| tree | 8ad4497e760c228205f9d9487265fcb8951a59d9 /android | |
| parent | 9fcd047e3045bedcadfba65db6ec6e5b33e70a90 (diff) | |
| parent | 946f749fbcc9aa6ae986449f133456bcbf7b9d45 (diff) | |
| download | mullvadvpn-5b232d6d8b76bd4a6ba68dfa0d32241e8ed2eec1.tar.xz mullvadvpn-5b232d6d8b76bd4a6ba68dfa0d32241e8ed2eec1.zip | |
Merge remote-tracking branch 'maryam/wip_relay_location_cell_bugs'
Diffstat (limited to 'android')
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/RelayLocationCell.kt | 7 |
1 files changed, 4 insertions, 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 index b9390cd4ef..acd963fa61 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 @@ -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 |