summaryrefslogtreecommitdiffhomepage
path: root/android/app/src
diff options
context:
space:
mode:
authorDavid Göransson <david.goransson@mullvad.net>2025-09-11 14:02:29 +0200
committerDavid Göransson <david.goransson@mullvad.net>2025-09-11 14:02:29 +0200
commite7e6e60016fbb951833117f9d1f40ee85662bb38 (patch)
treee056b658daee6fc0bc60cbdf3b91f9d4b6e3a413 /android/app/src
parent6c6dbc5967e6741855065e560f12aeafe287cb8a (diff)
downloadmullvadvpn-e7e6e60016fbb951833117f9d1f40ee85662bb38.tar.xz
mullvadvpn-e7e6e60016fbb951833117f9d1f40ee85662bb38.zip
Fix screen animation not working from settings
Diffstat (limited to 'android/app/src')
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt10
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) },