[res] remove color res card_background_*

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

Hide file tree

Showing 4 changed files with 8 additions and 12 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
@@ -41,15 +41,15 @@ fun themeDividerColor(context: Context) =
 fun themeCardBackgroundColor(context: Context) =
     context.resolveColor(
         com.google.android.material.R.attr.cardBackgroundColor,
-        context.getColor(R.color.card_background_lightblack)
+        context.getColor(R.color.background_medium_lightblack)
     )
 
 @CheckResult
 @ColorInt
 fun themeFloatingBackgroundColor(context: Context) =
     context.resolveColor(
         com.google.android.material.R.attr.colorBackgroundFloating,
-        context.getColor(R.color.card_background_lightblack)
+        context.getColor(R.color.background_medium_lightblack)
     )
 
 @ColorInt

diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
@@ -11,14 +11,12 @@
 
     <color name="background_heavy_lightdark">@color/md_grey_850</color>
     <color name="background_medium_lightdark">@color/md_grey_800</color>
-    <color name="card_background_lightdark">@color/md_grey_800</color>
     <color name="footer_background_lightdark">@color/md_grey_900</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="card_background_lightblack">@color/md_grey_900</color>
     <color name="footer_background_lightblack">@color/md_black_1000</color>
     <color name="divider_lightblack">@color/divider_black</color>
     <color name="icon_lightblack">@color/secondary_text_dark</color>

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -11,14 +11,12 @@
 
     <color name="background_heavy_lightdark">@color/md_grey_50</color>
     <color name="background_medium_lightdark">@color/md_grey_50</color>
-    <color name="card_background_lightdark">@color/md_grey_50</color>
     <color name="footer_background_lightdark">@color/md_grey_300</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="card_background_lightblack">@color/md_grey_50</color>
     <color name="footer_background_lightblack">@color/md_grey_300</color>
     <color name="divider_lightblack">@color/divider_light</color>
     <color name="icon_lightblack">@color/secondary_text_light</color>

diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -20,8 +20,8 @@
         <item name="rectSelectorStrong">@drawable/rect_selector_strong_auto</item>
 
         <item name="md_color_button_text">@color/primary_text_default</item>
-        <item name="cardBackgroundColor">@color/card_background_lightdark</item>
-        <item name="colorBackgroundFloating">@color/card_background_lightdark</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="dividerColor">@color/divider_lightdark</item>
         <item name="iconColor">@color/secondary_text_default</item>
@@ -80,8 +80,8 @@
         <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/md_white_1000</item>
-        <item name="colorBackgroundFloating">@color/md_white_1000</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="dividerColor">@color/divider_light</item>
         <item name="iconColor">@color/secondary_text_default_lightmode</item>
@@ -94,8 +94,8 @@
         <item name="android:windowBackground">@color/background_heavy_lightblack</item>
         <item name="md_background_color">@color/background_medium_lightblack</item>
 
-        <item name="cardBackgroundColor">@color/card_background_lightblack</item>
-        <item name="colorBackgroundFloating">@color/card_background_lightblack</item>
+        <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="dividerColor">@color/divider_lightblack</item>
     </style>