fix: padding above keyboard (2) (#804)

This commit is contained in:
Diego Beraldin 2024-05-07 21:29:04 +02:00 committed by GitHub
parent 6eac0901b6
commit cf9fc7fada
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 20 additions and 39 deletions

View File

@ -4,7 +4,6 @@ import androidx.compose.foundation.Image
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.consumeWindowInsets
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
@ -100,10 +99,6 @@ class BanUserScreen(
}
Scaffold(
modifier = Modifier
.imePadding()
.navigationBarsPadding(),
contentWindowInsets = WindowInsets(0, 0, 0, 0),
topBar = {
TopAppBar(
scrollBehavior = scrollBehavior,
@ -160,7 +155,9 @@ class BanUserScreen(
Column(
modifier = Modifier
.padding(padding)
.consumeWindowInsets(padding),
.consumeWindowInsets(padding)
.imePadding()
.navigationBarsPadding(),
verticalArrangement = Arrangement.spacedBy(Spacing.s),
horizontalAlignment = Alignment.CenterHorizontally,
) {

View File

@ -4,7 +4,6 @@ import androidx.compose.foundation.Image
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.consumeWindowInsets
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.heightIn
@ -159,10 +158,6 @@ class CreateCommentScreen(
}
Scaffold(
modifier = Modifier
.imePadding()
.navigationBarsPadding(),
contentWindowInsets = WindowInsets(0, 0, 0, 0),
topBar = {
TopAppBar(
scrollBehavior = scrollBehavior,
@ -348,7 +343,9 @@ class CreateCommentScreen(
LazyColumn(
modifier = Modifier
.padding(padding)
.consumeWindowInsets(padding),
.consumeWindowInsets(padding)
.imePadding()
.navigationBarsPadding(),
) {
item {
val originalComment = uiState.originalComment

View File

@ -6,8 +6,6 @@ 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.consumeWindowInsets
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.imePadding
@ -232,10 +230,6 @@ class CreatePostScreen(
}
Scaffold(
modifier = Modifier
.imePadding()
.navigationBarsPadding(),
contentWindowInsets = WindowInsets(0, 0, 0, 0),
topBar = {
TopAppBar(
scrollBehavior = scrollBehavior,
@ -290,8 +284,8 @@ class CreatePostScreen(
)
},
)
}, snackbarHost =
{
},
snackbarHost = {
SnackbarHost(snackbarHostState) { data ->
Snackbar(
containerColor = MaterialTheme.colorScheme.surfaceVariant,
@ -299,12 +293,14 @@ class CreatePostScreen(
snackbarData = data,
)
}
})
},
)
{ padding ->
Column(
modifier = Modifier
.padding(padding)
.consumeWindowInsets(padding)
.imePadding()
.navigationBarsPadding()
.verticalScroll(rememberScrollState()),
) {
// community

View File

@ -4,7 +4,6 @@ import androidx.compose.foundation.Image
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.consumeWindowInsets
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
@ -91,10 +90,6 @@ class CreateReportScreen(
}
Scaffold(
modifier = Modifier
.imePadding()
.navigationBarsPadding(),
contentWindowInsets = WindowInsets(0, 0, 0, 0),
topBar = {
TopAppBar(
scrollBehavior = scrollBehavior,
@ -150,7 +145,9 @@ class CreateReportScreen(
Column(
modifier = Modifier
.padding(padding)
.consumeWindowInsets(padding),
.consumeWindowInsets(padding)
.imePadding()
.navigationBarsPadding(),
verticalArrangement = Arrangement.spacedBy(Spacing.s),
horizontalAlignment = Alignment.CenterHorizontally,
) {

View File

@ -5,7 +5,6 @@ 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.consumeWindowInsets
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
@ -112,10 +111,6 @@ class LoginBottomSheet : Screen {
}
Scaffold(
modifier = Modifier
.imePadding()
.navigationBarsPadding(),
contentWindowInsets = WindowInsets(0, 0, 0, 0),
topBar = {
TopAppBar(
title = {
@ -176,6 +171,8 @@ class LoginBottomSheet : Screen {
modifier = Modifier
.padding(padding)
.consumeWindowInsets(padding)
.imePadding()
.navigationBarsPadding()
.fillMaxWidth()
.verticalScroll(rememberScrollState()),
horizontalAlignment = Alignment.CenterHorizontally,

View File

@ -4,7 +4,6 @@ import androidx.compose.foundation.Image
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.consumeWindowInsets
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
@ -91,10 +90,6 @@ class RemoveScreen(
}
Scaffold(
modifier = Modifier
.imePadding()
.navigationBarsPadding(),
contentWindowInsets = WindowInsets(0, 0, 0, 0),
topBar = {
TopAppBar(
scrollBehavior = scrollBehavior,
@ -146,7 +141,9 @@ class RemoveScreen(
Column(
modifier = Modifier
.padding(padding)
.consumeWindowInsets(padding),
.consumeWindowInsets(padding)
.imePadding()
.navigationBarsPadding(),
verticalArrangement = Arrangement.spacedBy(Spacing.s),
horizontalAlignment = Alignment.CenterHorizontally,
) {