From 87acf80aa6bc197ea88849b8528fde32cb06675e Mon Sep 17 00:00:00 2001
From: Karim Abou Zeid <karim23697@gmail.com>
Date: Sun, 17 Apr 2016 14:46:18 +0200
Subject: [PATCH] Adjusted the statubsar color for the flat now playing screen.

---
 .../player/flat/FlatPlayerFragment.java       |  2 +-
 app/src/main/res/drawable/shadow_down.xml     |  2 +-
 app/src/main/res/drawable/shadow_up.xml       |  2 +-
 ...fragment_card_player_playback_controls.xml |  2 +-
 .../main/res/layout/fragment_flat_player.xml  | 19 +++++++++++++++----
 ...fragment_flat_player_playback_controls.xml |  2 +-
 app/src/main/res/values/colors.xml            |  4 ++++
 7 files changed, 24 insertions(+), 9 deletions(-)
 create mode 100644 app/src/main/res/values/colors.xml

diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/flat/FlatPlayerFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/flat/FlatPlayerFragment.java
index e44ca617..0b53e128 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/flat/FlatPlayerFragment.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/flat/FlatPlayerFragment.java
@@ -436,7 +436,7 @@ public class FlatPlayerFragment extends AbsPlayerFragment implements PlayerAlbum
 
         public AnimatorSet createDefaultColorChangeAnimatorSet(int newColor) {
             Animator backgroundAnimator = ViewUtil.createBackgroundColorTransition(fragment.playbackControlsFragment.getView(), fragment.lastColor, newColor);
-            Animator statusBarAnimator = ViewUtil.createBackgroundColorTransition(fragment.playerStatusBar, ColorUtil.darkenColor(fragment.lastColor), ColorUtil.darkenColor(newColor));
+            Animator statusBarAnimator = ViewUtil.createBackgroundColorTransition(fragment.playerStatusBar, fragment.lastColor, newColor);
 
             AnimatorSet animatorSet = new AnimatorSet();
             animatorSet.playTogether(backgroundAnimator, statusBarAnimator);
diff --git a/app/src/main/res/drawable/shadow_down.xml b/app/src/main/res/drawable/shadow_down.xml
index cbf83d4b..d9200945 100644
--- a/app/src/main/res/drawable/shadow_down.xml
+++ b/app/src/main/res/drawable/shadow_down.xml
@@ -3,7 +3,7 @@
        android:shape="rectangle">
     <gradient
         android:angle="90"
-        android:endColor="#34000000"
+        android:endColor="@color/twenty_percent_black_overlay"
         android:centerColor="#11000000"
         android:startColor="#00000000" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shadow_up.xml b/app/src/main/res/drawable/shadow_up.xml
index b0f55dc9..98070e90 100644
--- a/app/src/main/res/drawable/shadow_up.xml
+++ b/app/src/main/res/drawable/shadow_up.xml
@@ -3,7 +3,7 @@
        android:shape="rectangle">
     <gradient
         android:angle="270"
-        android:endColor="#34000000"
+        android:endColor="@color/twenty_percent_black_overlay"
         android:centerColor="#11000000"
         android:startColor="#00000000" />
 </shape>
\ No newline at end of file
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 229a5455..4d79d777 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="#33000000">
+        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 7053e103..38a85e06 100644
--- a/app/src/main/res/layout/fragment_flat_player.xml
+++ b/app/src/main/res/layout/fragment_flat_player.xml
@@ -4,10 +4,21 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <View
-        android:id="@+id/player_status_bar"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/status_bar_padding" />
+    <FrameLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+
+        <View
+            android:id="@+id/player_status_bar"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/status_bar_padding" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/status_bar_padding"
+            android:background="@color/twenty_percent_black_overlay" />
+
+    </FrameLayout>
 
     <com.sothree.slidinguppanel.SlidingUpPanelLayout android:id="@+id/player_sliding_layout"
         xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/fragment_flat_player_playback_controls.xml b/app/src/main/res/layout/fragment_flat_player_playback_controls.xml
index ae4809d0..f7a1cf7b 100644
--- a/app/src/main/res/layout/fragment_flat_player_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_flat_player_playback_controls.xml
@@ -10,7 +10,7 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="@dimen/progress_container_height"
-        android:background="#33000000">
+        android:background="@color/twenty_percent_black_overlay">
 
         <TextView
             android:id="@+id/player_song_current_progress"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
new file mode 100644
index 00000000..a422df29
--- /dev/null
+++ b/app/src/main/res/values/colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="twenty_percent_black_overlay">#34000000</color>
+</resources>
\ No newline at end of file