Skip to content

Commit 19d3057

Browse files
committed
Add background color for each screen separately
1 parent 68d7ae6 commit 19d3057

9 files changed

Lines changed: 128 additions & 72 deletions

File tree

composeApp/src/commonMain/kotlin/com/linuxcommandlibrary/app/App.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,10 @@ fun LinuxApp(initialDeeplink: String? = null) {
231231
)
232232
},
233233
) { innerPadding ->
234-
Box(modifier = Modifier.padding(innerPadding)) {
234+
Box(
235+
modifier = Modifier
236+
.padding(innerPadding),
237+
) {
235238
NavHost(
236239
navController = navController,
237240
startDestination = initialRoute,

composeApp/src/commonMain/kotlin/com/linuxcommandlibrary/app/ui/screens/basiccategories/BasicCategoriesScreen.kt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
package com.linuxcommandlibrary.app.ui.screens.basiccategories
44

5+
import androidx.compose.foundation.background
56
import androidx.compose.foundation.clickable
67
import androidx.compose.foundation.layout.fillMaxSize
78
import androidx.compose.foundation.layout.size
@@ -11,6 +12,7 @@ import androidx.compose.foundation.lazy.grid.items
1112
import androidx.compose.material.ExperimentalMaterialApi
1213
import androidx.compose.material.Icon
1314
import androidx.compose.material.ListItem
15+
import androidx.compose.material.MaterialTheme
1416
import androidx.compose.material.Text
1517
import androidx.compose.runtime.Composable
1618
import androidx.compose.runtime.collectAsState
@@ -22,6 +24,7 @@ import androidx.compose.ui.unit.dp
2224
import com.linuxcommandlibrary.app.ui.composables.AppIcon
2325
import com.linuxcommandlibrary.app.ui.composables.getIconId
2426
import com.linuxcommandlibrary.app.ui.composables.rememberIconPainter
27+
import com.linuxcommandlibrary.app.ui.theme.LocalCustomColors
2528

2629
@Composable
2730
fun BasicCategoriesScreen(
@@ -31,7 +34,9 @@ fun BasicCategoriesScreen(
3134
val basicCategories by viewModel.basicCategories.collectAsState()
3235

3336
LazyVerticalGrid(
34-
modifier = Modifier.fillMaxSize(),
37+
modifier = Modifier
38+
.background(MaterialTheme.colors.background)
39+
.fillMaxSize(),
3540
columns = GridCells.Adaptive(minSize = 300.dp),
3641
) {
3742
items(

composeApp/src/commonMain/kotlin/com/linuxcommandlibrary/app/ui/screens/basicgroups/BasicGroupsScreen.kt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
package com.linuxcommandlibrary.app.ui.screens.basicgroups
44

5+
import androidx.compose.foundation.background
56
import androidx.compose.foundation.clickable
67
import androidx.compose.foundation.layout.fillMaxSize
78
import androidx.compose.foundation.layout.size
@@ -10,6 +11,7 @@ import androidx.compose.foundation.lazy.items
1011
import androidx.compose.material.ExperimentalMaterialApi
1112
import androidx.compose.material.Icon
1213
import androidx.compose.material.ListItem
14+
import androidx.compose.material.MaterialTheme
1315
import androidx.compose.runtime.Composable
1416
import androidx.compose.runtime.collectAsState
1517
import androidx.compose.runtime.getValue
@@ -24,6 +26,7 @@ import com.linuxcommandlibrary.app.ui.composables.CommandView
2426
import com.linuxcommandlibrary.app.ui.composables.HighlightedText
2527
import com.linuxcommandlibrary.app.ui.composables.getIconId
2628
import com.linuxcommandlibrary.app.ui.composables.rememberIconPainter
29+
import com.linuxcommandlibrary.app.ui.theme.LocalCustomColors
2730
import com.linuxcommandlibrary.shared.getCommandList
2831
import kotlinx.collections.immutable.ImmutableList
2932
import kotlinx.collections.immutable.ImmutableSet
@@ -38,7 +41,11 @@ fun BasicGroupsScreen(
3841
) {
3942
val uiState by viewModel.uiState.collectAsState()
4043

41-
LazyColumn(Modifier.fillMaxSize()) {
44+
LazyColumn(
45+
Modifier
46+
.fillMaxSize()
47+
.background(MaterialTheme.colors.background),
48+
) {
4249
items(
4350
items = uiState.basicGroups,
4451
key = { it.id },

composeApp/src/commonMain/kotlin/com/linuxcommandlibrary/app/ui/screens/commanddetail/CommandDetailScreen.kt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
package com.linuxcommandlibrary.app.ui.screens.commanddetail
44

5+
import androidx.compose.foundation.background
56
import androidx.compose.foundation.clickable
67
import androidx.compose.foundation.layout.Arrangement
78
import androidx.compose.foundation.layout.Column
@@ -29,6 +30,7 @@ import androidx.compose.ui.unit.dp
2930
import androidx.compose.ui.unit.sp
3031
import com.linuxcommandlibrary.app.data.CommandSectionInfo
3132
import com.linuxcommandlibrary.app.ui.composables.TipSectionContent
33+
import com.linuxcommandlibrary.app.ui.theme.LocalCustomColors
3234
import com.linuxcommandlibrary.shared.MarkdownParser
3335
import kotlinx.collections.immutable.ImmutableList
3436

@@ -39,7 +41,11 @@ fun CommandDetailScreen(
3941
) {
4042
val uiState by viewModel.state.collectAsState()
4143

42-
LazyColumn(Modifier.fillMaxSize()) {
44+
LazyColumn(
45+
Modifier
46+
.background(MaterialTheme.colors.background)
47+
.fillMaxSize(),
48+
) {
4349
itemsIndexed(
4450
items = uiState.sections,
4551
key = { index, _ -> index },

composeApp/src/commonMain/kotlin/com/linuxcommandlibrary/app/ui/screens/commandlist/CommandListScreen.kt

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,15 @@
22

33
package com.linuxcommandlibrary.app.ui.screens.commandlist
44

5+
import androidx.compose.foundation.background
56
import androidx.compose.foundation.clickable
7+
import androidx.compose.foundation.layout.fillMaxSize
68
import androidx.compose.foundation.lazy.LazyColumn
79
import androidx.compose.foundation.lazy.items
810
import androidx.compose.material.ExperimentalMaterialApi
911
import androidx.compose.material.Icon
1012
import androidx.compose.material.ListItem
13+
import androidx.compose.material.MaterialTheme
1114
import androidx.compose.runtime.Composable
1215
import androidx.compose.runtime.collectAsState
1316
import androidx.compose.runtime.getValue
@@ -19,6 +22,7 @@ import com.linuxcommandlibrary.app.data.CommandInfo
1922
import com.linuxcommandlibrary.app.ui.composables.AppIcon
2023
import com.linuxcommandlibrary.app.ui.composables.HighlightedText
2124
import com.linuxcommandlibrary.app.ui.composables.rememberIconPainter
25+
import com.linuxcommandlibrary.app.ui.theme.LocalCustomColors
2226

2327
@Composable
2428
fun CommandListScreen(
@@ -27,7 +31,11 @@ fun CommandListScreen(
2731
) {
2832
val commands by viewModel.commands.collectAsState()
2933

30-
LazyColumn {
34+
LazyColumn(
35+
modifier = Modifier
36+
.background(MaterialTheme.colors.background)
37+
.fillMaxSize(),
38+
) {
3139
items(
3240
items = commands,
3341
key = { it.id },

composeApp/src/commonMain/kotlin/com/linuxcommandlibrary/app/ui/screens/search/SearchScreen.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import androidx.compose.runtime.remember
1818
import androidx.compose.ui.Alignment
1919
import androidx.compose.ui.Modifier
2020
import com.linuxcommandlibrary.app.ui.screens.commandlist.CommandListItem
21+
import com.linuxcommandlibrary.app.ui.theme.LocalCustomColors
2122

2223
@Composable
2324
fun SearchScreen(

composeApp/src/commonMain/kotlin/com/linuxcommandlibrary/app/ui/screens/tips/TipsScreen.kt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
package com.linuxcommandlibrary.app.ui.screens.tips
22

3+
import androidx.compose.foundation.background
34
import androidx.compose.foundation.layout.Column
5+
import androidx.compose.foundation.layout.fillMaxSize
46
import androidx.compose.foundation.layout.fillMaxWidth
57
import androidx.compose.foundation.layout.padding
68
import androidx.compose.foundation.lazy.staggeredgrid.LazyVerticalStaggeredGrid
79
import androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridCells
810
import androidx.compose.foundation.lazy.staggeredgrid.items
911
import androidx.compose.material.Card
12+
import androidx.compose.material.MaterialTheme
1013
import androidx.compose.runtime.Composable
1114
import androidx.compose.runtime.collectAsState
1215
import androidx.compose.runtime.getValue
@@ -15,6 +18,7 @@ import androidx.compose.ui.unit.dp
1518
import com.linuxcommandlibrary.app.data.TipInfo
1619
import com.linuxcommandlibrary.app.ui.composables.SectionTitle
1720
import com.linuxcommandlibrary.app.ui.composables.TipSectionContent
21+
import com.linuxcommandlibrary.app.ui.theme.LocalCustomColors
1822

1923
@Composable
2024
fun TipsScreen(
@@ -24,6 +28,9 @@ fun TipsScreen(
2428
val tips by viewModel.tips.collectAsState()
2529

2630
LazyVerticalStaggeredGrid(
31+
modifier = Modifier
32+
.background(MaterialTheme.colors.background)
33+
.fillMaxSize(),
2734
columns = StaggeredGridCells.Adaptive(minSize = 300.dp),
2835
) {
2936
items(

0 commit comments

Comments
 (0)