From 0f344c9bee16eef6dbe272664b04896866574f98 Mon Sep 17 00:00:00 2001
From: Karim Abou Zeid <karim23697@gmail.com>
Date: Fri, 21 Jun 2019 17:38:37 +0200
Subject: [PATCH] Revert "Black theme update (#673)"

This reverts commit 5f9a2a54

Reason:
1. also affects the other themes
2. too much black for my taste
---
 app/src/main/res/layout-land/fragment_flat_player.xml           | 1 -
 app/src/main/res/layout/fragment_card_player.xml                | 1 -
 .../main/res/layout/fragment_card_player_playback_controls.xml  | 2 +-
 app/src/main/res/layout/fragment_flat_player.xml                | 1 -
 app/src/main/res/values/styles_parents.xml                      | 2 +-
 5 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/layout-land/fragment_flat_player.xml b/app/src/main/res/layout-land/fragment_flat_player.xml
index a2929b51..2498679a 100644
--- a/app/src/main/res/layout-land/fragment_flat_player.xml
+++ b/app/src/main/res/layout-land/fragment_flat_player.xml
@@ -76,7 +76,6 @@
                     android:id="@+id/player_panel_content"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="?cardBackgroundColor"
                     android:orientation="vertical">
 
                     <View
diff --git a/app/src/main/res/layout/fragment_card_player.xml b/app/src/main/res/layout/fragment_card_player.xml
index 30bd04ec..c8c6d217 100644
--- a/app/src/main/res/layout/fragment_card_player.xml
+++ b/app/src/main/res/layout/fragment_card_player.xml
@@ -101,7 +101,6 @@
                 android:layout_marginRight="16dp"
                 android:layout_marginTop="8dp"
                 app:cardBackgroundColor="?cardBackgroundColor"
-                sothree:cardCornerRadius="5dp"
                 app:cardElevation="@dimen/card_elevation"
                 app:cardUseCompatPadding="false">
 
diff --git a/app/src/main/res/layout/fragment_card_player_playback_controls.xml b/app/src/main/res/layout/fragment_card_player_playback_controls.xml
index 4a70e25b..ae2969f4 100644
--- a/app/src/main/res/layout/fragment_card_player_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_card_player_playback_controls.xml
@@ -10,7 +10,7 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="@dimen/progress_container_height"
-        android:background="@android:color/black">
+        android:background="@color/twenty_percent_black_overlay">
 
         <TextView
             android:id="@+id/player_song_current_progress"
diff --git a/app/src/main/res/layout/fragment_flat_player.xml b/app/src/main/res/layout/fragment_flat_player.xml
index 16010236..53f8ce47 100644
--- a/app/src/main/res/layout/fragment_flat_player.xml
+++ b/app/src/main/res/layout/fragment_flat_player.xml
@@ -100,7 +100,6 @@
                     android:id="@+id/player_panel_content"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="?cardBackgroundColor"
                     android:orientation="vertical">
 
                     <View
diff --git a/app/src/main/res/values/styles_parents.xml b/app/src/main/res/values/styles_parents.xml
index 71136fd7..a6eefee5 100644
--- a/app/src/main/res/values/styles_parents.xml
+++ b/app/src/main/res/values/styles_parents.xml
@@ -63,7 +63,7 @@
         <item name="android:windowBackground">@android:color/black</item>
         <item name="dividerColor">#18FFFFFF</item>
         <item name="defaultFooterColor">@color/md_grey_800</item>
-        <item name="cardBackgroundColor">@android:color/black</item>
+        <item name="cardBackgroundColor">@color/md_grey_900</item>
         <item name="md_background_color">@color/md_grey_900</item>
     </style>