Merge branch 'kb-android-trip-details-barebones' into kb-android-trip…

…-details-barebones-2
mbta · Jan 21, 2025 · 32645bd · 32645bd
2 parents e5c967f + f4cf0c4
commit 32645bd
Showing 1 changed file with 46 additions and 46 deletions.
diff --git a/androidApp/src/main/java/com/mbta/tid/mbta_app/android/MyApplicationTheme.kt b/androidApp/src/main/java/com/mbta/tid/mbta_app/android/MyApplicationTheme.kt
@@ -32,36 +32,36 @@ fun MyApplicationTheme(
                 background = colorResource(R.color.fill3),
                 primary = colorResource(R.color.key),
                 primaryContainer = colorResource(R.color.fill1),
+                inversePrimary = colorResource(R.color.key_inverse),
                 secondary = colorResource(R.color.key_inverse),
                 tertiary = colorResource(R.color.deemphasized),
                 outline = colorResource(R.color.halo),
-                onPrimary = Color.Magenta,
-                onPrimaryContainer = Color.Magenta,
-                inversePrimary = Color.Magenta,
-                onSecondary = Color.Magenta,
+                onPrimary = colorResource(R.color.text),
+                onPrimaryContainer = colorResource(R.color.text),
+                onSecondary = colorResource(R.color.text),
+                onSecondaryContainer = colorResource(R.color.text),
+                onTertiary = colorResource(R.color.text),
+                onTertiaryContainer = colorResource(R.color.text),
+                onBackground = colorResource(R.color.text),
+                onSurface = colorResource(R.color.text),
+                onSurfaceVariant = colorResource(R.color.text),
+                inverseOnSurface = colorResource(R.color.text),
+                onError = colorResource(R.color.text),
+                onErrorContainer = colorResource(R.color.text),
+                surfaceTint = colorResource(R.color.key),
+                inverseSurface = colorResource(R.color.key_inverse),
+                outlineVariant = colorResource(R.color.halo),
+                scrim = colorResource(R.color.halo),
+                surfaceBright = colorResource(R.color.key_inverse),
+                surfaceContainer = colorResource(R.color.fill3),
+                surfaceContainerHigh = colorResource(R.color.fill2),
+                surfaceContainerHighest = colorResource(R.color.fill1),
+                surfaceContainerLow = colorResource(R.color.fill1),
+                surfaceContainerLowest = colorResource(R.color.fill2),
                 secondaryContainer = Color.Magenta,
-                onSecondaryContainer = Color.Magenta,
-                onTertiary = Color.Magenta,
                 tertiaryContainer = Color.Magenta,
-                onTertiaryContainer = Color.Magenta,
-                onBackground = Color.Magenta,
-                onSurface = Color.Magenta,
-                onSurfaceVariant = Color.Magenta,
-                surfaceTint = Color.Magenta,
-                inverseSurface = Color.Magenta,
-                inverseOnSurface = Color.Magenta,
                 error = Color.Magenta,
-                onError = Color.Magenta,
                 errorContainer = Color.Magenta,
-                onErrorContainer = Color.Magenta,
-                outlineVariant = Color.Magenta,
-                scrim = Color.Magenta,
-                surfaceBright = Color.Magenta,
-                surfaceContainer = Color.Magenta,
-                surfaceContainerHigh = Color.Magenta,
-                surfaceContainerHighest = Color.Magenta,
-                surfaceContainerLow = Color.Magenta,
-                surfaceContainerLowest = Color.Magenta,
             )
         } else {
             lightColorScheme(
@@ -70,36 +70,36 @@ fun MyApplicationTheme(
                 background = colorResource(R.color.fill3),
                 primary = colorResource(R.color.key),
                 primaryContainer = colorResource(R.color.fill1),
+                inversePrimary = colorResource(R.color.key_inverse),
                 secondary = colorResource(R.color.key_inverse),
                 tertiary = colorResource(R.color.deemphasized),
                 outline = colorResource(R.color.halo),
-                onPrimary = Color.Magenta,
-                onPrimaryContainer = Color.Magenta,
-                inversePrimary = Color.Magenta,
-                onSecondary = Color.Magenta,
+                onPrimary = colorResource(R.color.text),
+                onPrimaryContainer = colorResource(R.color.text),
+                onSecondary = colorResource(R.color.text),
+                onSecondaryContainer = colorResource(R.color.text),
+                onTertiary = colorResource(R.color.text),
+                onTertiaryContainer = colorResource(R.color.text),
+                onBackground = colorResource(R.color.text),
+                onSurface = colorResource(R.color.text),
+                onSurfaceVariant = colorResource(R.color.text),
+                inverseOnSurface = colorResource(R.color.text),
+                onError = colorResource(R.color.text),
+                onErrorContainer = colorResource(R.color.text),
+                surfaceTint = colorResource(R.color.key),
+                inverseSurface = colorResource(R.color.key_inverse),
+                outlineVariant = colorResource(R.color.halo),
+                scrim = colorResource(R.color.halo),
+                surfaceBright = colorResource(R.color.key_inverse),
+                surfaceContainer = colorResource(R.color.fill3),
+                surfaceContainerHigh = colorResource(R.color.fill2),
+                surfaceContainerHighest = colorResource(R.color.fill1),
+                surfaceContainerLow = colorResource(R.color.fill1),
+                surfaceContainerLowest = colorResource(R.color.fill2),
                 secondaryContainer = Color.Magenta,
-                onSecondaryContainer = Color.Magenta,
-                onTertiary = Color.Magenta,
                 tertiaryContainer = Color.Magenta,
-                onTertiaryContainer = Color.Magenta,
-                onBackground = Color.Magenta,
-                onSurface = Color.Magenta,
-                onSurfaceVariant = Color.Magenta,
-                surfaceTint = Color.Magenta,
-                inverseSurface = Color.Magenta,
-                inverseOnSurface = Color.Magenta,
                 error = Color.Magenta,
-                onError = Color.Magenta,
                 errorContainer = Color.Magenta,
-                onErrorContainer = Color.Magenta,
-                outlineVariant = Color.Magenta,
-                scrim = Color.Magenta,
-                surfaceBright = Color.Magenta,
-                surfaceContainer = Color.Magenta,
-                surfaceContainerHigh = Color.Magenta,
-                surfaceContainerHighest = Color.Magenta,
-                surfaceContainerLow = Color.Magenta,
-                surfaceContainerLowest = Color.Magenta,
             )
         }
     val fontFamily =