Merge pull request #2893 from vitorpamplona/claude/add-nav-padding-J2XWn
Fix IME padding in HiddenWordsScreen using WindowInsets
This commit is contained in:
+9
-3
@@ -26,10 +26,14 @@ import androidx.compose.foundation.combinedClickable
|
|||||||
import androidx.compose.foundation.layout.Arrangement
|
import androidx.compose.foundation.layout.Arrangement
|
||||||
import androidx.compose.foundation.layout.Box
|
import androidx.compose.foundation.layout.Box
|
||||||
import androidx.compose.foundation.layout.Row
|
import androidx.compose.foundation.layout.Row
|
||||||
|
import androidx.compose.foundation.layout.WindowInsets
|
||||||
import androidx.compose.foundation.layout.fillMaxSize
|
import androidx.compose.foundation.layout.fillMaxSize
|
||||||
import androidx.compose.foundation.layout.fillMaxWidth
|
import androidx.compose.foundation.layout.fillMaxWidth
|
||||||
import androidx.compose.foundation.layout.imePadding
|
import androidx.compose.foundation.layout.ime
|
||||||
|
import androidx.compose.foundation.layout.navigationBars
|
||||||
import androidx.compose.foundation.layout.padding
|
import androidx.compose.foundation.layout.padding
|
||||||
|
import androidx.compose.foundation.layout.union
|
||||||
|
import androidx.compose.foundation.layout.windowInsetsPadding
|
||||||
import androidx.compose.foundation.lazy.LazyColumn
|
import androidx.compose.foundation.lazy.LazyColumn
|
||||||
import androidx.compose.foundation.lazy.items
|
import androidx.compose.foundation.lazy.items
|
||||||
import androidx.compose.foundation.lazy.rememberLazyListState
|
import androidx.compose.foundation.lazy.rememberLazyListState
|
||||||
@@ -83,7 +87,6 @@ fun HiddenWordsScreen(
|
|||||||
var selected by remember { mutableStateOf(setOf<String>()) }
|
var selected by remember { mutableStateOf(setOf<String>()) }
|
||||||
|
|
||||||
Scaffold(
|
Scaffold(
|
||||||
modifier = Modifier.imePadding(),
|
|
||||||
topBar = {
|
topBar = {
|
||||||
BlockListTopBar(
|
BlockListTopBar(
|
||||||
title = R.string.hidden_words,
|
title = R.string.hidden_words,
|
||||||
@@ -104,7 +107,10 @@ fun HiddenWordsScreen(
|
|||||||
)
|
)
|
||||||
},
|
},
|
||||||
bottomBar = {
|
bottomBar = {
|
||||||
Surface(tonalElevation = 3.dp) {
|
Surface(
|
||||||
|
tonalElevation = 3.dp,
|
||||||
|
modifier = Modifier.windowInsetsPadding(WindowInsets.navigationBars.union(WindowInsets.ime)),
|
||||||
|
) {
|
||||||
AddMuteWordTextField(accountViewModel)
|
AddMuteWordTextField(accountViewModel)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user