diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nests/room/screen/NestActionBar.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nests/room/screen/NestActionBar.kt index 8a55b8cae..b73730d92 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nests/room/screen/NestActionBar.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nests/room/screen/NestActionBar.kt @@ -29,14 +29,11 @@ import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer -import androidx.compose.foundation.layout.consumeWindowInsets import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.width -import androidx.compose.foundation.layout.windowInsetsPadding import androidx.compose.material3.AssistChip import androidx.compose.material3.AssistChipDefaults -import androidx.compose.material3.BottomAppBarDefaults import androidx.compose.material3.Button import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.FilledTonalIconButton @@ -94,7 +91,6 @@ internal fun NestActionBar( onShowReactionPicker: () -> Unit, onLeave: () -> Unit, ) { - val insets = BottomAppBarDefaults.windowInsets Surface( modifier = Modifier.fillMaxWidth(), color = MaterialTheme.colorScheme.surface.copy(alpha = 0.96f), @@ -104,9 +100,7 @@ internal fun NestActionBar( Column( modifier = Modifier - .fillMaxWidth() - .windowInsetsPadding(insets) - .consumeWindowInsets(insets), + .fillMaxWidth(), ) { HorizontalDivider(color = MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.4f)) ActionBarStatusStrip(ui = ui) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nests/room/screen/NestFullScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nests/room/screen/NestFullScreen.kt index bb8faae86..06497d5e3 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nests/room/screen/NestFullScreen.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nests/room/screen/NestFullScreen.kt @@ -200,25 +200,6 @@ internal fun NestFullScreen( }, ) }, - bottomBar = { - NestActionBar( - viewModel = viewModel, - ui = ui, - isOnStage = isOnStageMe, - canBroadcast = viewModel.canBroadcast, - speakerPubkeyHex = myPubkey, - handRaised = handRaised, - onHandRaisedChange = onHandRaisedChange, - onShowReactionPicker = { showReactionPicker = true }, - onLeave = { - if (isHost) { - showHostLeaveConfirm = true - } else { - onLeave() - } - }, - ) - }, ) { padding -> Column( modifier = @@ -250,6 +231,23 @@ internal fun NestFullScreen( listenerCount = presences.size, modifier = Modifier.padding(horizontal = 16.dp), ) + NestActionBar( + viewModel = viewModel, + ui = ui, + isOnStage = isOnStageMe, + canBroadcast = viewModel.canBroadcast, + speakerPubkeyHex = myPubkey, + handRaised = handRaised, + onHandRaisedChange = onHandRaisedChange, + onShowReactionPicker = { showReactionPicker = true }, + onLeave = { + if (isHost) { + showHostLeaveConfirm = true + } else { + onLeave() + } + }, + ) NestTabRow( tabs = tabs, selectedTab = effectiveTab,