Fix bottom bar bottom margin

2 files changed, 20 insertions, 6 deletions

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AutoConnectAndLockdownModeScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AutoConnectAndLockdownModeScreen.kt
index 6fffdc70e8..a0b997d0c9 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AutoConnectAndLockdownModeScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AutoConnectAndLockdownModeScreen.kt
@@ -7,10 +7,15 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.WindowInsetsSides
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.systemBars
+import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.pager.HorizontalPager
 import androidx.compose.foundation.pager.PagerState
@@ -90,10 +95,13 @@ fun AutoConnectAndLockdownModeScreen(onBackClick: () -> Unit) {
                 text = stringResource(id = R.string.go_to_vpn_settings),
                 onClick = { context.openVpnSettings() },
                 modifier =
-                    Modifier.padding(
-                        horizontal = Dimens.sideMargin,
-                        vertical = Dimens.screenBottomMargin,
-                    ),
+                    Modifier.windowInsetsPadding(
+                            WindowInsets.systemBars.only(WindowInsetsSides.Bottom)
+                        )
+                        .padding(
+                            horizontal = Dimens.sideMargin,
+                            vertical = Dimens.screenBottomMargin,
+                        ),
                 trailingIcon = {
                     Icon(
                         imageVector = Icons.AutoMirrored.Filled.OpenInNew,
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/FilterScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/FilterScreen.kt
index a869749328..b88aeb450c 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/FilterScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/FilterScreen.kt
@@ -2,9 +2,14 @@ package net.mullvad.mullvadvpn.compose.screen
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.WindowInsetsSides
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.systemBars
+import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyItemScope
 import androidx.compose.material3.MaterialTheme
@@ -117,14 +122,14 @@ fun FilterScreen(
             }
             if (ownershipExpanded) {
                 itemWithDivider(key = Keys.OWNERSHIP_ALL, contentType = ContentType.ITEM) {
-                    AnyOwnership(state, { onSelectedOwnership(Constraint.Any) })
+                    AnyOwnership(state) { onSelectedOwnership(Constraint.Any) }
                 }
                 itemsWithDivider(
                     key = { it.name },
                     contentType = { ContentType.ITEM },
                     items = state.selectableOwnerships,
                 ) { ownership ->
-                    Ownership(ownership, state, { onSelectedOwnership(Constraint.Only(it)) })
+                    Ownership(ownership, state) { onSelectedOwnership(Constraint.Only(it)) }
                 }
             }
             itemWithDivider(key = Keys.PROVIDERS_TITLE, contentType = ContentType.HEADER) {
@@ -264,6 +269,7 @@ private fun BottomBar(
         modifier =
             Modifier.fillMaxWidth()
                 .background(color = backgroundColor)
+                .windowInsetsPadding(WindowInsets.systemBars.only(WindowInsetsSides.Bottom))
                 .padding(vertical = Dimens.screenBottomMargin, horizontal = Dimens.sideMargin),
         contentAlignment = Alignment.BottomCenter,
     ) {