Fixed paddings on horizontal mode

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

@@ -68,10 +68,6 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.json.JSONObject
 import java.text.Collator
-import java.time.LocalDateTime
-import java.time.ZoneOffset
-import java.time.format.DateTimeFormatter
-import java.time.format.FormatStyle
 import java.util.LinkedList
 import java.util.Locale
 import java.util.Optional

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

@@ -12,9 +12,13 @@ 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.WindowInsets
+import androidx.compose.foundation.layout.asPaddingValues
+import androidx.compose.foundation.layout.calculateStartPadding
+import androidx.compose.foundation.layout.displayCutout
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.navigationBarsPadding
+import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.statusBarsPadding
@@ -46,6 +50,7 @@ import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.graphics.vector.rememberVectorPainter
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalInspectionMode
+import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
@@ -82,7 +87,13 @@ abstract class AccountsDrawerHandler {
         Column(modifier = Modifier
             .fillMaxWidth()
             .verticalScroll(rememberScrollState())
-            .navigationBarsPadding()
+            .padding(
+                // Force only to take bottom and left paddings, because we don't know whether the
+                // navigation bar will be at the bottom or at the right. This way we make sure no
+                // extra paddings are added to the right of the drawer.
+                start = WindowInsets.displayCutout.asPaddingValues().calculateStartPadding(LocalLayoutDirection.current),
+                bottom = WindowInsets.navigationBars.asPaddingValues().calculateBottomPadding(),
+            )
         ) {
             BrandingHeader()
 

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

@@ -16,9 +16,13 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.asPaddingValues
+import androidx.compose.foundation.layout.calculateEndPadding
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.safeContent
+import androidx.compose.foundation.layout.safeDrawing
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
@@ -65,6 +69,7 @@ import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalInspectionMode
+import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.res.vectorResource
@@ -166,7 +171,7 @@ fun AccountsScreen(
     }
 
     val snackbarHostState = remember { SnackbarHostState() }
-    AppTheme {
+    AppTheme(windowInsets = WindowInsets(0.dp)) {
         ModalNavigationDrawer(
             drawerState = drawerState,
             drawerContent = {
@@ -208,7 +213,15 @@ fun AccountsScreen(
                     )
                 },
                 floatingActionButton = {
-                    Column(horizontalAlignment = Alignment.CenterHorizontally) {
+                    Column(
+                        horizontalAlignment = Alignment.CenterHorizontally,
+                        modifier = Modifier.padding(
+                            // Set padding only to the right, because the bottom is automatically padded.
+                            end = WindowInsets.safeContent
+                                .asPaddingValues()
+                                .calculateEndPadding(LocalLayoutDirection.current),
+                        ),
+                    ) {
                         if (showAddAccount == AccountsModel.FABStyle.WithText)
                             ExtendedFloatingActionButton(
                                 text = { Text(stringResource(R.string.login_add_account)) },
@@ -240,7 +253,8 @@ fun AccountsScreen(
                             }
                     }
                 },
-                snackbarHost = { SnackbarHost(snackbarHostState) }
+                snackbarHost = { SnackbarHost(snackbarHostState) },
+                contentWindowInsets = WindowInsets.safeDrawing,
             ) { padding ->
                 PullToRefreshBox(
                     isRefreshing = isRefreshing,

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

@@ -5,13 +5,19 @@
 package at.bitfire.davdroid.ui
 
 import androidx.activity.SystemBarStyle
+import androidx.activity.compose.LocalActivity
 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.WindowInsets
+import androidx.compose.foundation.layout.safeDrawing
+import androidx.compose.foundation.layout.windowInsetsPadding
 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.graphics.toArgb
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalUriHandler
@@ -22,13 +28,14 @@ import at.bitfire.davdroid.ui.composable.SafeAndroidUriHandler
 @Composable
 fun AppTheme(
     darkTheme: Boolean = isSystemInDarkTheme(),
+    windowInsets: WindowInsets = WindowInsets.safeDrawing,
     content: @Composable () -> Unit
 ) {
-    val view = LocalView.current
+    val activity = LocalActivity.current
     SideEffect {
         // If applicable, call Activity.enableEdgeToEdge to enable edge-to-edge layout on Android <15, too.
         // When we have moved everything into one Activity with Compose navigation, we can call it there instead.
-        (view.context as? AppCompatActivity)?.enableEdgeToEdge(
+        (activity as? AppCompatActivity)?.enableEdgeToEdge(
             navigationBarStyle = SystemBarStyle.auto(
                 lightScrim = M3ColorScheme.lightScheme.scrim.toArgb(),
                 darkScrim = M3ColorScheme.darkScheme.scrim.toArgb()
@@ -44,11 +51,15 @@ fun AppTheme(
                 M3ColorScheme.lightScheme
             else
                 M3ColorScheme.darkScheme,
-            content = content
-        )
+        ) {
+            Box(Modifier.windowInsetsPadding(windowInsets)) {
+                content()
+            }
+        }
     }
 
     // Track if the app is in the foreground
+    val view = LocalView.current
     LifecycleResumeEffect(view) {
         ForegroundTracker.onResume()
         onPauseOrDispose {

app/src/main/kotlin/at/bitfire/davdroid/ui/intro/IntroScreen.kt

@@ -109,7 +109,7 @@ fun IntroScreen(
                 }
             }
         },
-        contentWindowInsets = WindowInsets(0.dp)
+        contentWindowInsets = WindowInsets(0)
     ) { paddingValues ->
         Column(modifier = Modifier
             .fillMaxSize()