fix: restore onSurfaceVariant theme color (still used by some compone…

…nts) (#337)
paug · Feb 28, 2025 · 7f5ce8d · 7f5ce8d
1 parent 042a228
commit 7f5ce8d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/shared/ui/src/commonMain/kotlin/com/androidmakers/ui/theme/Colors.kt b/shared/ui/src/commonMain/kotlin/com/androidmakers/ui/theme/Colors.kt
@@ -24,6 +24,7 @@ val md_theme_light_background = Color(0xFFFBFCFE)
 val md_theme_light_onBackground = Color(0xFF191C1E)
 val md_theme_light_surface = Color(0xFFFBFCFE)
 val md_theme_light_onSurface = Color(0xFF191C1E)
+val md_theme_light_onSurfaceVariant = Color(0xFF40484C)
 val md_theme_light_surfaceContainer = Color(0xFFE9F1F5)
 val md_theme_light_surfaceContainerHigh = Color(0xFFE6F0F4)
 val md_theme_light_surfaceContainerHighest = Color(0xFFDCE4E9)
@@ -56,6 +57,7 @@ val md_theme_dark_background = Color(0xFF191C1E)
 val md_theme_dark_onBackground = Color(0xFFE1E2E4)
 val md_theme_dark_surface = Color(0xFF191C1E)
 val md_theme_dark_onSurface = Color(0xFFE1E2E4)
+val md_theme_dark_onSurfaceVariant = Color(0xFFC0C8CC)
 val md_theme_dark_surfaceContainer = Color(0xFF1E292E)
 val md_theme_dark_surfaceContainerHigh = Color(0xFF1F2B31)
 val md_theme_dark_surfaceContainerHighest = Color(0xFF40484C)
@@ -93,6 +95,7 @@ val LightDefaultColorScheme = lightColorScheme(
     onBackground = md_theme_light_onBackground,
     surface = md_theme_light_surface,
     onSurface = md_theme_light_onSurface,
+    onSurfaceVariant = md_theme_light_onSurfaceVariant,
     surfaceContainer = md_theme_light_surfaceContainer,
     surfaceContainerHigh = md_theme_light_surfaceContainerHigh,
     surfaceContainerHighest = md_theme_light_surfaceContainerHighest,
@@ -127,6 +130,7 @@ val DarkDefaultColorScheme = darkColorScheme(
     onBackground = md_theme_dark_onBackground,
     surface = md_theme_dark_surface,
     onSurface = md_theme_dark_onSurface,
+    onSurfaceVariant = md_theme_dark_onSurfaceVariant,
     surfaceContainer = md_theme_dark_surfaceContainer,
     surfaceContainerHigh = md_theme_dark_surfaceContainerHigh,
     surfaceContainerHighest = md_theme_dark_surfaceContainerHighest,

diff --git a/wearApp/src/main/java/fr/paug/androidmakers/wear/ui/session/details/SessionDetailScreen.kt b/wearApp/src/main/java/fr/paug/androidmakers/wear/ui/session/details/SessionDetailScreen.kt
@@ -65,7 +65,7 @@ private fun Session(session: UISession) {
     ) {
       item {
         CompositionLocalProvider(
-          LocalContentColor provides MaterialTheme.colors.onSurface,
+          LocalContentColor provides MaterialTheme.colors.onSurfaceVariant,
           LocalTextStyle provides MaterialTheme.typography.caption1,
         ) {
           Row(
@@ -168,7 +168,7 @@ private fun Session(session: UISession) {
             style = MaterialTheme.typography.body2.copy(
               hyphens = Hyphens.Auto,
               lineBreak = LineBreak.Paragraph,
-              color = MaterialTheme.colors.onSurface,
+              color = MaterialTheme.colors.onSurfaceVariant,
             ),
           )
         }

diff --git a/wearApp/src/main/java/fr/paug/androidmakers/wear/ui/session/list/SessionListScreen.kt b/wearApp/src/main/java/fr/paug/androidmakers/wear/ui/session/list/SessionListScreen.kt
@@ -154,7 +154,7 @@ private fun SessionItem(
         modifier = Modifier.fillMaxWidth(),
       ) {
         CompositionLocalProvider(
-          LocalContentColor provides MaterialTheme.colors.onSurface,
+          LocalContentColor provides MaterialTheme.colors.onSurfaceVariant,
           LocalTextStyle provides MaterialTheme.typography.caption1,
         ) {
           Row(