summaryrefslogtreecommitdiffhomepage
path: root/android
diff options
context:
space:
mode:
authorJonatan Rhodin <jonatan.rhodin@mullvad.net>2024-11-22 14:55:02 +0100
committerJonatan Rhodin <jonatan.rhodin@mullvad.net>2024-11-22 14:55:02 +0100
commitb2d3287552a6530901e7e954daa5bb446307f672 (patch)
tree36b9c7cdb5d038218417a2b35da34cf6649a9470 /android
parent04e9037e9e98fb6d0ac0b04d165eb2daace1ba8e (diff)
parent77712b375e11fdac36a9cf017b5e27b080adb21d (diff)
downloadmullvadvpn-b2d3287552a6530901e7e954daa5bb446307f672.tar.xz
mullvadvpn-b2d3287552a6530901e7e954daa5bb446307f672.zip
Merge branch 'move-snackbar-above-import-button-in-server-ip-override-droid-1584'
Diffstat (limited to 'android')
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ServerIpOverridesScreen.kt4
1 files changed, 1 insertions, 3 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ServerIpOverridesScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ServerIpOverridesScreen.kt
index 457103a022..df51055b60 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ServerIpOverridesScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ServerIpOverridesScreen.kt
@@ -203,6 +203,7 @@ fun ServerIpOverridesScreen(
ServerIpOverridesCell(active = state.overridesActive)
Spacer(modifier = Modifier.weight(1f))
+ SnackbarHost(hostState = snackbarHostState) { MullvadSnackbar(snackbarData = it) }
PrimaryButton(
onClick = { showBottomSheet = true },
text = stringResource(R.string.server_ip_overrides_import_button),
@@ -211,9 +212,6 @@ fun ServerIpOverridesScreen(
.padding(bottom = Dimens.screenVerticalMargin)
.testTag(SERVER_IP_OVERRIDE_IMPORT_TEST_TAG),
)
- SnackbarHost(hostState = snackbarHostState, modifier = Modifier.animateContentSize()) {
- MullvadSnackbar(snackbarData = it)
- }
}
}
}