Added padding to all screens

Signed-off-by: Arnau Mora <[email protected]>

Author: ArnyminerZ

app/src/main/kotlin/at/bitfire/davdroid/ui/AccountsDrawerHandler.kt

@@ -7,16 +7,13 @@ package at.bitfire.davdroid.ui
 import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
-import android.content.res.Configuration
 import androidx.annotation.StringRes
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.displayCutoutPadding
 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
@@ -46,7 +43,6 @@ import androidx.compose.ui.graphics.RectangleShape
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.graphics.vector.rememberVectorPainter
-import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalInspectionMode
 import androidx.compose.ui.res.painterResource
@@ -82,18 +78,9 @@ abstract class AccountsDrawerHandler {
         snackbarHostState: SnackbarHostState,
         onCloseDrawer: () -> Unit
     ) {
-        val conf = LocalConfiguration.current
-        val isHorizontal = conf.orientation == Configuration.ORIENTATION_LANDSCAPE
         Column(modifier = Modifier
             .fillMaxWidth()
             .verticalScroll(rememberScrollState())
-            .let { mod ->
-                if (isHorizontal) {
-                    mod.displayCutoutPadding()
-                } else {
-                    mod.navigationBarsPadding()
-                }
-            }
         ) {
             BrandingHeader()
 

app/src/main/kotlin/at/bitfire/davdroid/ui/AccountsScreen.kt

@@ -7,7 +7,6 @@ package at.bitfire.davdroid.ui
 import android.Manifest
 import android.accounts.Account
 import android.content.Intent
-import android.content.res.Configuration
 import android.net.Uri
 import android.os.Build
 import android.provider.Settings
@@ -19,9 +18,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.safeContent
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
@@ -66,7 +63,6 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalInspectionMode
 import androidx.compose.ui.res.painterResource
@@ -189,7 +185,6 @@ fun AccountsScreen(
             }
         ) {
             Scaffold(
-                contentWindowInsets = WindowInsets.safeContent,
                 topBar = {
                     TopAppBar(
                         navigationIcon = {
@@ -213,15 +208,7 @@ fun AccountsScreen(
                     )
                 },
                 floatingActionButton = {
-                    val conf = LocalConfiguration.current
-                    val isHorizontal = conf.orientation == Configuration.ORIENTATION_LANDSCAPE
-                    Column(
-                        horizontalAlignment = Alignment.CenterHorizontally,
-                        modifier = if (isHorizontal)
-                            Modifier.navigationBarsPadding()
-                        else
-                            Modifier,
-                    ) {
+                    Column(horizontalAlignment = Alignment.CenterHorizontally) {
                         if (showAddAccount == AccountsModel.FABStyle.WithText)
                             ExtendedFloatingActionButton(
                                 text = { Text(stringResource(R.string.login_add_account)) },

app/src/main/kotlin/at/bitfire/davdroid/ui/AppTheme.kt

@@ -8,10 +8,16 @@ import androidx.activity.SystemBarStyle
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.displayCutoutPadding
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.SideEffect
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clipToBounds
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalUriHandler
@@ -44,8 +50,11 @@ fun AppTheme(
                 M3ColorScheme.lightScheme
             else
                 M3ColorScheme.darkScheme,
-            content = content
-        )
+        ) {
+            Box(Modifier.fillMaxSize().displayCutoutPadding().navigationBarsPadding().clipToBounds()) {
+                content()
+            }
+        }
     }
 
     // Track if the app is in the foreground