nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #2632 from vitorpamplona/claude/fix-gesture-nav-spacing-BC4nv

Browse Source 
Fix window insets handling in NestActionBar
This commit is contained in:
Vitor Pamplona
2026-04-28 17:52:24 -04:00
committed by GitHub
parent dcc6a7e07d 045bc36371
commit b81bebf6bb
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nests/room/screen/NestActionBar.kt
+11 -1
View File
@@ -29,11 +29,14 @@ import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.consumeWindowInsets
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.width
import androidx.compose.foundation.layout.windowInsetsPadding
import androidx.compose.material3.AssistChip import androidx.compose.material3.AssistChip
import androidx.compose.material3.AssistChipDefaults import androidx.compose.material3.AssistChipDefaults
import androidx.compose.material3.BottomAppBarDefaults
import androidx.compose.material3.Button import androidx.compose.material3.Button
import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.FilledTonalIconButton import androidx.compose.material3.FilledTonalIconButton
@@ -91,13 +94,20 @@ internal fun NestActionBar(
onShowReactionPicker: () -> Unit, onShowReactionPicker: () -> Unit,
onLeave: () -> Unit, onLeave: () -> Unit,
) { ) {
val insets = BottomAppBarDefaults.windowInsets
Surface( Surface(
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
color = MaterialTheme.colorScheme.surface.copy(alpha = 0.96f), color = MaterialTheme.colorScheme.surface.copy(alpha = 0.96f),
contentColor = MaterialTheme.colorScheme.onSurface, contentColor = MaterialTheme.colorScheme.onSurface,
tonalElevation = 3.dp, tonalElevation = 3.dp,
) { ) {
Column(modifier = Modifier.fillMaxWidth()) { Column(
modifier =
Modifier
.fillMaxWidth()
.windowInsetsPadding(insets)
.consumeWindowInsets(insets),
) {
HorizontalDivider(color = MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.4f)) HorizontalDivider(color = MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.4f))
ActionBarStatusStrip(ui = ui) ActionBarStatusStrip(ui = ui)
Row( Row(