From 5d3e3687f9098986aec73a28dd40cb3ae12e95ed Mon Sep 17 00:00:00 2001
From: pachecosf <austinwim@gmail.com>
Date: Wed, 16 Jan 2019 18:26:42 -0800
Subject: Adding some highlighting of drawer items

---
 core/src/main/res/values/attrs.xml  | 1 +
 core/src/main/res/values/styles.xml | 9 +++++++++
 2 files changed, 10 insertions(+)

(limited to 'core/src/main/res/values')

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">
-- 
cgit v1.2.3


From 43642a5e6bc8fb242994766eea1539f99cbc7442 Mon Sep 17 00:00:00 2001
From: pachecosf <austinwim@gmail.com>
Date: Wed, 16 Jan 2019 20:51:54 -0800
Subject: adding highlighting of drawer item functunality

---
 core/src/main/res/values/styles.xml | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'core/src/main/res/values')

diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index 07bcad2df..96f3fb043 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -377,16 +377,12 @@
 
     <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">
-- 
cgit v1.2.3


From ecff66eff6de243065b9d40a969bd0eaf83348c6 Mon Sep 17 00:00:00 2001
From: pachecosf <austinwim@gmail.com>
Date: Thu, 17 Jan 2019 12:29:23 -0800
Subject: fixed styles

---
 core/src/main/res/values/styles.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'core/src/main/res/values')

diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index 96f3fb043..2c82b9d1c 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -11,6 +11,7 @@
         <item name="progressBarTheme">@style/ProgressBarLight</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="action_bar_icon_color">@color/grey600</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>
@@ -170,6 +171,7 @@
 
     <style name="Theme.Base.AntennaPod.TrueBlack" parent="Theme.Base.AntennaPod.Dark">
         <item name="progressBarTheme">@style/ProgressBarTrueBlack</item>
+        <item type="attr" name="nav_drawer_list_selector">@drawable/drawer_list_selector_trueblack</item>
         <item type="attr" name="non_transparent_background">@color/black</item>
         <item type="attr" name="overlay_background">@color/black</item>
         <item type="attr" name="overlay_drawable">@drawable/overlay_drawable_dark_trueblack</item>
@@ -272,8 +274,6 @@
     </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>
@@ -358,6 +358,7 @@
 
     <style name="Theme.Base.AntennaPod.TrueBlack.NoTitle" parent="Theme.Base.AntennaPod.Dark.NoTitle">
         <item name="progressBarTheme">@style/ProgressBarTrueBlack</item>
+        <item type="attr" name="nav_drawer_list_selector">@drawable/drawer_list_selector_trueblack</item>
         <item type="attr" name="non_transparent_background">@color/black</item>
         <item type="attr" name="overlay_background">@color/black</item>
         <item type="attr" name="overlay_drawable">@drawable/overlay_drawable_dark_trueblack</item>
-- 
cgit v1.2.3


From 7da762b8ea824004f708cbcacc14f6b15aa9d17b Mon Sep 17 00:00:00 2001
From: pachecosf <austinwim@gmail.com>
Date: Thu, 17 Jan 2019 16:18:50 -0800
Subject: Changed implementation using themeUtils instead

---
 core/src/main/res/values/attrs.xml  | 1 -
 core/src/main/res/values/colors.xml | 1 +
 core/src/main/res/values/styles.xml | 6 ------
 3 files changed, 1 insertion(+), 7 deletions(-)

(limited to 'core/src/main/res/values')

diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml
index c6ac68715..16a6d9185 100644
--- a/core/src/main/res/values/attrs.xml
+++ b/core/src/main/res/values/attrs.xml
@@ -1,7 +1,6 @@
 <?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/colors.xml b/core/src/main/res/values/colors.xml
index eec4f76ce..75c3169fb 100644
--- a/core/src/main/res/values/colors.xml
+++ b/core/src/main/res/values/colors.xml
@@ -29,6 +29,7 @@
     <!-- Theme colors -->
     <color name="primary_light">#FFFFFF</color>
     <color name="primary_darktheme">#212121</color>
+    <color name="darktheme_drawer">#3B3B3B</color>
 
     <color name="highlight_light">#DDDDDD</color>
     <color name="highlight_dark">#414141</color>
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index 2c82b9d1c..79773619f 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -11,7 +11,6 @@
         <item name="progressBarTheme">@style/ProgressBarLight</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="action_bar_icon_color">@color/grey600</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>
@@ -95,7 +94,6 @@
         <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>
@@ -171,7 +169,6 @@
 
     <style name="Theme.Base.AntennaPod.TrueBlack" parent="Theme.Base.AntennaPod.Dark">
         <item name="progressBarTheme">@style/ProgressBarTrueBlack</item>
-        <item type="attr" name="nav_drawer_list_selector">@drawable/drawer_list_selector_trueblack</item>
         <item type="attr" name="non_transparent_background">@color/black</item>
         <item type="attr" name="overlay_background">@color/black</item>
         <item type="attr" name="overlay_drawable">@drawable/overlay_drawable_dark_trueblack</item>
@@ -200,7 +197,6 @@
         <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>
@@ -283,7 +279,6 @@
         <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>
@@ -358,7 +353,6 @@
 
     <style name="Theme.Base.AntennaPod.TrueBlack.NoTitle" parent="Theme.Base.AntennaPod.Dark.NoTitle">
         <item name="progressBarTheme">@style/ProgressBarTrueBlack</item>
-        <item type="attr" name="nav_drawer_list_selector">@drawable/drawer_list_selector_trueblack</item>
         <item type="attr" name="non_transparent_background">@color/black</item>
         <item type="attr" name="overlay_background">@color/black</item>
         <item type="attr" name="overlay_drawable">@drawable/overlay_drawable_dark_trueblack</item>
-- 
cgit v1.2.3


From a80435a03becc7ae874541dec77594caca4e11d0 Mon Sep 17 00:00:00 2001
From: pachecosf <austinwim@gmail.com>
Date: Fri, 18 Jan 2019 12:09:24 -0800
Subject: switched implementation to ussing attr

---
 core/src/main/res/values/attrs.xml  |  1 +
 core/src/main/res/values/colors.xml |  4 ++--
 core/src/main/res/values/styles.xml | 10 ++++++++--
 3 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'core/src/main/res/values')

diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml
index 16a6d9185..48e55768e 100644
--- a/core/src/main/res/values/attrs.xml
+++ b/core/src/main/res/values/attrs.xml
@@ -67,6 +67,7 @@
     <attr name="overlay_background" format="color"/>
 
     <attr name="nav_drawer_background" format="color"/>
+    <attr name="drawer_activated_color" format="color"/>
 
     <attr name="about_screen_background" format="color"/>
     <attr name="about_screen_card_background" format="color"/>
diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml
index 75c3169fb..5d820f3cf 100644
--- a/core/src/main/res/values/colors.xml
+++ b/core/src/main/res/values/colors.xml
@@ -29,8 +29,8 @@
     <!-- Theme colors -->
     <color name="primary_light">#FFFFFF</color>
     <color name="primary_darktheme">#212121</color>
-    <color name="darktheme_drawer">#3B3B3B</color>
-
+    <color name="nav_drawer_background_dark">#3B3B3B</color>
+    <color name="nav_drawer_highlighted_dark">#212121</color>
     <color name="highlight_light">#DDDDDD</color>
     <color name="highlight_dark">#414141</color>
     <color name="highlight_trueblack">#414141</color>
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index 79773619f..363a69a63 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -43,6 +43,7 @@
         <item type="attr" name="dragview_background">@drawable/ic_drag_vertical_grey600_48dp</item>
         <item type="attr" name="dragview_float_background">@color/white</item>
         <item type="attr" name="nav_drawer_background">@color/white</item>
+        <item type="attr" name="drawer_activated_color">@color/highlight_light</item>
         <item type="attr" name="ic_new">@drawable/ic_new_releases_grey600_24dp</item>
         <item type="attr" name="ic_history">@drawable/ic_history_grey600_24dp</item>
         <item type="attr" name="ic_folder">@drawable/ic_folder_grey600_24dp</item>
@@ -125,7 +126,8 @@
         <item type="attr" name="overlay_drawable">@drawable/overlay_drawable_dark</item>
         <item type="attr" name="dragview_background">@drawable/ic_drag_vertical_white_48dp</item>
         <item type="attr" name="dragview_float_background">@color/black</item>
-        <item type="attr" name="nav_drawer_background">#3B3B3B</item>
+        <item type="attr" name="nav_drawer_background">@color/nav_drawer_background_dark</item>
+        <item type="attr" name="drawer_activated_color">@color/nav_drawer_highlighted_dark</item>
         <item type="attr" name="ic_new">@drawable/ic_new_releases_white_24dp</item>
         <item type="attr" name="ic_history">@drawable/ic_history_white_24dp</item>
         <item type="attr" name="ic_folder">@drawable/ic_folder_white_24dp</item>
@@ -175,6 +177,7 @@
         <item type="attr" name="dragview_background">@drawable/ic_drag_vertical_white_48dp</item>
         <item type="attr" name="dragview_float_background">@color/black</item>
         <item type="attr" name="nav_drawer_background">@color/black</item>
+        <item type="attr" name="drawer_activated_color">@color/highlight_trueblack</item>
         <item name="android:textColorPrimary">@color/white</item>
         <item name="android:color">@color/white</item>
         <item name="android:colorBackground">@color/black</item>
@@ -228,6 +231,7 @@
         <item type="attr" name="dragview_background">@drawable/ic_drag_vertical_grey600_48dp</item>
         <item type="attr" name="dragview_float_background">@color/white</item>
         <item type="attr" name="nav_drawer_background">@color/white</item>
+        <item type="attr" name="drawer_activated_color">@color/highlight_light</item>
         <item type="attr" name="ic_new">@drawable/ic_new_releases_grey600_24dp</item>
         <item type="attr" name="ic_history">@drawable/ic_history_grey600_24dp</item>
         <item type="attr" name="ic_folder">@drawable/ic_folder_grey600_24dp</item>
@@ -309,7 +313,8 @@
         <item type="attr" name="overlay_drawable">@drawable/overlay_drawable_dark</item>
         <item type="attr" name="dragview_background">@drawable/ic_drag_vertical_white_48dp</item>
         <item type="attr" name="dragview_float_background">@color/black</item>
-        <item type="attr" name="nav_drawer_background">#3B3B3B</item>
+        <item type="attr" name="nav_drawer_background">@color/nav_drawer_background_dark</item>
+        <item type="attr" name="drawer_activated_color">@color/nav_drawer_highlighted_dark</item>
         <item type="attr" name="ic_new">@drawable/ic_new_releases_white_24dp</item>
         <item type="attr" name="ic_history">@drawable/ic_history_white_24dp</item>
         <item type="attr" name="ic_folder">@drawable/ic_folder_white_24dp</item>
@@ -359,6 +364,7 @@
         <item type="attr" name="dragview_background">@drawable/ic_drag_vertical_white_48dp</item>
         <item type="attr" name="dragview_float_background">@color/black</item>
         <item type="attr" name="nav_drawer_background">@color/black</item>
+        <item type="attr" name="drawer_activated_color">@color/highlight_trueblack</item>
         <item type="attr" name="currently_playing_background">@color/highlight_trueblack</item>
         <item name="android:textColorPrimary">@color/white</item>
         <item name="android:color">@color/white</item>
-- 
cgit v1.2.3