Fix AppScaffold content window insets.

jeffrey-signal · jeffrey-signal · commit f932ea9f1f5f · 2025-10-29T13:21:07.000-04:00
diff --git a/app/src/main/java/org/thoughtcrime/securesms/window/AppScaffold.kt b/app/src/main/java/org/thoughtcrime/securesms/window/AppScaffold.kt
@@ -15,6 +15,7 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.displayCutoutPadding
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
@@ -343,7 +344,9 @@ fun AppScaffold(
       },
       paneExpansionDragHandle = paneExpansionDragHandle,
       paneExpansionState = paneExpansionState,
-      modifier = Modifier.padding(paddingValues)
+      modifier = Modifier
+        .padding(paddingValues)
+        .consumeWindowInsets(contentWindowInsets)
     )
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ import androidx.compose.foundation.layout.Box`
`15`	`15`	`import androidx.compose.foundation.layout.Column`
`16`	`16`	`import androidx.compose.foundation.layout.Row`
`17`	`17`	`import androidx.compose.foundation.layout.WindowInsets`
	`18`	`+import androidx.compose.foundation.layout.consumeWindowInsets`
`18`	`19`	`import androidx.compose.foundation.layout.displayCutoutPadding`
`19`	`20`	`import androidx.compose.foundation.layout.fillMaxSize`
`20`	`21`	`import androidx.compose.foundation.layout.padding`
`@@ -343,7 +344,9 @@ fun AppScaffold(`
`343`	`344`	`},`
`344`	`345`	`paneExpansionDragHandle = paneExpansionDragHandle,`
`345`	`346`	`paneExpansionState = paneExpansionState,`
`346`		`- modifier = Modifier.padding(paddingValues)`
	`347`	`+ modifier = Modifier`
	`348`	`+ .padding(paddingValues)`
	`349`	`+ .consumeWindowInsets(contentWindowInsets)`
`347`	`350`	`)`
`348`	`351`	`}`
`349`	`352`	`}`