From 5dd57ef3ed353c5dbe09d3ff3c99ba424f383021 Mon Sep 17 00:00:00 2001
From: Karim Abou Zeid <karim23697@gmail.com>
Date: Thu, 21 May 2015 18:27:22 +0200
Subject: [PATCH] Replaced the selectors with the ones from cabinet to fix the
 ripple flickering bug.

---
 .../adapter/songadapter/SongAdapter.java          |  2 ++
 .../res/drawable-v21/list_ripple_selector.xml     |  6 ------
 .../drawable-v21/list_ripple_selector_dark.xml    |  6 ------
 .../res/drawable-v21/rect_ripple_selector.xml     | 15 +++++++++++++++
 .../drawable-v21/rect_ripple_selector_dark.xml    | 15 +++++++++++++++
 .../res/drawable-v21/round_ripple_selector.xml    |  5 +++--
 .../drawable-v21/round_ripple_selector_dark.xml   |  6 ------
 .../drawable-v21/round_ripple_selector_mask.xml   |  6 +++---
 app/src/main/res/drawable/list_activated.xml      |  5 -----
 app/src/main/res/drawable/list_activated_dark.xml |  5 -----
 app/src/main/res/drawable/list_selector.xml       |  5 -----
 app/src/main/res/drawable/list_selector_dark.xml  |  5 -----
 app/src/main/res/drawable/rect_selected.xml       |  5 -----
 app/src/main/res/drawable/rect_selected_dark.xml  |  5 -----
 app/src/main/res/drawable/rect_selector.xml       |  6 ++++--
 app/src/main/res/drawable/rect_selector_dark.xml  |  6 ++++--
 app/src/main/res/drawable/round_selected.xml      |  6 +++---
 app/src/main/res/drawable/round_selected_dark.xml |  6 +++---
 app/src/main/res/drawable/round_selector.xml      |  5 ++++-
 app/src/main/res/drawable/round_selector_dark.xml |  5 ++++-
 app/src/main/res/drawable/transparent.xml         |  5 -----
 .../main/res/layout/item_navigation_drawer.xml    |  2 +-
 app/src/main/res/values-v21/styles.xml            |  8 +++-----
 app/src/main/res/values/styles_parents.xml        |  2 --
 24 files changed, 64 insertions(+), 78 deletions(-)
 delete mode 100644 app/src/main/res/drawable-v21/list_ripple_selector.xml
 delete mode 100644 app/src/main/res/drawable-v21/list_ripple_selector_dark.xml
 create mode 100644 app/src/main/res/drawable-v21/rect_ripple_selector.xml
 create mode 100644 app/src/main/res/drawable-v21/rect_ripple_selector_dark.xml
 delete mode 100644 app/src/main/res/drawable-v21/round_ripple_selector_dark.xml
 delete mode 100644 app/src/main/res/drawable/list_activated.xml
 delete mode 100644 app/src/main/res/drawable/list_activated_dark.xml
 delete mode 100755 app/src/main/res/drawable/list_selector.xml
 delete mode 100755 app/src/main/res/drawable/list_selector_dark.xml
 delete mode 100644 app/src/main/res/drawable/rect_selected.xml
 delete mode 100644 app/src/main/res/drawable/rect_selected_dark.xml
 delete mode 100755 app/src/main/res/drawable/transparent.xml

diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/SongAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/SongAdapter.java
index 0b844e34..badb0ba9 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/SongAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/SongAdapter.java
@@ -104,9 +104,11 @@ public class SongAdapter extends RecyclerView.Adapter<SongAdapter.ViewHolder> {
         final ImageView albumArt;
         final View separator;
         final View short_separator;
+        final View view;
 
         public ViewHolder(View itemView) {
             super(itemView);
+            view = itemView;
             songTitle = (TextView) itemView.findViewById(R.id.song_title);
             songInfo = (TextView) itemView.findViewById(R.id.song_info);
             albumArt = (ImageView) itemView.findViewById(R.id.album_art);
diff --git a/app/src/main/res/drawable-v21/list_ripple_selector.xml b/app/src/main/res/drawable-v21/list_ripple_selector.xml
deleted file mode 100644
index 07078646..00000000
--- a/app/src/main/res/drawable-v21/list_ripple_selector.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?android:colorControlHighlight">
-
-    <item android:drawable="@drawable/list_selector" />
-
-</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/list_ripple_selector_dark.xml b/app/src/main/res/drawable-v21/list_ripple_selector_dark.xml
deleted file mode 100644
index 538c3e83..00000000
--- a/app/src/main/res/drawable-v21/list_ripple_selector_dark.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?android:colorControlHighlight">
-
-    <item android:drawable="@drawable/list_selector_dark" />
-
-</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/rect_ripple_selector.xml b/app/src/main/res/drawable-v21/rect_ripple_selector.xml
new file mode 100644
index 00000000..01fc385f
--- /dev/null
+++ b/app/src/main/res/drawable-v21/rect_ripple_selector.xml
@@ -0,0 +1,15 @@
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+        android:color="@color/ripple_material_light">
+
+    <item
+        android:id="@android:id/mask"
+        android:drawable="@android:color/white" />
+    <item>
+        <selector>
+            <item
+                android:state_activated="true"
+                android:drawable="@color/ripple_material_light" />
+        </selector>
+    </item>
+
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/rect_ripple_selector_dark.xml b/app/src/main/res/drawable-v21/rect_ripple_selector_dark.xml
new file mode 100644
index 00000000..bc94abd5
--- /dev/null
+++ b/app/src/main/res/drawable-v21/rect_ripple_selector_dark.xml
@@ -0,0 +1,15 @@
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+        android:color="@color/ripple_material_dark">
+
+    <item
+        android:id="@android:id/mask"
+        android:drawable="@android:color/white" />
+    <item>
+        <selector>
+            <item
+                android:state_activated="true"
+                android:drawable="@color/ripple_material_dark" />
+        </selector>
+    </item>
+
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/round_ripple_selector.xml b/app/src/main/res/drawable-v21/round_ripple_selector.xml
index 8b0fd07b..b565a03a 100644
--- a/app/src/main/res/drawable-v21/round_ripple_selector.xml
+++ b/app/src/main/res/drawable-v21/round_ripple_selector.xml
@@ -1,7 +1,8 @@
-<ripple
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
     android:color="?android:colorControlHighlight">
+
     <item
         android:id="@android:id/mask"
         android:drawable="@drawable/round_ripple_selector_mask" />
+
 </ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/round_ripple_selector_dark.xml b/app/src/main/res/drawable-v21/round_ripple_selector_dark.xml
deleted file mode 100644
index da232ca5..00000000
--- a/app/src/main/res/drawable-v21/round_ripple_selector_dark.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-        android:color="?android:colorControlHighlight">
-
-    <item android:drawable="@drawable/round_selector_dark" />
-
-</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/round_ripple_selector_mask.xml b/app/src/main/res/drawable-v21/round_ripple_selector_mask.xml
index 696455fc..04c6208f 100644
--- a/app/src/main/res/drawable-v21/round_ripple_selector_mask.xml
+++ b/app/src/main/res/drawable-v21/round_ripple_selector_mask.xml
@@ -1,5 +1,5 @@
-<shape
-    android:shape="oval"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="oval">
     <solid android:color="@android:color/white" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/list_activated.xml b/app/src/main/res/drawable/list_activated.xml
deleted file mode 100644
index 1b9ebe6e..00000000
--- a/app/src/main/res/drawable/list_activated.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<shape
-    android:shape="rectangle"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#26000000" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/list_activated_dark.xml b/app/src/main/res/drawable/list_activated_dark.xml
deleted file mode 100644
index 1c431df7..00000000
--- a/app/src/main/res/drawable/list_activated_dark.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<shape
-    android:shape="rectangle"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#26FFFFFF" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/list_selector.xml b/app/src/main/res/drawable/list_selector.xml
deleted file mode 100755
index d12dbb6f..00000000
--- a/app/src/main/res/drawable/list_selector.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/list_activated" android:state_activated="true" />
-    <item android:drawable="@drawable/rect_selected" android:state_pressed="true" />
-    <item android:drawable="@drawable/transparent" />
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/list_selector_dark.xml b/app/src/main/res/drawable/list_selector_dark.xml
deleted file mode 100755
index 7c2d6d11..00000000
--- a/app/src/main/res/drawable/list_selector_dark.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/list_activated_dark" android:state_activated="true" />
-    <item android:drawable="@drawable/rect_selected_dark" android:state_pressed="true" />
-    <item android:drawable="@drawable/transparent" />
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rect_selected.xml b/app/src/main/res/drawable/rect_selected.xml
deleted file mode 100644
index 105413e5..00000000
--- a/app/src/main/res/drawable/rect_selected.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="#B3E4E4E4" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rect_selected_dark.xml b/app/src/main/res/drawable/rect_selected_dark.xml
deleted file mode 100644
index ea26e583..00000000
--- a/app/src/main/res/drawable/rect_selected_dark.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="#26FFFFFF" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rect_selector.xml b/app/src/main/res/drawable/rect_selector.xml
index 7867e338..8ac20313 100644
--- a/app/src/main/res/drawable/rect_selector.xml
+++ b/app/src/main/res/drawable/rect_selector.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_pressed="true" android:drawable="@drawable/rect_selected" />
-    <item android:drawable="@drawable/transparent" />
+    <item android:state_activated="true" android:state_pressed="true" android:drawable="@color/activated_selected_light" />
+    <item android:state_activated="true" android:drawable="@color/ripple_material_light" />
+    <item android:state_pressed="true" android:drawable="@color/ripple_material_light" />
+    <item android:drawable="@android:color/transparent" />
 
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rect_selector_dark.xml b/app/src/main/res/drawable/rect_selector_dark.xml
index fa2978e0..4cbc5ae3 100644
--- a/app/src/main/res/drawable/rect_selector_dark.xml
+++ b/app/src/main/res/drawable/rect_selector_dark.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_pressed="true" android:drawable="@drawable/rect_selected_dark" />
-    <item android:drawable="@drawable/transparent" />
+    <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/drawable/round_selected.xml b/app/src/main/res/drawable/round_selected.xml
index 1b25273c..6903efe2 100644
--- a/app/src/main/res/drawable/round_selected.xml
+++ b/app/src/main/res/drawable/round_selected.xml
@@ -1,5 +1,5 @@
-<shape
-    android:shape="oval"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="oval">
     <solid android:color="@color/ripple_material_light" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/round_selected_dark.xml b/app/src/main/res/drawable/round_selected_dark.xml
index 57f568c9..6912e24a 100644
--- a/app/src/main/res/drawable/round_selected_dark.xml
+++ b/app/src/main/res/drawable/round_selected_dark.xml
@@ -1,5 +1,5 @@
-<shape
-    android:shape="oval"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="oval">
     <solid android:color="@color/ripple_material_dark" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/round_selector.xml b/app/src/main/res/drawable/round_selector.xml
index 201f5062..7c07220e 100644
--- a/app/src/main/res/drawable/round_selector.xml
+++ b/app/src/main/res/drawable/round_selector.xml
@@ -1,4 +1,7 @@
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" android:exitFadeDuration="@android:integer/config_shortAnimTime">
+
     <item android:state_pressed="true" android:drawable="@drawable/round_selected" />
     <item android:drawable="@android:color/transparent" />
+
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/round_selector_dark.xml b/app/src/main/res/drawable/round_selector_dark.xml
index 5d4d429e..aef563f3 100644
--- a/app/src/main/res/drawable/round_selector_dark.xml
+++ b/app/src/main/res/drawable/round_selector_dark.xml
@@ -1,4 +1,7 @@
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" android:exitFadeDuration="@android:integer/config_shortAnimTime">
+
     <item android:state_pressed="true" android:drawable="@drawable/round_selected_dark" />
     <item android:drawable="@android:color/transparent" />
+
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/transparent.xml b/app/src/main/res/drawable/transparent.xml
deleted file mode 100755
index 6c2fdb96..00000000
--- a/app/src/main/res/drawable/transparent.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="rectangle">
-    <solid android:color="@android:color/transparent"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_navigation_drawer.xml b/app/src/main/res/layout/item_navigation_drawer.xml
index 7f48254b..c5143ca8 100644
--- a/app/src/main/res/layout/item_navigation_drawer.xml
+++ b/app/src/main/res/layout/item_navigation_drawer.xml
@@ -17,7 +17,7 @@
         android:id="@+id/container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?list_selector"
+        android:background="?rect_selector"
         android:minHeight="48dp"
         android:orientation="horizontal"
         android:paddingTop="2dp"
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index be9ea085..31649ba0 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -1,17 +1,15 @@
 <resources>
 
     <style name="Theme.MaterialMusic" parent="Theme.MaterialMusic.Base">
-        <item name="round_selector">@drawable/round_ripple_selector_dark</item>
-        <item name="rect_selector">?selectableItemBackground</item>
-        <item name="list_selector">@drawable/list_ripple_selector_dark</item>
+        <item name="round_selector">@drawable/round_ripple_selector</item>
+        <item name="rect_selector">@drawable/rect_ripple_selector_dark</item>
 
         <item name="android:statusBarColor">@android:color/transparent</item>
     </style>
 
     <style name="Theme.MaterialMusic.Light" parent="Theme.MaterialMusic.Base.Light">
         <item name="round_selector">@drawable/round_ripple_selector</item>
-        <item name="rect_selector">?selectableItemBackground</item>
-        <item name="list_selector">@drawable/list_ripple_selector</item>
+        <item name="rect_selector">@drawable/rect_ripple_selector</item>
 
         <item name="android:statusBarColor">@android:color/transparent</item>
     </style>
diff --git a/app/src/main/res/values/styles_parents.xml b/app/src/main/res/values/styles_parents.xml
index 55038673..d12ae983 100644
--- a/app/src/main/res/values/styles_parents.xml
+++ b/app/src/main/res/values/styles_parents.xml
@@ -17,7 +17,6 @@
             @color/materialmusic_dark_navigation_drawer_background_color
         </item>
 
-        <item name="list_selector">@drawable/list_selector_dark</item>
         <item name="round_selector">@drawable/round_selector_dark</item>
         <item name="rect_selector">@drawable/rect_selector_dark</item>
         <item name="separator_color">@color/materialmusic_dark_separator_color</item>
@@ -49,7 +48,6 @@
             @color/materialmusic_navigation_drawer_background_color
         </item>
 
-        <item name="list_selector">@drawable/list_selector</item>
         <item name="round_selector">@drawable/round_selector</item>
         <item name="rect_selector">@drawable/rect_selector</item>
         <item name="separator_color">@color/materialmusic_separator_color</item>