highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-03-26 01:31:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes screen rendering below the 3-button navigation

Browse Source
This commit is contained in:
Vitor Pamplona 2024-07-20 15:02:57 -04:00
parent c128e43fe5
commit 8ed3f84cb7
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppBottomBar.kt
View File

@ -27,6 +27,7 @@ import androidx.compose.foundation.Canvas
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.RowScope
import androidx.compose.foundation.layout.consumeWindowInsets
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.windowInsetsPadding
@ -135,6 +136,7 @@ private fun RenderBottomMenu(
Modifier
.fillMaxWidth()
.windowInsetsPadding(windowInsets)
.consumeWindowInsets(windowInsets)
.height(50.dp),
) {
HorizontalDivider(

11
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/MainScreen.kt
View File

@ -34,10 +34,12 @@ import androidx.compose.animation.slideOutVertically
import androidx.compose.animation.togetherWith
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.consumeWindowInsets
import androidx.compose.foundation.layout.defaultMinSize
import androidx.compose.foundation.layout.imePadding
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.statusBarsPadding
import androidx.compose.foundation.layout.systemBarsPadding
import androidx.compose.material3.DrawerValue
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.ModalBottomSheet
@ -486,7 +488,14 @@ private fun MainScaffold(
}
},
) {
Column(modifier = Modifier.padding(it).imePadding()) {
Column(
modifier =
Modifier
.padding(it)
.consumeWindowInsets(it)
.systemBarsPadding()
.imePadding(),
) {
AppNavigation(
homeFeedViewModel = homeFeedViewModel,
repliesFeedViewModel = repliesFeedViewModel,