From 96fa6f39b09c93a99ef66b8d80cab910e84e5d68 Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Tue, 3 Sep 2024 17:01:26 -0400
Subject: [PATCH] Fixes ime padding issues when using physical keyboards on the
 message screens.

---
 .../amethyst/ui/screen/loggedIn/MainScreen.kt              | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/MainScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/MainScreen.kt
index 154941e93..7a99c6da6 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/MainScreen.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/MainScreen.kt
@@ -39,7 +39,6 @@ import androidx.compose.foundation.layout.defaultMinSize
 import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.statusBarsPadding
-import androidx.compose.foundation.layout.systemBarsPadding
 import androidx.compose.material3.DrawerValue
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.ModalBottomSheet
@@ -313,10 +312,12 @@ private fun MainScaffold(
 
             Modifier
                 .statusBarsPadding()
+                .imePadding()
                 .nestedScroll(nestedScrollConnection)
         } else {
             Modifier
                 .statusBarsPadding()
+                .imePadding()
         }
 
     Scaffold(
@@ -373,9 +374,7 @@ private fun MainScaffold(
             modifier =
                 Modifier
                     .padding(it)
-                    .consumeWindowInsets(it)
-                    .systemBarsPadding()
-                    .imePadding(),
+                    .consumeWindowInsets(it),
         ) {
             AppNavigation(
                 navController = navController,