fix: add IME padding (#401)

2025-02-08 18:58:42 +01:00 · 2023-12-30 09:40:08 +01:00 · 2023-12-30 09:40:08 +01:00 · d28f843a51
commit d28f843a51
parent 8ff6dfca84
7 changed files with 73 additions and 57 deletions
--- a/unit/ban/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/ban/BanUserScreen.kt
+++ b/unit/ban/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/ban/BanUserScreen.kt
@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.icons.Icons
@ -85,6 +86,7 @@ class BanUserScreen(
        }

        Box(
+            modifier = Modifier.imePadding(),
            contentAlignment = Alignment.BottomCenter,
        ) {
            Column(
--- a/unit/chat/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/chat/InboxChatScreen.kt
+++ b/unit/chat/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/chat/InboxChatScreen.kt
@ -9,6 +9,7 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
@ -111,7 +112,9 @@ class InboxChatScreen(
        }

        Scaffold(
-            modifier = Modifier.background(MaterialTheme.colorScheme.background)
+            modifier = Modifier
+                .imePadding()
+                .background(MaterialTheme.colorScheme.background)
                .padding(Spacing.xs),
            topBar = {
                TopAppBar(
--- a/unit/createcomment/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/createcomment/CreateCommentScreen.kt
+++ b/unit/createcomment/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/createcomment/CreateCommentScreen.kt
@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.rememberScrollState
@ -158,6 +159,7 @@ class CreateCommentScreen(
        }

        Scaffold(
+            modifier = Modifier.imePadding(),
            topBar = {
                TopAppBar(
                    scrollBehavior = scrollBehavior,
--- a/unit/createpost/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/createpost/CreatePostScreen.kt
+++ b/unit/createpost/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/createpost/CreatePostScreen.kt
@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.KeyboardActions
@ -201,65 +202,67 @@ class CreatePostScreen(
            }.launchIn(this)
        }

-        Scaffold(topBar = {
-            TopAppBar(
-                scrollBehavior = scrollBehavior,
-                navigationIcon = {
-                    Image(
-                        modifier = Modifier.padding(start = Spacing.s).onClick(
-                            onClick = rememberCallback {
-                                navigationCoordinator.hideBottomSheet()
-                            },
-                        ),
-                        imageVector = Icons.Default.Close,
-                        contentDescription = null,
-                        colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.onBackground),
-                    )
-                },
-                title = {
-                    Column(
-                        modifier = Modifier.fillMaxWidth().padding(
-                            top = Spacing.s,
-                            start = Spacing.l,
-                        ),
-                        verticalArrangement = Arrangement.spacedBy(Spacing.s),
-                        horizontalAlignment = Alignment.CenterHorizontally
-                    ) {
-                        BottomSheetHandle()
-                        Text(
-                            text = when {
-                                editedPost != null -> stringResource(MR.strings.edit_post_title)
-
-                                else -> stringResource(MR.strings.create_post_title)
-                            },
-                            style = MaterialTheme.typography.titleLarge,
-                            color = MaterialTheme.colorScheme.onBackground,
+        Scaffold(
+            modifier = Modifier.imePadding(),
+            topBar = {
+                TopAppBar(
+                    scrollBehavior = scrollBehavior,
+                    navigationIcon = {
+                        Image(
+                            modifier = Modifier.padding(start = Spacing.s).onClick(
+                                onClick = rememberCallback {
+                                    navigationCoordinator.hideBottomSheet()
+                                },
+                            ),
+                            imageVector = Icons.Default.Close,
+                            contentDescription = null,
+                            colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.onBackground),
                        )
-                    }
-                },
-                actions = {
-                    IconButton(
-                        content = {
-                            Icon(
-                                imageVector = Icons.Default.Send,
-                                contentDescription = null,
+                    },
+                    title = {
+                        Column(
+                            modifier = Modifier.fillMaxWidth().padding(
+                                top = Spacing.s,
+                                start = Spacing.l,
+                            ),
+                            verticalArrangement = Arrangement.spacedBy(Spacing.s),
+                            horizontalAlignment = Alignment.CenterHorizontally
+                        ) {
+                            BottomSheetHandle()
+                            Text(
+                                text = when {
+                                    editedPost != null -> stringResource(MR.strings.edit_post_title)
+
+                                    else -> stringResource(MR.strings.create_post_title)
+                                },
+                                style = MaterialTheme.typography.titleLarge,
+                                color = MaterialTheme.colorScheme.onBackground,
                            )
-                        },
-                        onClick = rememberCallback(model) {
-                            model.reduce(CreatePostMviModel.Intent.Send(bodyTextFieldValue.text))
-                        },
-                    )
-                },
-            )
-        }, snackbarHost = {
-            SnackbarHost(snackbarHostState) { data ->
-                Snackbar(
-                    containerColor = MaterialTheme.colorScheme.surfaceVariant,
-                    contentColor = MaterialTheme.colorScheme.onSurfaceVariant,
-                    snackbarData = data,
+                        }
+                    },
+                    actions = {
+                        IconButton(
+                            content = {
+                                Icon(
+                                    imageVector = Icons.Default.Send,
+                                    contentDescription = null,
+                                )
+                            },
+                            onClick = rememberCallback(model) {
+                                model.reduce(CreatePostMviModel.Intent.Send(bodyTextFieldValue.text))
+                            },
+                        )
+                    },
                )
-            }
-        }) { padding ->
+            }, snackbarHost = {
+                SnackbarHost(snackbarHostState) { data ->
+                    Snackbar(
+                        containerColor = MaterialTheme.colorScheme.surfaceVariant,
+                        contentColor = MaterialTheme.colorScheme.onSurfaceVariant,
+                        snackbarData = data,
+                    )
+                }
+            }) { padding ->
            Column(
                modifier = Modifier.padding(padding).verticalScroll(rememberScrollState()),
            ) {
--- a/unit/createreport/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/createreport/CreateReportScreen.kt
+++ b/unit/createreport/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/createreport/CreateReportScreen.kt
@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.icons.Icons
@ -79,6 +80,7 @@ class CreateReportScreen(
        }

        Box(
+            modifier = Modifier.imePadding(),
            contentAlignment = Alignment.BottomCenter,
        ) {
            Column(
--- a/unit/login/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/login/LoginBottomSheet.kt
+++ b/unit/login/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/login/LoginBottomSheet.kt
@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.text.KeyboardActions
@ -98,6 +99,7 @@ class LoginBottomSheet : Screen {
        val settingsRepository = remember { getSettingsRepository() }

        Box(
+            modifier = Modifier.imePadding(),
            contentAlignment = Alignment.BottomCenter,
        ) {
            Column(
--- a/unit/remove/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/remove/RemoveScreen.kt
+++ b/unit/remove/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/remove/RemoveScreen.kt
@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.icons.Icons
@ -79,6 +80,7 @@ class RemoveScreen(
        }

        Box(
+            modifier = Modifier.imePadding(),
            contentAlignment = Alignment.BottomCenter,
        ) {
            Column(