Skip to content

Commit 5782783

Browse files
committed
upgrade theme
1 parent f5bddd9 commit 5782783

2 files changed

Lines changed: 34 additions & 31 deletions

File tree

composeApp/src/commonMain/kotlin/neth/iecal/trease/ui/theme/colors.kt

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,7 @@ package neth.iecal.trease.ui.theme
22

33

44
import androidx.compose.ui.graphics.Color
5-
6-
// Your provided color palette object
7-
object ZenColors {
8-
val SkyBlue = Color(0xFF8ACDFD)
9-
val CloudWhite = Color(0xFFF0F8FF)
10-
val GrassGreen = Color(0xFFA2D149)
11-
val DirtBrown = Color(0xFF6D4C41)
12-
val DarkDirtBrown = Color(0xFF5D4037)
13-
val TextBlack = Color(0xFF1A1A1A)
14-
val TextGrey = Color(0xFF555555)
15-
}
5+
val PureWhite = Color(0xFFFFFFFF)
6+
val PureBlack = Color(0xFF000000)
7+
val LightGray = Color(0xFFF2F2F2) // For containers/dividers
8+
val MediumGray = Color(0xFF8C8C8C) // For disabled states/hints

composeApp/src/commonMain/kotlin/neth/iecal/trease/ui/theme/theme.kt

Lines changed: 30 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,49 @@ package neth.iecal.trease.ui.theme
22

33
import androidx.compose.foundation.isSystemInDarkTheme
44
import androidx.compose.material3.MaterialTheme
5-
import androidx.compose.material3.MaterialTheme.typography
6-
import androidx.compose.material3.darkColorScheme
75
import androidx.compose.material3.lightColorScheme
86
import androidx.compose.runtime.Composable
97
import androidx.compose.ui.graphics.Color
108

11-
private val ZenLightColorScheme = lightColorScheme(
12-
// The Sky - Pure or off-white for maximum breathability
13-
background = Color(0xFFFFFFFF),
14-
onBackground = Color(0xFF1A1A1A), // Deep charcoal for soft contrast
159

16-
// The Floating Island - Minimalist accent (e.g., a subtle light grey)
17-
primary = Color(0xFF1A1A1A),
18-
onPrimary = Color(0xFFF2F2F2),
10+
val BlackAndWhiteScheme = lightColorScheme(
11+
primary = PureBlack,
12+
onPrimary = PureWhite,
13+
primaryContainer = PureWhite,
14+
onPrimaryContainer = PureBlack,
1915

20-
// The Floating Island (Dirt layer) - Swapped for a soft neutral
21-
secondary = Color(0xFFEBEBEB),
22-
onSecondary = Color(0xFF4A4A4A),
16+
secondary = PureBlack,
17+
onSecondary = PureWhite,
18+
secondaryContainer = LightGray,
19+
onSecondaryContainer = PureBlack,
2320

24-
// The Clouds - Pure white for elevation
25-
surface = Color(0xFFFFFFFF),
26-
onSurface = Color(0xFF1A1A1A),
21+
tertiary = PureBlack,
22+
onTertiary = PureWhite,
23+
tertiaryContainer = LightGray,
24+
onTertiaryContainer = PureBlack,
2725

28-
// The Progress Bar & Secondary Text
29-
surfaceVariant = Color(0xFFF5F5F5), // Very light track
30-
onSurfaceVariant = Color(0xFF8E8E8E), // Muted grey for metadata
26+
background = PureWhite,
27+
onBackground = PureBlack,
28+
surface = PureWhite,
29+
onSurface = PureBlack,
30+
31+
surfaceVariant = LightGray,
32+
onSurfaceVariant = PureBlack,
33+
34+
outline = PureBlack,
35+
outlineVariant = MediumGray,
36+
37+
error = Color(0xFFB00020),
38+
onError = PureWhite,
39+
errorContainer = LightGray,
40+
onErrorContainer = PureBlack
3141
)
3242
@Composable
33-
fun ZenTheme(
43+
fun MainTheme(
3444
darkTheme: Boolean = isSystemInDarkTheme(),
3545
content: @Composable () -> Unit,
3646
) {
37-
val colorScheme = ZenLightColorScheme
47+
val colorScheme = BlackAndWhiteScheme
3848

3949
MaterialTheme(
4050
typography = fontFamily(),

0 commit comments

Comments
 (0)