Fixed e2e issues

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

Author: ArnyminerZ

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

@@ -13,8 +13,11 @@ import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.asPaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
@@ -54,6 +57,7 @@ import at.bitfire.davdroid.Constants
 import at.bitfire.davdroid.Constants.withStatParams
 import at.bitfire.davdroid.R
 import at.bitfire.davdroid.ui.composable.PixelBoxes
+import at.bitfire.davdroid.ui.edgetoedge.NavigationBarSpacer
 import com.mikepenz.aboutlibraries.Libs
 import com.mikepenz.aboutlibraries.ui.compose.m3.LibrariesContainer
 import com.mikepenz.aboutlibraries.util.withJson
@@ -68,10 +72,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
@@ -98,6 +98,7 @@ class AboutActivity: AppCompatActivity() {
                 val uriHandler = LocalUriHandler.current
 
                 Scaffold(
+                    contentWindowInsets = WindowInsets(0.dp),
                     topBar = {
                         TopAppBar(
                             navigationIcon = {
@@ -172,14 +173,17 @@ class AboutActivity: AppCompatActivity() {
                                     TranslatorsGallery(translations.value)
                                 }
 
-                                2 -> LibrariesContainer(Modifier.fillMaxSize(),
+                                2 -> LibrariesContainer(
+                                    modifier = Modifier.fillMaxSize(),
+                                    contentPadding = WindowInsets.navigationBars.asPaddingValues(),
                                     itemContentPadding = PaddingValues(horizontal = 8.dp, vertical = 8.dp),
                                     itemSpacing = 8.dp,
                                     librariesBlock = { ctx ->
                                         Libs.Builder()
                                             .withJson(ctx, R.raw.aboutlibraries)
                                             .build()
-                                    })
+                                    }
+                                )
                             }
                         }
                     }
@@ -310,6 +314,8 @@ fun AboutApp(licenseInfoProvider: AboutActivity.AppLicenseInfoProvider? = null)
         )
 
         licenseInfoProvider?.LicenseInfo()
+
+        NavigationBarSpacer()
     }
 }
 
@@ -330,7 +336,7 @@ fun TranslatorsGallery(
     translations: List<AboutActivity.Model.Translation>
 ) {
     val collator = Collator.getInstance()
-    LazyColumn(Modifier.padding(8.dp)) {
+    LazyColumn(Modifier.padding(horizontal = 8.dp)) {
         items(translations) { translation ->
             Text(
                 translation.language,
@@ -345,6 +351,9 @@ fun TranslatorsGallery(
                 modifier = Modifier.padding(bottom = 16.dp)
             )
         }
+        item {
+            NavigationBarSpacer()
+        }
     }
 }
 

app/src/main/kotlin/at/bitfire/davdroid/ui/account/AccountSettingsScreen.kt

@@ -10,6 +10,7 @@ import android.security.KeyChain
 import androidx.annotation.StringRes
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
@@ -63,6 +64,7 @@ import at.bitfire.davdroid.ui.composable.MultipleChoiceInputDialog
 import at.bitfire.davdroid.ui.composable.Setting
 import at.bitfire.davdroid.ui.composable.SettingsHeader
 import at.bitfire.davdroid.ui.composable.SwitchSetting
+import at.bitfire.davdroid.ui.edgetoedge.NavigationBarSpacer
 import at.bitfire.davdroid.util.PermissionUtils
 import at.bitfire.vcard4android.GroupMethod
 import kotlinx.coroutines.launch
@@ -173,6 +175,7 @@ fun AccountSettingsScreen(
     val snackbarHostState = remember { SnackbarHostState() }
 
     Scaffold(
+        contentWindowInsets = WindowInsets(0),
         topBar = {
             TopAppBar(
                 navigationIcon = {
@@ -336,6 +339,8 @@ fun AccountSettings_FromModel(
             contactGroupMethod = contactGroupMethod,
             onUpdateContactGroupMethod = onUpdateContactGroupMethod
         )
+
+        NavigationBarSpacer()
     }
 }
 

app/src/main/kotlin/at/bitfire/davdroid/ui/edgetoedge/EdgeToEdgeUtils.kt

@@ -5,7 +5,10 @@
 package at.bitfire.davdroid.ui.edgetoedge
 
 import android.content.res.Configuration.ORIENTATION_LANDSCAPE
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalConfiguration
 
 @Composable
@@ -40,3 +43,8 @@ fun <T> withOrientation(landscape: T, portrait: T): T {
         portrait
     }
 }
+
+@Composable
+fun NavigationBarSpacer() {
+    Spacer(Modifier.navigationBarsPadding())
+}

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

@@ -22,6 +22,7 @@ import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.safeDrawing
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.statusBars
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.pager.HorizontalPager
@@ -56,6 +57,7 @@ import androidx.compose.ui.unit.dp
 import at.bitfire.davdroid.R
 import at.bitfire.davdroid.ui.AppTheme
 import at.bitfire.davdroid.ui.M3ColorScheme
+import at.bitfire.davdroid.ui.edgetoedge.withOrientation
 import kotlinx.coroutines.launch
 
 @Composable
@@ -109,7 +111,10 @@ fun IntroScreen(
                 }
             }
         },
-        contentWindowInsets = WindowInsets(0.dp)
+        contentWindowInsets = withOrientation(
+            landscape = WindowInsets(0.dp),
+            portrait = WindowInsets.statusBars,
+        )
     ) { paddingValues ->
         Column(modifier = Modifier
             .fillMaxSize()

app/src/main/kotlin/at/bitfire/davdroid/ui/webdav/AddWebdavMountScreen.kt

@@ -7,6 +7,7 @@ package at.bitfire.davdroid.ui.webdav
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.KeyboardActions
@@ -139,6 +140,7 @@ fun AddWebDavMountScreen(
         Column(
             modifier = Modifier
                 .fillMaxSize()
+                .imePadding()
                 .padding(paddingValues)
                 .verticalScroll(rememberScrollState())
         ) {