From 37544aa8b7e59ec0298b9b1091095fe6f04bbf9d Mon Sep 17 00:00:00 2001 From: jeffrey-signal Date: Mon, 27 Oct 2025 17:59:05 -0400 Subject: [PATCH] Enable edge to edge for new conversation and create group screens. --- .../java/org/thoughtcrime/securesms/MainActivity.kt | 2 -- .../securesms/conversation/NewConversationActivity.kt | 2 ++ .../groups/ui/creategroup/CreateGroupActivityV2.kt | 2 ++ .../org/thoughtcrime/securesms/window/AppScaffold.kt | 11 +++-------- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt index 0900e95a48..72ee0da2af 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt @@ -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( diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/NewConversationActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/NewConversationActivity.kt index 4d0fbebd32..7fe66f3136 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/NewConversationActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/NewConversationActivity.kt @@ -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 diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/CreateGroupActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/CreateGroupActivityV2.kt index 02d54e7ae6..f805a6224c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/CreateGroupActivityV2.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/CreateGroupActivityV2.kt @@ -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 diff --git a/app/src/main/java/org/thoughtcrime/securesms/window/AppScaffold.kt b/app/src/main/java/org/thoughtcrime/securesms/window/AppScaffold.kt index 002e6ee941..a4cf9c466e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/window/AppScaffold.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/window/AppScaffold.kt @@ -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 ->