mirror of
https://github.com/Helium314/HeliBoard.git
synced 2025-04-19 13:49:13 +00:00
Use setFitsSystemWindows
in all keyboard views.
Fix last item on settings screens.
This commit is contained in:
parent
2cba77cdee
commit
988c99aeae
3 changed files with 34 additions and 26 deletions
|
@ -71,6 +71,7 @@ class ClipboardHistoryView @JvmOverloads constructor(
|
||||||
getEnabledClipboardToolbarKeys(context.prefs())
|
getEnabledClipboardToolbarKeys(context.prefs())
|
||||||
.forEach { toolbarKeys.add(createToolbarKey(context, KeyboardIconsSet.instance, it)) }
|
.forEach { toolbarKeys.add(createToolbarKey(context, KeyboardIconsSet.instance, it)) }
|
||||||
keyboardAttr.recycle()
|
keyboardAttr.recycle()
|
||||||
|
fitsSystemWindows = true
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
|
override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
|
||||||
|
|
|
@ -105,6 +105,7 @@ public final class EmojiPalettesView extends LinearLayout
|
||||||
R.styleable.EmojiPalettesView_categoryPageIndicatorColor, 0);
|
R.styleable.EmojiPalettesView_categoryPageIndicatorColor, 0);
|
||||||
emojiPalettesViewAttr.recycle();
|
emojiPalettesViewAttr.recycle();
|
||||||
mEmojiLayoutManager = new LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false);
|
mEmojiLayoutManager = new LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false);
|
||||||
|
setFitsSystemWindows(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -20,6 +20,7 @@ import androidx.compose.material3.Icon
|
||||||
import androidx.compose.material3.IconButton
|
import androidx.compose.material3.IconButton
|
||||||
import androidx.compose.material3.LocalTextStyle
|
import androidx.compose.material3.LocalTextStyle
|
||||||
import androidx.compose.material3.MaterialTheme
|
import androidx.compose.material3.MaterialTheme
|
||||||
|
import androidx.compose.material3.Scaffold
|
||||||
import androidx.compose.material3.Surface
|
import androidx.compose.material3.Surface
|
||||||
import androidx.compose.material3.Text
|
import androidx.compose.material3.Text
|
||||||
import androidx.compose.material3.TextField
|
import androidx.compose.material3.TextField
|
||||||
|
@ -58,7 +59,11 @@ fun SearchSettingsScreen(
|
||||||
content = {
|
content = {
|
||||||
if (content != null) content()
|
if (content != null) content()
|
||||||
else {
|
else {
|
||||||
Column(Modifier.verticalScroll(rememberScrollState())) {
|
Scaffold { innerPadding ->
|
||||||
|
Column(
|
||||||
|
Modifier.verticalScroll(rememberScrollState())
|
||||||
|
.then(Modifier.padding(bottom = innerPadding.calculateBottomPadding()))
|
||||||
|
) {
|
||||||
settings.forEach {
|
settings.forEach {
|
||||||
if (it is Int) {
|
if (it is Int) {
|
||||||
PreferenceCategory(stringResource(it))
|
PreferenceCategory(stringResource(it))
|
||||||
|
@ -89,6 +94,7 @@ fun SearchSettingsScreen(
|
||||||
// }
|
// }
|
||||||
// }
|
// }
|
||||||
}
|
}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
filteredItems = { SettingsActivity.settingsContainer.filter(it) },
|
filteredItems = { SettingsActivity.settingsContainer.filter(it) },
|
||||||
itemContent = { it.Preference() }
|
itemContent = { it.Preference() }
|
||||||
|
|
Loading…
Add table
Reference in a new issue