Theme fixes (#963)

* Fix theme issue with download progress indicator * Fix theme issue with download progress indicator + better contrast
mihonapp · Jun 28, 2024 · e132cc4 · e132cc4
1 parent 2674b84
commit e132cc4
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/app/src/main/java/eu/kanade/presentation/theme/colorscheme/NordColorScheme.kt b/app/src/main/java/eu/kanade/presentation/theme/colorscheme/NordColorScheme.kt
@@ -19,8 +19,8 @@ internal object NordColorScheme : BaseColorScheme() {
         inversePrimary = Color(0xFF397E91),
         secondary = Color(0xFF81A1C1), // Unread badge
         onSecondary = Color(0xFF2E3440), // Unread badge text
-        secondaryContainer = Color(0xFF81A1C1), // Navigation bar selector pill & progress indicator (remaining)
-        onSecondaryContainer = Color(0xFF2E3440), // Navigation bar selector icon
+        secondaryContainer = Color(0xFF506275), // Navigation bar selector pill & progress indicator (remaining)
+        onSecondaryContainer = Color(0xFF88C0D0), // Navigation bar selector icon
         tertiary = Color(0xFF5E81AC), // Downloaded badge
         onTertiary = Color(0xFF000000), // Downloaded badge text
         tertiaryContainer = Color(0xFF5E81AC),
@@ -54,7 +54,7 @@ internal object NordColorScheme : BaseColorScheme() {
         inversePrimary = Color(0xFF8CA8CD),
         secondary = Color(0xFF81A1C1), // Unread badge
         onSecondary = Color(0xFF2E3440), // Unread badge text
-        secondaryContainer = Color(0xFF81A1C1), // Navigation bar selector pill & progress indicator (remaining)
+        secondaryContainer = Color(0xFF91B4D7), // Navigation bar selector pill & progress indicator (remaining)
         onSecondaryContainer = Color(0xFF2E3440), // Navigation bar selector icon
         tertiary = Color(0xFF88C0D0), // Downloaded badge
         onTertiary = Color(0xFF2E3440), // Downloaded badge text

diff --git a/presentation-core/src/main/res/values-night/colors_lavender.xml b/presentation-core/src/main/res/values-night/colors_lavender.xml
@@ -17,7 +17,7 @@
     <color name="lavender_onPrimaryContainer">#111129</color>
     <color name="lavender_secondary">#A177FF</color>
     <color name="lavender_onSecondary">#111129</color>
-    <color name="lavender_secondaryContainer">#A177FF</color>
+    <color name="lavender_secondaryContainer">#423271</color>
     <color name="lavender_onSecondaryContainer">#111129</color>
     <color name="lavender_tertiary">#5E25E1</color>
     <color name="lavender_onTertiary">#E8E8E8</color>

diff --git a/presentation-core/src/main/res/values-night/colors_midnightdusk.xml b/presentation-core/src/main/res/values-night/colors_midnightdusk.xml
@@ -17,7 +17,7 @@
     <color name="midnightdusk_onPrimaryContainer">#FFFFFF</color>
     <color name="midnightdusk_secondary">#F02475</color>
     <color name="midnightdusk_onSecondary">#FFFFFF</color>
-    <color name="midnightdusk_secondaryContainer">#F02475</color>
+    <color name="midnightdusk_secondaryContainer">#66183C</color>
     <color name="midnightdusk_onSecondaryContainer">#FFFFFF</color>
     <color name="midnightdusk_tertiary">#55971C</color>
     <color name="midnightdusk_onTertiary">#FFFFFF</color>

diff --git a/presentation-core/src/main/res/values-night/colors_nord.xml b/presentation-core/src/main/res/values-night/colors_nord.xml
@@ -7,7 +7,7 @@
     <color name="nord_onPrimaryContainer">#2E3440</color>
     <color name="nord_secondary">#81A1C1</color>
     <color name="nord_onSecondary">#2E3440</color>
-    <color name="nord_secondaryContainer">#81A1C1</color>
+    <color name="nord_secondaryContainer">#506275</color>
     <color name="nord_onSecondaryContainer">#2E3440</color>
     <color name="nord_tertiary">#5E81AC</color>
     <color name="nord_onTertiary">#000000</color>

diff --git a/presentation-core/src/main/res/values-night/colors_tako.xml b/presentation-core/src/main/res/values-night/colors_tako.xml
@@ -15,7 +15,7 @@
     <color name="tako_onPrimary">#38294E</color>
     <color name="tako_primaryContainer">#F3B375</color>
     <color name="tako_onPrimaryContainer">#38294E</color>
-    <color name="tako_secondary">#F3B375</color>
+    <color name="tako_secondary">#5C4D4B</color>
     <color name="tako_onSecondary">#38294E</color>
     <color name="tako_secondaryContainer">#F3B375</color>
     <color name="tako_onSecondaryContainer">#38294E</color>

diff --git a/presentation-core/src/main/res/values/colors_lavender.xml b/presentation-core/src/main/res/values/colors_lavender.xml
@@ -16,7 +16,7 @@
     <color name="lavender_onPrimaryContainer">#EDE2FF</color>
     <color name="lavender_secondary">#7B46AF</color>
     <color name="lavender_onSecondary">#EDE2FF</color>
-    <color name="lavender_secondaryContainer">#7B46AF</color>
+    <color name="lavender_secondaryContainer">#C9B0E6</color>
     <color name="lavender_onSecondaryContainer">#EDE2FF</color>
     <color name="lavender_tertiary">#EDE2FF</color>
     <color name="lavender_onTertiary">#7B46AF</color>

diff --git a/presentation-core/src/main/res/values/colors_nord.xml b/presentation-core/src/main/res/values/colors_nord.xml
@@ -8,7 +8,7 @@
     <color name="nord_onPrimaryContainer">#000000</color>
     <color name="nord_secondary">#81A1C1</color>
     <color name="nord_onSecondary">#2E3440</color>
-    <color name="nord_secondaryContainer">#81A1C1</color>
+    <color name="nord_secondaryContainer">#91B4D7</color>
     <color name="nord_onSecondaryContainer">#2E3440</color>
     <color name="nord_tertiary">#88C0D0</color>
     <color name="nord_onTertiary">#2E3440</color>

diff --git a/presentation-core/src/main/res/values/colors_tako.xml b/presentation-core/src/main/res/values/colors_tako.xml
@@ -17,7 +17,7 @@
     <color name="tako_onPrimaryContainer">#F3B375</color>
     <color name="tako_secondary">#66577E</color>
     <color name="tako_onSecondary">#F3B375</color>
-    <color name="tako_secondaryContainer">#66577E</color>
+    <color name="tako_secondaryContainer">#C8BED0</color>
     <color name="tako_onSecondaryContainer">#F3B375</color>
     <color name="tako_tertiary">#F3B375</color>
     <color name="tako_onTertiary">#574360</color>