Fixed padding problems with Edge-To-Edge (#1171)

* Added navigation bars paddign Signed-off-by: Arnau Mora Gras <arnyminerz@proton.me> * Only consuming top padding Signed-off-by: Arnau Mora Gras <arnyminerz@proton.me> --------- Signed-off-by: Arnau Mora Gras <arnyminerz@proton.me>
bitfireAT · Dec 15, 2024 · d892dd2 · d892dd2
1 parent 95ebce5
commit d892dd2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/app/src/main/kotlin/at/bitfire/davdroid/ui/AccountsDrawerHandler.kt b/app/src/main/kotlin/at/bitfire/davdroid/ui/AccountsDrawerHandler.kt
@@ -14,6 +14,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.statusBarsPadding
@@ -81,6 +82,7 @@ abstract class AccountsDrawerHandler {
         Column(modifier = Modifier
             .fillMaxWidth()
             .verticalScroll(rememberScrollState())
+            .navigationBarsPadding()
         ) {
             BrandingHeader()
 

diff --git a/app/src/main/kotlin/at/bitfire/davdroid/ui/setup/LoginScreen.kt b/app/src/main/kotlin/at/bitfire/davdroid/ui/setup/LoginScreen.kt
@@ -109,7 +109,7 @@ fun LoginScreenContent(
             Box(
                 Modifier
                     .fillMaxSize()
-                    .padding(padding)
+                    .padding(top = padding.calculateTopPadding())
             ) {
 
                 when (page) {