Fixed paddings on horizontal mode (#1353)

* Fixed paddings

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

* Added padding to all screens

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

* Fixed edge to edge on accounts screen

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

* Fixed e2e issues

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

* Undo edge-to-edge

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

* Rollback

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

* Fixed paddings

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

* Fixed padding consumption

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

* Got rid of ime padding

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

* Fixed issues with paddings

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

* Fix UI elements partially obscured in landscape mode

---------

Signed-off-by: Arnau Mora <[email protected]>
Co-authored-by: Ricki Hirner <[email protected]>

Author: ArnyminerZ

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

@@ -14,7 +14,6 @@ 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
@@ -82,7 +81,6 @@ abstract class AccountsDrawerHandler {
         Column(modifier = Modifier
             .fillMaxWidth()
             .verticalScroll(rememberScrollState())
-            .navigationBarsPadding()
         ) {
             BrandingHeader()
 

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

@@ -15,7 +15,6 @@ import androidx.compose.foundation.Image
 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.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
@@ -170,9 +169,7 @@ fun AccountsScreen(
         ModalNavigationDrawer(
             drawerState = drawerState,
             drawerContent = {
-                ModalDrawerSheet(
-                    windowInsets = WindowInsets(0.dp)
-                ) {
+                ModalDrawerSheet {
                     accountsDrawerHandler.AccountsDrawer(
                         snackbarHostState = snackbarHostState,
                         onCloseDrawer = {

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()