WIP: More color tweaking

christianrowlands · Nov 1, 2024 · 0140e3d · 0140e3d
1 parent 7825ead
commit 0140e3d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 14 deletions.
diff --git a/networksurvey/src/main/java/com/craxiom/networksurvey/ui/theme/Color.kt b/networksurvey/src/main/java/com/craxiom/networksurvey/ui/theme/Color.kt
@@ -122,8 +122,8 @@ val primaryContainerDark = Color(0xFF004D63)
 val onPrimaryContainerDark = Color(0xFFBCE9FF)
 val secondaryDark = Color(0xFFB4CAD5)
 val onSecondaryDark = Color(0xFF1E333C)
-val secondaryContainerDark = Color(0xFF354A53)
-val onSecondaryContainerDark = Color(0xFFD0E6F2)
+val secondaryContainerDark = Color(0xFF303C50)
+val onSecondaryContainerDark = Color(0xFFD4E3F1)
 val tertiaryDark = Color(0xFF87D6BC)
 val onTertiaryDark = Color(0xFF00382C)
 val tertiaryContainerDark = Color(0xFF005140)
@@ -134,10 +134,10 @@ val errorContainerDark = Color(0xFF93000A)
 val onErrorContainerDark = Color(0xFFFFDAD6)
 val backgroundDark = Color(0xFF090D0E)
 val onBackgroundDark = Color(0xFFDEE3E6)
-val surfaceDark = Color(0xFF0F1417)
+val surfaceDark = Color(0xFF090D0E)
 val onSurfaceDark = Color(0xFFDEE3E6)
 val surfaceVariantDark = Color(0xFF40484C)
-val onSurfaceVariantDark = Color(0xFFC0C8CC)
+val onSurfaceVariantDark = Color(0xFFCDD0DA)
 val outlineDark = Color(0xFF8A9296)
 val outlineVariantDark = Color(0xFF40484C)
 val scrimDark = Color(0xFF000000)
@@ -148,7 +148,7 @@ val surfaceDimDark = Color(0xFF0F1417)
 val surfaceBrightDark = Color(0xFF353A3D)
 val surfaceContainerLowestDark = Color(0xFF0A0F11)
 val surfaceContainerLowDark = Color(0xFF171C1F)
-val surfaceContainerDark = Color(0xFF1B2023)
+val surfaceContainerDark = Color(0xFF10151C)
 val surfaceContainerHighDark = Color(0xFF262B2D)
 val surfaceContainerHighestDark = Color(0xFF303538)
 

diff --git a/networksurvey/src/main/java/com/craxiom/networksurvey/ui/theme/Theme.kt b/networksurvey/src/main/java/com/craxiom/networksurvey/ui/theme/Theme.kt
@@ -56,7 +56,7 @@ private val darkScheme = darkColorScheme(
     onPrimaryContainer = onPrimaryContainerDark,
     secondary = secondaryDark,
     onSecondary = onSecondaryDark,
-    secondaryContainer = secondaryContainerDark,
+    secondaryContainer = secondaryContainerDark, // Bottom Nav Bar Selection
     onSecondaryContainer = onSecondaryContainerDark,
     tertiary = tertiaryDark,
     onTertiary = onTertiaryDark,
@@ -82,7 +82,7 @@ private val darkScheme = darkColorScheme(
     surfaceBright = surfaceBrightDark,
     surfaceContainerLowest = surfaceContainerLowestDark,
     surfaceContainerLow = surfaceContainerLowDark,
-    surfaceContainer = surfaceContainerDark,
+    surfaceContainer = surfaceContainerDark, // Bottom Nav Bar
     surfaceContainerHigh = surfaceContainerHighDark,
     surfaceContainerHighest = surfaceContainerHighestDark,
 )

diff --git a/networksurvey/src/main/res/values/colors.xml b/networksurvey/src/main/res/values/colors.xml
@@ -60,8 +60,8 @@
     <color name="md_theme_onPrimaryContainer">#BCE9FF</color>
     <color name="md_theme_secondary">#B4CAD5</color>
     <color name="md_theme_onSecondary">#1E333C</color>
-    <color name="md_theme_secondaryContainer">#354A53</color>
-    <color name="md_theme_onSecondaryContainer">#D0E6F2</color>
+    <color name="md_theme_secondaryContainer">#303C50</color>
+    <color name="md_theme_onSecondaryContainer">#D4E3F1</color>
     <color name="md_theme_tertiary">#87D6BC</color>
     <color name="md_theme_onTertiary">#00382C</color>
     <color name="md_theme_tertiaryContainer">#005140</color>
@@ -70,12 +70,13 @@
     <color name="md_theme_onError">#690005</color>
     <color name="md_theme_errorContainer">#93000A</color>
     <color name="md_theme_onErrorContainer">#FFDAD6</color>
-    <color name="md_theme_background">#0F1417</color>
+    <color name="md_theme_background">#090D0E</color>
     <color name="md_theme_onBackground">#DEE3E6</color>
-    <color name="md_theme_surface">#07090B</color>
+    <color name="md_theme_surface">#090D0E</color>
+    <color name="md_theme_cardBackground">#181B1F</color>
     <color name="md_theme_onSurface">#DEE3E6</color>
     <color name="md_theme_surfaceVariant">#40484C</color>
-    <color name="md_theme_onSurfaceVariant">#C0C8CC</color>
+    <color name="md_theme_onSurfaceVariant">#CDD0DA</color>
     <color name="md_theme_outline">#8A9296</color>
     <color name="md_theme_outlineVariant">#40484C</color>
     <color name="md_theme_scrim">#000000</color>
@@ -98,7 +99,7 @@
     <color name="md_theme_surfaceBright">#353A3D</color>
     <color name="md_theme_surfaceContainerLowest">#0A0F11</color>
     <color name="md_theme_surfaceContainerLow">#171C1F</color>
-    <color name="md_theme_surfaceContainer">#1B2023</color>
+    <color name="md_theme_surfaceContainer">#10151C</color>
     <color name="md_theme_surfaceContainerHigh">#262B2D</color>
     <color name="md_theme_surfaceContainerHighest">#303538</color>
     <color name="md_theme_primary_mediumContrast">#8ED4F3</color>

diff --git a/networksurvey/src/main/res/values/styles.xml b/networksurvey/src/main/res/values/styles.xml
@@ -68,7 +68,7 @@
     </style>
 
     <style name="CardViewTheme" parent="CardView.Dark">
-        <item name="cardBackgroundColor">@color/md_theme_surfaceContainer</item>
+        <item name="cardBackgroundColor">@color/md_theme_cardBackground</item>
         <item name="android:layout_gravity">start</item>
         <item name="android:layout_margin">@dimen/small_margin</item>
         <item name="cardCornerRadius">4dp</item>