Skip to content

Commit b11aeba

Browse files
committed
feat: set brand color on nav bar inset area
1 parent 65b376d commit b11aeba

1 file changed

Lines changed: 22 additions & 3 deletions

File tree

app/src/main/java/to/bitkit/ui/settings/support/SupportScreen.kt

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,20 @@ import androidx.compose.foundation.layout.Arrangement
77
import androidx.compose.foundation.layout.Box
88
import androidx.compose.foundation.layout.Column
99
import 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
1013
import androidx.compose.foundation.layout.fillMaxWidth
1114
import androidx.compose.foundation.layout.height
1215
import androidx.compose.foundation.layout.heightIn
16+
import androidx.compose.foundation.layout.navigationBars
1317
import androidx.compose.foundation.layout.padding
18+
import androidx.compose.foundation.layout.statusBarsPadding
19+
import androidx.compose.foundation.layout.windowInsetsBottomHeight
1420
import androidx.compose.foundation.rememberScrollState
1521
import androidx.compose.foundation.verticalScroll
1622
import androidx.compose.material3.HorizontalDivider
23+
import androidx.compose.material3.MaterialTheme
1724
import androidx.compose.runtime.Composable
1825
import androidx.compose.runtime.getValue
1926
import androidx.compose.runtime.mutableIntStateOf
@@ -52,7 +59,6 @@ import to.bitkit.ui.components.settings.SettingsIcon
5259
import to.bitkit.ui.navigateTo
5360
import to.bitkit.ui.scaffold.AppTopBar
5461
import to.bitkit.ui.scaffold.DrawerNavIcon
55-
import to.bitkit.ui.scaffold.ScreenColumn
5662
import to.bitkit.ui.settingsViewModel
5763
import to.bitkit.ui.shared.modifiers.clickableAlpha
5864
import 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

Comments
 (0)