diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2025-09-11 14:43:45 +0200 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2025-09-11 14:43:45 +0200 |
| commit | c77a6bd60a5e417315b592f097fd49a6ffca7203 (patch) | |
| tree | e056b658daee6fc0bc60cbdf3b91f9d4b6e3a413 /android | |
| parent | 6c6dbc5967e6741855065e560f12aeafe287cb8a (diff) | |
| parent | e7e6e60016fbb951833117f9d1f40ee85662bb38 (diff) | |
| download | mullvadvpn-c77a6bd60a5e417315b592f097fd49a6ffca7203.tar.xz mullvadvpn-c77a6bd60a5e417315b592f097fd49a6ffca7203.zip | |
Merge branch 'fix-broken-vpn-settings-animation'
Diffstat (limited to 'android')
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt index 1b0db33b14..cb495a3ba6 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt @@ -242,10 +242,12 @@ fun SharedTransitionScope.VpnSettings( state = state, initialScrollToFeature = navArgs.scrollToFeature, modifier = - Modifier.sharedBounds( - rememberSharedContentState(key = navArgs.scrollToFeature ?: ""), - animatedVisibilityScope = animatedVisibilityScope, - ), + if (navArgs.scrollToFeature != null) { + Modifier.sharedBounds( + rememberSharedContentState(key = navArgs.scrollToFeature), + animatedVisibilityScope = animatedVisibilityScope, + ) + } else Modifier, snackbarHostState = snackbarHostState, navigateToContentBlockersInfo = dropUnlessResumed { navigator.navigate(ContentBlockersInfoDestination) }, |