Skip to content

Commit 89def62

Browse files
authored
Merge pull request #161 from joreilly/ui_updates
ui updates
2 parents 9f3bf6a + 22ea217 commit 89def62

File tree

2 files changed

+6
-5
lines changed
  • composeApp/src

2 files changed

+6
-5
lines changed

composeApp/src/androidMain/kotlin/dev/johnoreilly/climatetrace/theme/Theme.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import androidx.compose.material3.dynamicLightColorScheme
99
import androidx.compose.material3.lightColorScheme
1010
import androidx.compose.runtime.Composable
1111
import androidx.compose.ui.platform.LocalContext
12+
import androidx.compose.ui.graphics.Color
1213

1314
private val DarkColorScheme = darkColorScheme(
1415
primary = Purple80,
@@ -19,10 +20,10 @@ private val DarkColorScheme = darkColorScheme(
1920
private val LightColorScheme = lightColorScheme(
2021
primary = Purple40,
2122
secondary = PurpleGrey40,
22-
tertiary = Pink40
23+
tertiary = Pink40,
24+
background = Color.White,
2325

2426
/* Other default colors to override
25-
background = Color(0xFFFFFBFE),
2627
surface = Color(0xFFFFFBFE),
2728
onPrimary = Color.White,
2829
onSecondary = Color.White,

composeApp/src/commonMain/kotlin/dev/johnoreilly/climatetrace/ui/ClimateTraceScreen.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package dev.johnoreilly.climatetrace.ui
33
import androidx.compose.animation.AnimatedVisibility
44
import androidx.compose.animation.fadeIn
55
import androidx.compose.animation.fadeOut
6-
import androidx.compose.foundation.background
76
import androidx.compose.foundation.clickable
87
import androidx.compose.foundation.layout.Arrangement
98
import androidx.compose.foundation.layout.Box
@@ -28,6 +27,7 @@ import androidx.compose.material3.Icon
2827
import androidx.compose.material3.IconButton
2928
import androidx.compose.material3.MaterialTheme
3029
import androidx.compose.material3.SearchBar
30+
import androidx.compose.material3.SearchBarDefaults
3131
import androidx.compose.material3.Text
3232
import androidx.compose.material3.VerticalDivider
3333
import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo
@@ -98,7 +98,7 @@ fun CountryScreenSuccess(countryList: List<Country>) {
9898
if (windowSizeClass.windowWidthSizeClass == WindowWidthSizeClass.COMPACT) {
9999
Column(Modifier.fillMaxWidth()) {
100100
Box(
101-
Modifier.height(250.dp).fillMaxWidth().background(color = Color.LightGray)
101+
Modifier.height(250.dp).fillMaxWidth()
102102
) {
103103
CountryListView(
104104
countryList = countryList,
@@ -225,7 +225,7 @@ fun SearchableList(
225225
},
226226
active = true,
227227
onActiveChange = {},
228-
tonalElevation = 0.dp
228+
colors = SearchBarDefaults.colors(containerColor = MaterialTheme.colorScheme.background),
229229
)
230230
}
231231

0 commit comments

Comments
 (0)