[res] cleanup color res

chr56 · May 7, 2024 · c9577e7 · c9577e7
1 parent 8fc390d
commit c9577e7
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 30 deletions.
diff --git a/app/src/main/java/player/phonograph/util/theme/Attr.kt b/app/src/main/java/player/phonograph/util/theme/Attr.kt
@@ -16,7 +16,7 @@ import android.content.Context
 fun themeFooterColor(context: Context) =
     context.resolveColor(
         R.attr.defaultFooterColor,
-        context.getColor(R.color.footer_background_lightdark)
+        context.getColor(R.color.background_footer_lightdark)
     )
 
 @CheckResult

diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
@@ -9,15 +9,15 @@
     <color name="seek_arc_text">@color/md_white_1000</color>
     <color name="dialog_button_color">@color/md_white_1000</color>
 
-    <color name="background_heavy_lightdark">@color/md_grey_850</color>
-    <color name="background_medium_lightdark">@color/md_grey_800</color>
-    <color name="footer_background_lightdark">@color/md_grey_900</color>
+    <color name="background_heavy_lightdark">@color/background_heavy_dark</color>
+    <color name="background_medium_lightdark">@color/background_medium_dark</color>
+    <color name="background_footer_lightdark">@color/background_footer_dark</color>
     <color name="divider_lightdark">@color/divider_dark</color>
     <color name="icon_lightdark">@color/secondary_text_dark</color>
 
-    <color name="background_heavy_lightblack">@color/md_black_1000</color>
-    <color name="background_medium_lightblack">@color/md_grey_900</color>
-    <color name="footer_background_lightblack">@color/md_black_1000</color>
+    <color name="background_heavy_lightblack">@color/background_heavy_black</color>
+    <color name="background_medium_lightblack">@color/background_medium_black</color>
+    <color name="background_footer_lightblack">@color/background_footer_black</color>
     <color name="divider_lightblack">@color/divider_black</color>
     <color name="icon_lightblack">@color/secondary_text_dark</color>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -9,15 +9,15 @@
     <color name="seek_arc_text">@color/md_black_1000</color>
     <color name="dialog_button_color">@color/md_black_1000</color>
 
-    <color name="background_heavy_lightdark">@color/md_grey_50</color>
-    <color name="background_medium_lightdark">@color/md_grey_50</color>
-    <color name="footer_background_lightdark">@color/md_grey_300</color>
+    <color name="background_heavy_lightdark">@color/background_heavy_light</color>
+    <color name="background_medium_lightdark">@color/background_medium_light</color>
+    <color name="background_footer_lightdark">@color/background_footer_light</color>
     <color name="divider_lightdark">@color/divider_light</color>
     <color name="icon_lightdark">@color/secondary_text_light</color>
 
-    <color name="background_heavy_lightblack">@color/md_grey_50</color>
-    <color name="background_medium_lightblack">@color/md_grey_50</color>
-    <color name="footer_background_lightblack">@color/md_grey_300</color>
+    <color name="background_heavy_lightblack">@color/background_heavy_light</color>
+    <color name="background_medium_lightblack">@color/background_medium_light</color>
+    <color name="background_footer_lightblack">@color/background_footer_light</color>
     <color name="divider_lightblack">@color/divider_light</color>
     <color name="icon_lightblack">@color/secondary_text_light</color>
 </resources>
diff --git a/app/src/main/res/values/colors_palette.xml b/app/src/main/res/values/colors_palette.xml
@@ -15,4 +15,19 @@
     <color name="twenty_percent_black_overlay">#34000000</color>
     <color name="fifty_percent_black_overlay">#88000000</color>
 
+
+    <color name="background_heavy_light">@color/md_grey_50</color>
+    <color name="background_medium_light">@color/md_grey_50</color>
+    <color name="background_footer_light">@color/md_grey_300</color>
+
+
+    <color name="background_heavy_black">@color/md_black_1000</color>
+    <color name="background_medium_black">@color/md_grey_900</color>
+    <color name="background_footer_black">@color/md_black_1000</color>
+
+
+    <color name="background_heavy_dark">@color/md_grey_850</color>
+    <color name="background_medium_dark">@color/md_grey_800</color>
+    <color name="background_footer_dark">@color/md_grey_900</color>
+
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -22,7 +22,7 @@
         <item name="md_color_button_text">@color/primary_text_default</item>
         <item name="cardBackgroundColor">@color/background_medium_lightdark</item>
         <item name="colorBackgroundFloating">@color/background_medium_lightdark</item>
-        <item name="defaultFooterColor">@color/footer_background_lightdark</item>
+        <item name="defaultFooterColor">@color/background_footer_lightdark</item>
         <item name="dividerColor">@color/divider_lightdark</item>
         <item name="iconColor">@color/secondary_text_default</item>
 
@@ -31,8 +31,8 @@
     </style>
 
     <style name="Theme.Phonograph.Dark" parent="Theme.MaterialComponents.NoActionBar.Bridge">
-        <item name="android:windowBackground">@color/md_grey_850</item>
-        <item name="md_background_color">@color/md_grey_800</item>
+        <item name="android:windowBackground">@color/background_heavy_dark</item>
+        <item name="md_background_color">@color/background_medium_dark</item>
 
         <item name="md_corner_radius">0dp</item>
         <item name="android:statusBarColor">@android:color/transparent</item>
@@ -50,9 +50,9 @@
         <item name="rectSelectorStrong">@drawable/rect_selector_strong_dark</item>
 
         <item name="md_color_button_text">@color/primary_text_default_darkmode</item>
-        <item name="cardBackgroundColor">@color/md_grey_800</item>
-        <item name="colorBackgroundFloating">@color/md_grey_800</item>
-        <item name="defaultFooterColor">@color/md_grey_900</item>
+        <item name="cardBackgroundColor">@color/background_medium_dark</item>
+        <item name="colorBackgroundFloating">@color/background_medium_dark</item>
+        <item name="defaultFooterColor">@color/background_footer_dark</item>
         <item name="dividerColor">@color/divider_dark</item>
         <item name="iconColor">@color/secondary_text_default_darkmode</item>
 
@@ -61,8 +61,8 @@
     </style>
 
     <style name="Theme.Phonograph.Light" parent="Theme.MaterialComponents.Light.NoActionBar.Bridge">
-        <item name="android:windowBackground">@color/material_grey_50</item>
-        <item name="md_background_color">@color/material_grey_50</item>
+        <item name="android:windowBackground">@color/background_heavy_light</item>
+        <item name="md_background_color">@color/background_medium_light</item>
 
         <item name="md_corner_radius">0dp</item>
         <item name="android:statusBarColor">@android:color/transparent</item>
@@ -80,9 +80,9 @@
         <item name="rectSelectorStrong">@drawable/rect_selector_strong_light</item>
 
         <item name="md_color_button_text">@color/primary_text_default_lightmode</item>
-        <item name="cardBackgroundColor">@color/material_grey_50</item>
-        <item name="colorBackgroundFloating">@color/material_grey_50</item>
-        <item name="defaultFooterColor">@color/md_grey_300</item>
+        <item name="cardBackgroundColor">@color/background_medium_light</item>
+        <item name="colorBackgroundFloating">@color/background_medium_light</item>
+        <item name="defaultFooterColor">@color/background_footer_light</item>
         <item name="dividerColor">@color/divider_light</item>
         <item name="iconColor">@color/secondary_text_default_lightmode</item>
 
@@ -96,17 +96,17 @@
 
         <item name="cardBackgroundColor">@color/background_medium_lightblack</item>
         <item name="colorBackgroundFloating">@color/background_medium_lightblack</item>
-        <item name="defaultFooterColor">@color/footer_background_lightblack</item>
+        <item name="defaultFooterColor">@color/background_footer_lightblack</item>
         <item name="dividerColor">@color/divider_lightblack</item>
     </style>
 
     <style name="Theme.Phonograph.Black" parent="@style/Theme.Phonograph.Dark">
-        <item name="android:windowBackground">@color/md_black_1000</item>
-        <item name="md_background_color">@color/md_grey_900</item>
+        <item name="android:windowBackground">@color/background_heavy_black</item>
+        <item name="md_background_color">@color/background_medium_black</item>
 
-        <item name="cardBackgroundColor">@color/md_grey_900</item>
-        <item name="colorBackgroundFloating">@color/md_grey_900</item>
-        <item name="defaultFooterColor">@color/md_black_1000</item>
+        <item name="cardBackgroundColor">@color/background_medium_black</item>
+        <item name="colorBackgroundFloating">@color/background_medium_black</item>
+        <item name="defaultFooterColor">@color/background_footer_black</item>
         <item name="dividerColor">@color/divider_black</item>
     </style>