@@ -7,13 +7,20 @@ import androidx.compose.foundation.layout.Arrangement
77import androidx.compose.foundation.layout.Box
88import androidx.compose.foundation.layout.Column
99import androidx.compose.foundation.layout.Row
10+ import androidx.compose.foundation.layout.Spacer
11+ import androidx.compose.foundation.layout.WindowInsets
12+ import androidx.compose.foundation.layout.fillMaxSize
1013import androidx.compose.foundation.layout.fillMaxWidth
1114import androidx.compose.foundation.layout.height
1215import androidx.compose.foundation.layout.heightIn
16+ import androidx.compose.foundation.layout.navigationBars
1317import androidx.compose.foundation.layout.padding
18+ import androidx.compose.foundation.layout.statusBarsPadding
19+ import androidx.compose.foundation.layout.windowInsetsBottomHeight
1420import androidx.compose.foundation.rememberScrollState
1521import androidx.compose.foundation.verticalScroll
1622import androidx.compose.material3.HorizontalDivider
23+ import androidx.compose.material3.MaterialTheme
1724import androidx.compose.runtime.Composable
1825import androidx.compose.runtime.getValue
1926import androidx.compose.runtime.mutableIntStateOf
@@ -52,7 +59,6 @@ import to.bitkit.ui.components.settings.SettingsIcon
5259import to.bitkit.ui.navigateTo
5360import to.bitkit.ui.scaffold.AppTopBar
5461import to.bitkit.ui.scaffold.DrawerNavIcon
55- import to.bitkit.ui.scaffold.ScreenColumn
5662import to.bitkit.ui.settingsViewModel
5763import to.bitkit.ui.shared.modifiers.clickableAlpha
5864import to.bitkit.ui.shared.util.shareText
@@ -137,7 +143,12 @@ private fun Content(
137143) {
138144 val appVersion = " ${BuildConfig .VERSION_NAME } (${BuildConfig .VERSION_CODE } )"
139145
140- ScreenColumn {
146+ Column (
147+ modifier = Modifier
148+ .fillMaxSize()
149+ .background(MaterialTheme .colorScheme.background)
150+ .statusBarsPadding()
151+ ) {
141152 AppTopBar (
142153 titleText = stringResource(R .string.settings__support_title),
143154 onBackClick = onBack,
@@ -244,7 +255,7 @@ private fun SupportFooter() {
244255 )
245256 }
246257
247- // Solid orange background for bottom content
258+ // Solid orange background for bottom content (extends behind nav bar)
248259 Column (
249260 modifier = Modifier
250261 .fillMaxWidth()
@@ -268,6 +279,14 @@ private fun SupportFooter() {
268279
269280 VerticalSpacer (32 .dp)
270281 }
282+
283+ // Brand-colored spacer that fills the nav bar inset area
284+ Spacer (
285+ modifier = Modifier
286+ .fillMaxWidth()
287+ .background(Colors .Brand )
288+ .windowInsetsBottomHeight(WindowInsets .navigationBars)
289+ )
271290}
272291
273292@Composable
0 commit comments