diff options
| author | David Göransson <david.goransson@mullvad.net> | 2024-12-19 11:16:10 +0100 |
|---|---|---|
| committer | David Göransson <david.goransson@mullvad.net> | 2024-12-19 11:16:10 +0100 |
| commit | b49a484db38668c7570145279d09cf1cc0343094 (patch) | |
| tree | 92e5782e3c25decbea698d1042533bd52f95b5d2 /android/app/src | |
| parent | 6039cb1be921f4bf290a179388768693a4a80475 (diff) | |
| parent | 50af2396207e09313f687de5920ed4fe47132a1c (diff) | |
| download | mullvadvpn-b49a484db38668c7570145279d09cf1cc0343094.tar.xz mullvadvpn-b49a484db38668c7570145279d09cf1cc0343094.zip | |
Merge branch 'expandcollapse-of-connection-card-does-not-animate-droid-1694'
Diffstat (limited to 'android/app/src')
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreen.kt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreen.kt index 30af30fec5..73c5eb2413 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreen.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreen.kt @@ -378,16 +378,16 @@ private fun ConnectionCard( Logger.d("Tunnelstate: ${state.tunnelState}, expanded: $expanded") AnimatedContent( - (state.tunnelState as? TunnelState.Connected)?.featureIndicators, + (state.tunnelState as? TunnelState.Connected)?.featureIndicators to expanded, modifier = Modifier.weight(1f, fill = false), label = "connection_card_connection_details", - ) { featureIndicators -> + ) { (featureIndicators, exp) -> if (featureIndicators != null) { ConnectionInfo( featureIndicators, (state.tunnelState as? TunnelState.Connected)?.toConnectionsDetails(), - expanded, - onToggleExpand = { expanded = !expanded }, + exp, + onToggleExpand = { expanded = !exp }, ) } else { Spacer(Modifier.height(Dimens.smallSpacer)) |