From c1ebcfed68c206fd7ba701d7c29caa4ae4e7ae75 Mon Sep 17 00:00:00 2001 From: Todd Stark <1664712+todd2982@users.noreply.github.com> Date: Wed, 26 Mar 2025 21:52:43 -0500 Subject: [PATCH] Correct theming to black on green when in light theme. --- app/src/main/java/com/geeksville/mesh/ui/theme/Color.kt | 2 ++ app/src/main/java/com/geeksville/mesh/ui/theme/Theme.kt | 2 ++ 2 files changed, 4 insertions(+) diff --git a/app/src/main/java/com/geeksville/mesh/ui/theme/Color.kt b/app/src/main/java/com/geeksville/mesh/ui/theme/Color.kt index a60a3a29..ab05af73 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/theme/Color.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/theme/Color.kt @@ -32,6 +32,8 @@ val LightPink = Color(0xFFFFE6E6) val LightGreen = Color(0xFFCFE8A9) val LightRed = Color(0xFFFFB3B3) +val Black = Color(0x000000) + val MeshtasticGreen = Color(0xFF67EA94) val HyperlinkBlue = Color(0xFF43C3B0) diff --git a/app/src/main/java/com/geeksville/mesh/ui/theme/Theme.kt b/app/src/main/java/com/geeksville/mesh/ui/theme/Theme.kt index f9294089..4258b838 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/theme/Theme.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/theme/Theme.kt @@ -22,6 +22,7 @@ import androidx.compose.material.MaterialTheme import androidx.compose.material.darkColors import androidx.compose.material.lightColors import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color private val DarkColorPalette = darkColors( primary = MeshtasticGreen, @@ -33,6 +34,7 @@ private val LightColorPalette = lightColors( primary = MeshtasticGreen, primaryVariant = LightSkyBlue, secondary = Teal200, + onPrimary = Color.Black /* Other default colors to override background = Color.White,