Fix: possible edge to edge deadlock

core/ui/legacy/theme2/common/src/main/res/values/styles.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Widget.App.AppBarLayout" parent="Widget.Material3.AppBarLayout">
+        <item name="android:background">?attr/colorSurfaceContainer</item>
+    </style>
+
+    <style name="Widget.App.Toolbar" parent="Widget.Material3.Toolbar">
+        <item name="android:background">?attr/colorSurfaceContainer</item>
+    </style>
+
+    <style name="Widget.App.ActionMode.PopupMenu" parent="Widget.Material3.PopupMenu">
+        <item name="android:textColor">?attr/colorOnSurface</item>
+        <item name="android:background">?attr/colorSurfaceContainer</item>
+    </style>
+</resources>

feature/account/server/settings/src/debug/kotlin/app/k9mail/feature/account/server/settings/ui/incoming/IncomingServerSettingsContentPreview.kt

@@ -1,6 +1,5 @@
 package app.k9mail.feature.account.server.settings.ui.incoming
 
-import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.runtime.Composable
 import app.k9mail.core.ui.compose.common.annotation.PreviewDevices
 import app.k9mail.core.ui.compose.designsystem.PreviewWithTheme
@@ -14,7 +13,6 @@ internal fun IncomingServerSettingsContentPreview() {
             mode = InteractionMode.Create,
             onEvent = { },
             state = IncomingServerSettingsContract.State(),
-            contentPadding = PaddingValues(),
         )
     }
 }

feature/account/server/settings/src/debug/kotlin/app/k9mail/feature/account/server/settings/ui/outgoing/OutgoingServerSettingsContentPreview.kt

@@ -1,6 +1,5 @@
 package app.k9mail.feature.account.server.settings.ui.outgoing
 
-import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.runtime.Composable
 import app.k9mail.core.ui.compose.common.annotation.PreviewDevices
 import app.k9mail.core.ui.compose.designsystem.PreviewWithTheme
@@ -14,7 +13,6 @@ internal fun OutgoingServerSettingsContentPreview() {
             mode = InteractionMode.Create,
             state = OutgoingServerSettingsContract.State(),
             onEvent = { },
-            contentPadding = PaddingValues(),
         )
     }
 }

feature/account/server/settings/src/main/kotlin/app/k9mail/feature/account/server/settings/ui/incoming/IncomingServerSettingsContent.kt

@@ -1,11 +1,7 @@
 package app.k9mail.feature.account.server.settings.ui.incoming
 
 import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.PaddingValues
 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.lazy.LazyColumn
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -24,22 +20,17 @@ internal fun IncomingServerSettingsContent(
     mode: InteractionMode,
     state: State,
     onEvent: (Event) -> Unit,
-    contentPadding: PaddingValues,
     modifier: Modifier = Modifier,
 ) {
     val resources = LocalResources.current
 
     ResponsiveWidthContainer(
         modifier = Modifier
             .testTagAsResourceId("IncomingServerSettingsContent")
-            .padding(contentPadding)
-            .fillMaxWidth()
             .then(modifier),
     ) { contentPadding ->
         LazyColumn(
-            modifier = Modifier
-                .fillMaxSize()
-                .imePadding(),
+            modifier = Modifier.fillMaxSize(),
             contentPadding = contentPadding,
             horizontalAlignment = Alignment.Start,
             verticalArrangement = Arrangement.spacedBy(MainTheme.spacings.default),

feature/account/server/settings/src/main/kotlin/app/k9mail/feature/account/server/settings/ui/incoming/IncomingServerSettingsScreen.kt

@@ -2,8 +2,11 @@ package app.k9mail.feature.account.server.settings.ui.incoming
 
 import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.consumeWindowInsets
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.navigationBars
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -68,7 +71,11 @@ fun IncomingServerSettingsScreen(
             mode = viewModel.mode,
             onEvent = { dispatch(it) },
             state = state.value,
-            contentPadding = innerPadding,
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(innerPadding)
+                .consumeWindowInsets(innerPadding)
+                .imePadding(),
         )
     }
 }

feature/account/server/settings/src/main/kotlin/app/k9mail/feature/account/server/settings/ui/outgoing/OutgoingServerSettingsContent.kt

@@ -1,11 +1,7 @@
 package app.k9mail.feature.account.server.settings.ui.outgoing
 
 import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.PaddingValues
 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.lazy.LazyColumn
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -24,22 +20,17 @@ internal fun OutgoingServerSettingsContent(
     mode: InteractionMode,
     state: State,
     onEvent: (Event) -> Unit,
-    contentPadding: PaddingValues,
     modifier: Modifier = Modifier,
 ) {
     val resources = LocalResources.current
 
     ResponsiveWidthContainer(
         modifier = Modifier
             .testTagAsResourceId("OutgoingServerSettingsContent")
-            .padding(contentPadding)
-            .fillMaxWidth()
             .then(modifier),
     ) { contentPadding ->
         LazyColumn(
-            modifier = Modifier
-                .fillMaxSize()
-                .imePadding(),
+            modifier = Modifier.fillMaxSize(),
             contentPadding = contentPadding,
             horizontalAlignment = Alignment.Start,
             verticalArrangement = Arrangement.spacedBy(MainTheme.spacings.default),

feature/account/server/settings/src/main/kotlin/app/k9mail/feature/account/server/settings/ui/outgoing/OutgoingServerSettingsScreen.kt

@@ -2,8 +2,11 @@ package app.k9mail.feature.account.server.settings.ui.outgoing
 
 import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.consumeWindowInsets
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.navigationBars
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -68,7 +71,11 @@ fun OutgoingServerSettingsScreen(
             mode = viewModel.mode,
             state = state.value,
             onEvent = { dispatch(it) },
-            contentPadding = innerPadding,
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(innerPadding)
+                .consumeWindowInsets(innerPadding)
+                .imePadding(),
         )
     }
 }

feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/ui/specialfolders/SpecialFoldersScreen.kt

@@ -1,6 +1,10 @@
 package app.k9mail.feature.account.setup.ui.specialfolders
 
 import androidx.activity.compose.BackHandler
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.imePadding
+import androidx.compose.foundation.layout.navigationBars
+import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Modifier
@@ -44,9 +48,10 @@ fun SpecialFoldersScreen(
                 state = WizardNavigationBarState(
                     showNext = state.value.isManualSetup && state.value.isLoading.not(),
                 ),
+                modifier = Modifier.imePadding(),
             )
         },
-        modifier = modifier,
+        modifier = modifier.windowInsetsPadding(WindowInsets.navigationBars),
     ) { innerPadding ->
         SpecialFoldersContent(
             state = state.value,

feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/DropDownDrawer.kt

@@ -3,6 +3,7 @@ package net.thunderbird.feature.navigation.drawer.dropdown
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.ui.platform.ComposeView
 import androidx.core.view.GravityCompat
+import androidx.core.view.ViewCompat
 import androidx.drawerlayout.widget.DrawerLayout
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -46,6 +47,12 @@ class DropDownDrawer(
     init {
         drawer.addDrawerListener(createDrawerListener())
 
+        // Make insets available to the drawer's Compose content
+        ViewCompat.setOnApplyWindowInsetsListener(drawer) { _, insets ->
+            drawerContent.dispatchApplyWindowInsets(insets.toWindowInsets())
+            insets
+        }
+
         drawerContent.setContent {
             themeProvider.WithTheme {
                 val state = drawerState.collectAsStateWithLifecycle()

feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/ui/DrawerContent.kt

@@ -6,16 +6,18 @@ import androidx.compose.animation.slideInVertically
 import androidx.compose.animation.slideOutVertically
 import androidx.compose.animation.togetherWith
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.safeDrawing
 import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.IntOffset
 import app.k9mail.core.ui.compose.designsystem.atom.DividerHorizontal
 import app.k9mail.core.ui.compose.designsystem.atom.Surface
 import app.k9mail.core.ui.compose.theme2.MainTheme
-import net.thunderbird.core.ui.compose.common.modifier.safeDrawingPaddingCompat
 import net.thunderbird.core.ui.compose.common.modifier.testTagAsResourceId
 import net.thunderbird.feature.navigation.drawer.dropdown.domain.entity.DisplayAccount
 import net.thunderbird.feature.navigation.drawer.dropdown.domain.entity.UnifiedDisplayAccount
@@ -49,7 +51,7 @@ internal fun DrawerContent(
         val selectedAccount = state.accounts.firstOrNull { it.id == state.selectedAccountId }
 
         Column(
-            modifier = Modifier.safeDrawingPaddingCompat(),
+            modifier = Modifier.windowInsetsPadding(WindowInsets.safeDrawing),
         ) {
             selectedAccount?.let {
                 AccountView(

feature/onboarding/permissions/src/main/kotlin/app/k9mail/feature/onboarding/permissions/ui/PermissionsContent.kt

@@ -7,10 +7,13 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.runtime.Composable
@@ -41,13 +44,15 @@ internal fun PermissionsContent(
     state: State,
     onEvent: (Event) -> Unit,
     brandName: String,
+    modifier: Modifier = Modifier,
 ) {
     val scrollState = rememberScrollState()
 
     Scaffold(
         bottomBar = {
             BottomBar(state, onEvent, scrollState)
         },
+        modifier = modifier.windowInsetsPadding(WindowInsets.navigationBars),
     ) { innerPadding ->
         ResponsiveWidthContainer(
             modifier = Modifier

feature/onboarding/permissions/src/main/kotlin/app/k9mail/feature/onboarding/permissions/ui/PermissionsScreen.kt

@@ -38,7 +38,7 @@ fun PermissionsScreen(
     }
 
     BackHandler {
-        // no back navigation
+        dispatch(Event.NextClicked)
     }
 
     LaunchedEffect(key1 = Unit) {