From 27e56754e3af97f10e5aa646aecedfa423d9ef97 Mon Sep 17 00:00:00 2001
From: Karim Abou Zeid <karim23697@gmail.com>
Date: Wed, 17 Jun 2015 02:32:22 +0200
Subject: [PATCH] Switched back to white notification. Added back ripple to
 notification.

---
 .../gramophone/util/PreferenceUtils.java      |  2 +-
 .../res/drawable/notification_selector.xml    |  9 +++++++
 .../res/layout/notification_controller.xml    | 10 +++++--
 .../layout/notification_controller_big.xml    | 27 +++++++++----------
 app/src/main/res/values-v21/colors.xml        |  3 ++-
 app/src/main/res/values-v21/styles.xml        |  2 +-
 app/src/main/res/values/colors.xml            |  4 ++-
 app/src/main/res/xml/pref_colors.xml          |  2 +-
 8 files changed, 38 insertions(+), 21 deletions(-)
 create mode 100644 app/src/main/res/drawable/notification_selector.xml

diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtils.java b/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtils.java
index 818c28d2..156302a7 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtils.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtils.java
@@ -116,7 +116,7 @@ public final class PreferenceUtils {
     }
 
     public final boolean coloredNotification() {
-        return mPreferences.getBoolean(COLORED_NOTIFICATION, true);
+        return mPreferences.getBoolean(COLORED_NOTIFICATION, false);
     }
 
     public final boolean coloredNavigationBarAlbum() {
diff --git a/app/src/main/res/drawable/notification_selector.xml b/app/src/main/res/drawable/notification_selector.xml
new file mode 100644
index 00000000..4cbc5ae3
--- /dev/null
+++ b/app/src/main/res/drawable/notification_selector.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_activated="true" android:state_pressed="true" android:drawable="@color/activated_selected_dark" />
+    <item android:state_activated="true" android:drawable="@color/ripple_material_dark" />
+    <item android:state_pressed="true" android:drawable="@color/ripple_material_dark" />
+    <item android:drawable="@android:color/transparent" />
+
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/notification_controller.xml b/app/src/main/res/layout/notification_controller.xml
index 29a5a3af..c2b3758a 100644
--- a/app/src/main/res/layout/notification_controller.xml
+++ b/app/src/main/res/layout/notification_controller.xml
@@ -63,7 +63,7 @@
             android:gravity="bottom"
             android:singleLine="true"
             android:textAppearance="@style/Theme.MaterialMusic.Notification.Title"
-            android:textColor="@color/abc_primary_text_material_dark"
+            android:textColor="@color/notification_default_content_color"
             tools:ignore="NestedWeights" />
 
         <TextView
@@ -76,7 +76,7 @@
             android:fadingEdge="horizontal"
             android:singleLine="true"
             android:textAppearance="@style/Theme.MaterialMusic.Notification"
-            android:textColor="@color/abc_secondary_text_material_dark" />
+            android:textColor="@color/notification_default_secondary_content_color" />
     </LinearLayout>
 
     <LinearLayout
@@ -98,8 +98,10 @@
             android:layout_marginLeft="2dp"
             android:layout_marginRight="2dp"
             android:layout_weight="1"
+            android:background="@drawable/notification_selector"
             android:gravity="center"
             android:src="@drawable/ic_skip_previous_white_36dp"
+            android:tint="@color/notification_default_content_color"
             tools:ignore="ContentDescription" />
 
         <ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
@@ -110,8 +112,10 @@
             android:layout_marginLeft="2dp"
             android:layout_marginRight="2dp"
             android:layout_weight="1"
+            android:background="@drawable/notification_selector"
             android:gravity="center"
             android:src="@drawable/ic_play_arrow_white_36dp"
+            android:tint="@color/notification_default_content_color"
             tools:ignore="ContentDescription" />
 
         <ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
@@ -122,8 +126,10 @@
             android:layout_marginLeft="2dp"
             android:layout_marginRight="2dp"
             android:layout_weight="1"
+            android:background="@drawable/notification_selector"
             android:gravity="center"
             android:src="@drawable/ic_skip_next_white_36dp"
+            android:tint="@color/notification_default_content_color"
             tools:ignore="ContentDescription" />
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/notification_controller_big.xml b/app/src/main/res/layout/notification_controller_big.xml
index 3ae0a71d..472f7fe0 100644
--- a/app/src/main/res/layout/notification_controller_big.xml
+++ b/app/src/main/res/layout/notification_controller_big.xml
@@ -36,9 +36,12 @@
         android:layout_height="36dp"
         android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
-        android:layout_marginLeft="2dp"
+        android:layout_marginEnd="2dp"
         android:layout_marginRight="2dp"
+        android:layout_marginTop="2dp"
+        android:background="@drawable/notification_selector"
         android:src="@drawable/ic_close_white_24dp"
+        android:tint="@color/notification_default_content_color"
         tools:ignore="ContentDescription" />
 
     <LinearLayout
@@ -63,7 +66,7 @@
             android:fadingEdge="horizontal"
             android:singleLine="true"
             android:textAppearance="@style/Theme.MaterialMusic.Notification.Title"
-            android:textColor="@color/abc_primary_text_material_dark" />
+            android:textColor="@color/notification_default_content_color" />
 
         <TextView
             android:id="@+id/text"
@@ -76,7 +79,7 @@
             android:fadingEdge="horizontal"
             android:singleLine="true"
             android:textAppearance="@style/Theme.MaterialMusic.Notification"
-            android:textColor="@color/abc_secondary_text_material_dark" />
+            android:textColor="@color/notification_default_secondary_content_color" />
 
         <TextView
             android:id="@+id/text2"
@@ -88,7 +91,7 @@
             android:fadingEdge="horizontal"
             android:singleLine="true"
             android:textAppearance="@style/Theme.MaterialMusic.Notification"
-            android:textColor="@color/abc_secondary_text_material_dark" />
+            android:textColor="@color/notification_default_secondary_content_color" />
     </LinearLayout>
 
     <LinearLayout
@@ -112,8 +115,10 @@
             android:layout_marginLeft="2dp"
             android:layout_marginRight="2dp"
             android:layout_weight="1"
+            android:background="@drawable/notification_selector"
             android:gravity="center"
             android:src="@drawable/ic_skip_previous_white_36dp"
+            android:tint="@color/notification_default_content_color"
             tools:ignore="ContentDescription" />
 
         <ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
@@ -124,8 +129,10 @@
             android:layout_marginLeft="2dp"
             android:layout_marginRight="2dp"
             android:layout_weight="1"
+            android:background="@drawable/notification_selector"
             android:gravity="center"
             android:src="@drawable/ic_play_arrow_white_36dp"
+            android:tint="@color/notification_default_content_color"
             tools:ignore="ContentDescription" />
 
         <ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
@@ -136,18 +143,10 @@
             android:layout_marginLeft="2dp"
             android:layout_marginRight="2dp"
             android:layout_weight="1"
+            android:background="@drawable/notification_selector"
             android:gravity="center"
             android:src="@drawable/ic_skip_next_white_36dp"
+            android:tint="@color/notification_default_content_color"
             tools:ignore="ContentDescription" />
     </LinearLayout>
-
-    <ImageView
-        android:id="@+id/action_divider"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_above="@id/media_actions"
-        android:layout_toEndOf="@id/icon"
-        android:layout_toRightOf="@id/icon"
-        android:background="@drawable/notification_template_divider_media"
-        tools:ignore="ContentDescription" />
 </RelativeLayout>
diff --git a/app/src/main/res/values-v21/colors.xml b/app/src/main/res/values-v21/colors.xml
index d4cc48df..8269d51d 100644
--- a/app/src/main/res/values-v21/colors.xml
+++ b/app/src/main/res/values-v21/colors.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="notification_buttons_tint">#de000000</color>
+    <color name="notification_default_content_color">#de000000</color>
+    <color name="notification_default_secondary_content_color">#aa000000</color>
 
     <!--must be solid colors so the ripple will not be semi transparent. Note: the color have no effect on the ripple-->
     <!--<color name="button_selected">#FFFFFFFF</color>-->
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index 7752e9e6..63cc3f58 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -24,7 +24,7 @@
 
     <style name="NotificationButton" parent="NotificationButtonParent">
         <item name="android:background">@drawable/notification_selector</item>
-        <item name="android:tint">@color/notification_buttons_tint</item>
+        <item name="android:tint">@color/notification_default_content_color</item>
     </style>
 
     <style name="MusicProgressSlider" parent="MusicProgressSliderParent">
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 9f00a5a4..0ec0d785 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -24,7 +24,9 @@
     <color name="sliding_tabs_activated">#FFFFFF</color>
     <color name="sliding_tabs_deactivated">#99FFFFFF</color>
 
-    <color name="default_notification_color">@color/grey_800</color>
+    <color name="default_notification_color">@android:color/transparent</color>
+    <color name="notification_default_content_color">#deFFFFFF</color>
+    <color name="notification_default_secondary_content_color">#aaFFFFFF</color>
 
     <!--notification-->
     <drawable name="notification_template_divider_media">#29ffffff</drawable>
diff --git a/app/src/main/res/xml/pref_colors.xml b/app/src/main/res/xml/pref_colors.xml
index 075dd4c2..66830c45 100644
--- a/app/src/main/res/xml/pref_colors.xml
+++ b/app/src/main/res/xml/pref_colors.xml
@@ -32,7 +32,7 @@
 
         <CheckBoxPreference
             android:layout="@layout/preference_custom"
-            android:defaultValue="true"
+            android:defaultValue="false"
             android:key="colored_notification"
             android:title="@string/pref_title_colored_notification"
             android:summary="@string/pref_summary_colored_notification"