Merge pull request #1 from pachecosf/add-highlighting-of-drawer-item

Adding some highlighting of drawer items

9 files changed, 36 insertions, 1 deletions

diff --git a/app/src/main/res/layout/nav_listitem.xml b/app/src/main/res/layout/nav_listitem.xml
index c140533e6..d60165d85 100644
--- a/app/src/main/res/layout/nav_listitem.xml
+++ b/app/src/main/res/layout/nav_listitem.xml
@@ -5,7 +5,8 @@
                 android:orientation="vertical"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/listitem_iconwithtext_height"
-                tools:background="@android:color/darker_gray">
+                tools:background="@android:color/darker_gray"
+                android:background= "?attr/nav_drawer_list_selector">
 
     <ImageView
         android:id="@+id/imgvCover"
diff --git a/core/src/main/res/drawable/activated_color_dark.xml b/core/src/main/res/drawable/activated_color_dark.xml
new file mode 100644
index 000000000..75e052c12
--- /dev/null
+++ b/core/src/main/res/drawable/activated_color_dark.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/highlight_dark"/>
+</shape>
\ No newline at end of file
diff --git a/core/src/main/res/drawable/activated_color_light.xml b/core/src/main/res/drawable/activated_color_light.xml
new file mode 100644
index 000000000..6e547d8d9
--- /dev/null
+++ b/core/src/main/res/drawable/activated_color_light.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/highlight_light"/>
+</shape>
\ No newline at end of file
diff --git a/core/src/main/res/drawable/activated_color_trueblack.xml b/core/src/main/res/drawable/activated_color_trueblack.xml
new file mode 100644
index 000000000..2b3036f49
--- /dev/null
+++ b/core/src/main/res/drawable/activated_color_trueblack.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/highlight_trueblack"/>
+</shape>
\ No newline at end of file
diff --git a/core/src/main/res/drawable/drawer_list_selector_dark.xml b/core/src/main/res/drawable/drawer_list_selector_dark.xml
new file mode 100644
index 000000000..9a1c85d06
--- /dev/null
+++ b/core/src/main/res/drawable/drawer_list_selector_dark.xml
@@ -0,0 +1,4 @@
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_activated="true" android:drawable="@drawable/activated_color_dark" />
+    <item android:drawable="@android:color/transparent" />
+</selector>
\ No newline at end of file
diff --git a/core/src/main/res/drawable/drawer_list_selector_light.xml b/core/src/main/res/drawable/drawer_list_selector_light.xml
new file mode 100644
index 000000000..bd81f2bfd
--- /dev/null
+++ b/core/src/main/res/drawable/drawer_list_selector_light.xml
@@ -0,0 +1,4 @@
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_activated="true" android:drawable="@drawable/activated_color_light" />
+    <item android:drawable="@android:color/transparent" />
+</selector>
\ No newline at end of file
diff --git a/core/src/main/res/drawable/drawer_list_selector_trueblack.xml b/core/src/main/res/drawable/drawer_list_selector_trueblack.xml
new file mode 100644
index 000000000..0694eb4a6
--- /dev/null
+++ b/core/src/main/res/drawable/drawer_list_selector_trueblack.xml
@@ -0,0 +1,4 @@
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_activated="true" android:drawable="@drawable/activated_color_trueblack" />
+    <item android:drawable="@android:color/transparent" />
+</selector>
\ No newline at end of file
diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml
index 16a6d9185..c6ac68715 100644
--- a/core/src/main/res/values/attrs.xml
+++ b/core/src/main/res/values/attrs.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+    <attr name="nav_drawer_list_selector" format="reference"/>
     <attr name="action_bar_icon_color" format="reference"/>
     <attr name="action_about" format="reference"/>
     <attr name="action_search" format="reference"/>
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index 79773619f..07bcad2df 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -94,6 +94,7 @@
         <item name="buttonStyle">@style/Widget.AntennaPod.Button</item>
         <item name="progressBarTheme">@style/ProgressBarDark</item>
         <item name="alertDialogTheme">@style/AntennaPod.Dialog.Dark</item>
+        <item type="attr" name="nav_drawer_list_selector">@drawable/drawer_list_selector_dark</item>
         <item type="attr" name="action_bar_icon_color">@color/white</item>
         <item type="attr" name="storage">@drawable/ic_sd_white_24dp</item>
         <item type="attr" name="ic_swap">@drawable/ic_swap_vertical_white_24dp</item>
@@ -197,6 +198,7 @@
         <item name="colorAccent">@color/holo_blue_light</item>
         <item name="buttonStyle">@style/Widget.AntennaPod.Button</item>
         <item name="alertDialogTheme">@style/AntennaPod.Dialog.Light</item>
+        <item type="attr" name="nav_drawer_list_selector">@drawable/drawer_list_selector_light</item>
         <item type="attr" name="storage">@drawable/ic_sd_grey600_24dp</item>
         <item type="attr" name="ic_swap">@drawable/ic_swap_vertical_grey600_24dp</item>
         <item type="attr" name="statistics">@drawable/ic_poll_box_grey600_24dp</item>
@@ -270,6 +272,8 @@
     </style>
 
     <style name="Theme.Base.AntennaPod.Dark.NoTitle" parent="Theme.AppCompat.NoActionBar">
+        <item name="android:activatedBackgroundIndicator">@drawable/drawer_list_selector_trueblack</item>
+
         <item name="windowActionBar">false</item>
         <item name="windowActionModeOverlay">true</item>
         <item name="progressBarTheme">@style/ProgressBarDark</item>
@@ -279,6 +283,7 @@
         <item name="colorControlNormal">@color/white</item>
         <item name="buttonStyle">@style/Widget.AntennaPod.Button</item>
         <item name="alertDialogTheme">@style/AntennaPod.Dialog.Dark</item>
+        <item type="attr" name="nav_drawer_list_selector">@drawable/drawer_list_selector_dark</item>
         <item type="attr" name="storage">@drawable/ic_sd_white_24dp</item>
         <item type="attr" name="ic_swap">@drawable/ic_swap_vertical_white_24dp</item>
         <item type="attr" name="statistics">@drawable/ic_poll_box_white_24dp</item>
@@ -372,12 +377,16 @@
 
     <style name="Theme.AntennaPod.Dark.Splash" parent="Theme.AppCompat.NoActionBar">
         <item name="android:windowBackground">@drawable/bg_splash</item>
+        <item name="android:activatedBackgroundIndicator">@drawable/drawer_list_selector_trueblack</item>
+
         <item name="colorPrimary">@color/ic_launcher_background</item>
         <item name="colorPrimaryDark">@color/ic_launcher_background</item>
     </style>
 
     <style name="Theme.AntennaPod.VideoPlayer" parent="@style/Theme.AntennaPod.Dark">
         <item name="windowActionBarOverlay">true</item>
+        <item name="android:activatedBackgroundIndicator">@drawable/drawer_list_selector_trueblack</item>
+
     </style>
 
     <style name="AntennaPod.TextView.Heading" parent="@android:style/TextAppearance.Medium">