Merge pull request #26 from garfiec/fix/ios-chat-input-home-indicator
fix(chat): apply safe area padding to iOS chat input
This commit is contained in:
commit
5b8282af5e
2 changed files with 2 additions and 4 deletions
|
|
@ -13,7 +13,6 @@ import androidx.compose.foundation.layout.Column
|
||||||
import androidx.compose.foundation.layout.Spacer
|
import androidx.compose.foundation.layout.Spacer
|
||||||
import androidx.compose.foundation.layout.fillMaxWidth
|
import androidx.compose.foundation.layout.fillMaxWidth
|
||||||
import androidx.compose.foundation.layout.heightIn
|
import androidx.compose.foundation.layout.heightIn
|
||||||
import androidx.compose.foundation.layout.navigationBarsPadding
|
|
||||||
import androidx.compose.foundation.layout.offset
|
import androidx.compose.foundation.layout.offset
|
||||||
import androidx.compose.foundation.layout.size
|
import androidx.compose.foundation.layout.size
|
||||||
import androidx.compose.foundation.layout.width
|
import androidx.compose.foundation.layout.width
|
||||||
|
|
@ -227,7 +226,6 @@ fun ChatInput(
|
||||||
onStop = onStop,
|
onStop = onStop,
|
||||||
onRemoveFile = onRemoveFile,
|
onRemoveFile = onRemoveFile,
|
||||||
modifier = modifier,
|
modifier = modifier,
|
||||||
columnModifier = Modifier.navigationBarsPadding(),
|
|
||||||
leadingButtons = {
|
leadingButtons = {
|
||||||
// "+" button to open tools bottom sheet
|
// "+" button to open tools bottom sheet
|
||||||
Box {
|
Box {
|
||||||
|
|
|
||||||
|
|
@ -18,6 +18,7 @@ import androidx.compose.foundation.layout.Column
|
||||||
import androidx.compose.foundation.layout.Row
|
import androidx.compose.foundation.layout.Row
|
||||||
import androidx.compose.foundation.layout.RowScope
|
import androidx.compose.foundation.layout.RowScope
|
||||||
import androidx.compose.foundation.layout.fillMaxWidth
|
import androidx.compose.foundation.layout.fillMaxWidth
|
||||||
|
import androidx.compose.foundation.layout.navigationBarsPadding
|
||||||
import androidx.compose.foundation.layout.padding
|
import androidx.compose.foundation.layout.padding
|
||||||
import androidx.compose.foundation.layout.size
|
import androidx.compose.foundation.layout.size
|
||||||
import androidx.compose.foundation.shape.CircleShape
|
import androidx.compose.foundation.shape.CircleShape
|
||||||
|
|
@ -79,7 +80,6 @@ fun CommonChatInputCore(
|
||||||
onStop: () -> Unit,
|
onStop: () -> Unit,
|
||||||
onRemoveFile: (AttachedFile) -> Unit,
|
onRemoveFile: (AttachedFile) -> Unit,
|
||||||
modifier: Modifier = Modifier,
|
modifier: Modifier = Modifier,
|
||||||
columnModifier: Modifier = Modifier,
|
|
||||||
leadingButtons: @Composable RowScope.() -> Unit = {},
|
leadingButtons: @Composable RowScope.() -> Unit = {},
|
||||||
textFieldContent: @Composable RowScope.() -> Unit,
|
textFieldContent: @Composable RowScope.() -> Unit,
|
||||||
trailingSpacer: @Composable RowScope.() -> Unit = {},
|
trailingSpacer: @Composable RowScope.() -> Unit = {},
|
||||||
|
|
@ -102,7 +102,7 @@ fun CommonChatInputCore(
|
||||||
Column(
|
Column(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.fillMaxWidth()
|
.fillMaxWidth()
|
||||||
.then(columnModifier)
|
.navigationBarsPadding()
|
||||||
.padding(horizontal = 12.dp, vertical = 8.dp),
|
.padding(horizontal = 12.dp, vertical = 8.dp),
|
||||||
) {
|
) {
|
||||||
AttachmentChipsRow(
|
AttachmentChipsRow(
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue