From ef64df3515906ce2b7697a2dbad31d9ed1faf958 Mon Sep 17 00:00:00 2001
From: Joshua Soberg <soberg.dev@pm.me>
Date: Sat, 22 Feb 2025 15:06:56 -0500
Subject: [PATCH] fix: Stop overriding surface/onSurface in theme (#1605)

Fixes #1604
* Stop overriding surface/onSurface in theme

* Wrap preview in AppTheme to get a better representation of what it'll look like on-device
---
 .../java/com/geeksville/mesh/ui/radioconfig/RadioConfig.kt    | 3 ++-
 app/src/main/java/com/geeksville/mesh/ui/theme/Color.kt       | 2 --
 app/src/main/java/com/geeksville/mesh/ui/theme/Theme.kt       | 4 ----
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/geeksville/mesh/ui/radioconfig/RadioConfig.kt b/app/src/main/java/com/geeksville/mesh/ui/radioconfig/RadioConfig.kt
index 613135dfc..f74c3fb88 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/radioconfig/RadioConfig.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/radioconfig/RadioConfig.kt
@@ -69,6 +69,7 @@ import com.geeksville.mesh.navigation.Route
 import com.geeksville.mesh.ui.components.PreferenceCategory
 import com.geeksville.mesh.ui.radioconfig.components.EditDeviceProfileDialog
 import com.geeksville.mesh.ui.radioconfig.components.PacketResponseStateDialog
+import com.geeksville.mesh.ui.theme.AppTheme
 
 private fun getNavRouteFrom(routeName: String): Route? {
     return ConfigRoute.entries.find { it.name == routeName }?.route
@@ -332,7 +333,7 @@ private fun RadioConfigItemList(
 
 @Preview(showBackground = true)
 @Composable
-private fun RadioSettingsScreenPreview() {
+private fun RadioSettingsScreenPreview() = AppTheme {
     RadioConfigItemList(
         RadioConfigState(isLocal = true, connected = true)
     )
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 de45c5437..e8f0ca87e 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
@@ -33,8 +33,6 @@ val LightGreen = Color(0xFFCFE8A9)
 val LightRed = Color(0xFFFFB3B3)
 
 val MeshtasticGreen = Color(0xFF67EA94)
-val AlmostWhite = Color(0xB3FFFFFF)
-val AlmostBlack = Color(0x8A000000)
 
 val HyperlinkBlue = Color(0xFF43C3B0)
 val Orange = Color(255, 153, 0)
\ No newline at end of file
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 8b80b583c..f92940895 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
@@ -27,16 +27,12 @@ private val DarkColorPalette = darkColors(
     primary = MeshtasticGreen,
     primaryVariant = Purple700,
     secondary = Teal200,
-    surface = AlmostBlack,
-    onSurface = AlmostWhite
 )
 
 private val LightColorPalette = lightColors(
     primary = MeshtasticGreen,
     primaryVariant = LightSkyBlue,
     secondary = Teal200,
-    surface = AlmostWhite,
-    onSurface = AlmostBlack
 
     /* Other default colors to override
     background = Color.White,