Enable edge to edge for new conversation and create group screens.

This commit is contained in:
jeffrey-signal
2025-10-27 17:59:05 -04:00
committed by GitHub
parent 963a72a660
commit 37544aa8b7
4 changed files with 7 additions and 10 deletions

View File

@@ -30,7 +30,6 @@ import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.BoxWithConstraints
import androidx.compose.foundation.layout.BoxWithConstraintsScope
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.displayCutoutPadding
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
@@ -474,7 +473,6 @@ class MainActivity : PassphraseRequiredActivity(), VoiceNoteMediaControllerOwner
navigator = wrappedNavigator,
modifier = chatNavGraphState.writeContentToGraphicsLayer(),
paneExpansionState = paneExpansionState,
contentWindowInsets = WindowInsets(),
bottomNavContent = {
if (isNavigationBarVisible) {
Column(

View File

@@ -11,6 +11,7 @@ import android.content.Intent
import android.os.Bundle
import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.compose.setContent
import androidx.activity.enableEdgeToEdge
import androidx.activity.result.ActivityResultLauncher
import androidx.activity.result.contract.ActivityResultContracts
import androidx.compose.foundation.layout.Box
@@ -81,6 +82,7 @@ class NewConversationActivity : PassphraseRequiredActivity() {
}
override fun onCreate(savedInstanceState: Bundle?, ready: Boolean) {
enableEdgeToEdge()
super.onCreate(savedInstanceState, ready)
val navigateBack = onBackPressedDispatcher::onBackPressed

View File

@@ -10,6 +10,7 @@ import android.content.Intent
import android.os.Bundle
import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.compose.setContent
import androidx.activity.enableEdgeToEdge
import androidx.activity.result.ActivityResultLauncher
import androidx.compose.animation.AnimatedContent
import androidx.compose.animation.ContentTransform
@@ -76,6 +77,7 @@ class CreateGroupActivityV2 : PassphraseRequiredActivity() {
}
override fun onCreate(savedInstanceState: Bundle?, ready: Boolean) {
enableEdgeToEdge()
super.onCreate(savedInstanceState, ready)
val navigateBack = onBackPressedDispatcher::onBackPressed

View File

@@ -22,7 +22,6 @@ import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.LocalMinimumInteractiveComponentSize
import androidx.compose.material3.Scaffold
import androidx.compose.material3.ScaffoldDefaults
import androidx.compose.material3.Text
import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo
@@ -230,7 +229,6 @@ fun AppScaffold(
paneExpansionState: PaneExpansionState = rememberPaneExpansionState(),
paneExpansionDragHandle: (@Composable ThreePaneScaffoldScope.(PaneExpansionState) -> Unit)? = null,
snackbarHost: @Composable () -> Unit = {},
contentWindowInsets: WindowInsets = ScaffoldDefaults.contentWindowInsets,
animatorFactory: AppScaffoldAnimationStateFactory = AppScaffoldAnimationStateFactory.Default
) {
val isForcedCompact = WindowSizeClass.checkForcedCompact()
@@ -243,7 +241,6 @@ fun AppScaffold(
navRailContent = navRailContent,
bottomNavContent = bottomNavContent,
windowSizeClass = windowSizeClass,
contentWindowInsets = contentWindowInsets,
modifier = modifier
)
@@ -255,7 +252,7 @@ fun AppScaffold(
Scaffold(
containerColor = Color.Transparent,
contentWindowInsets = contentWindowInsets,
contentWindowInsets = WindowInsets(),
topBar = topBarContent,
snackbarHost = snackbarHost,
modifier = modifier
@@ -299,8 +296,7 @@ fun AppScaffold(
listContent = secondaryContent,
navRailContent = navRailContent,
bottomNavContent = bottomNavContent,
windowSizeClass = windowSizeClass,
contentWindowInsets = contentWindowInsets
windowSizeClass = windowSizeClass
)
}
}
@@ -356,13 +352,12 @@ private fun ListAndNavigation(
bottomNavContent: @Composable () -> Unit,
snackbarHost: @Composable () -> Unit = {},
windowSizeClass: WindowSizeClass,
contentWindowInsets: WindowInsets,
modifier: Modifier = Modifier
) {
Scaffold(
containerColor = Color.Transparent,
topBar = topBarContent,
contentWindowInsets = contentWindowInsets,
contentWindowInsets = WindowInsets(),
snackbarHost = snackbarHost,
modifier = modifier
) { paddingValues ->