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

---
 app/src/main/res/layout/nav_listitem.xml                 | 3 ++-
 core/src/main/res/drawable/activated_color_dark.xml      | 4 ++++
 core/src/main/res/drawable/activated_color_light.xml     | 4 ++++
 core/src/main/res/drawable/activated_color_trueblack.xml | 4 ++++
 core/src/main/res/drawable/drawer_list_selector_dark.xml | 4 ++++
 .../src/main/res/drawable/drawer_list_selector_light.xml | 4 ++++
 .../main/res/drawable/drawer_list_selector_trueblack.xml | 4 ++++
 core/src/main/res/values/attrs.xml                       | 1 +
 core/src/main/res/values/styles.xml                      | 9 +++++++++
 9 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 core/src/main/res/drawable/activated_color_dark.xml
 create mode 100644 core/src/main/res/drawable/activated_color_light.xml
 create mode 100644 core/src/main/res/drawable/activated_color_trueblack.xml
 create mode 100644 core/src/main/res/drawable/drawer_list_selector_dark.xml
 create mode 100644 core/src/main/res/drawable/drawer_list_selector_light.xml
 create mode 100644 core/src/main/res/drawable/drawer_list_selector_trueblack.xml

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">

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

---
 app/src/main/res/layout/nav_feedlistitem.xml        | 3 ++-
 core/src/main/res/drawable/activated_color_dark.xml | 2 +-
 core/src/main/res/values/styles.xml                 | 4 ----
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/layout/nav_feedlistitem.xml b/app/src/main/res/layout/nav_feedlistitem.xml
index 9f19157fc..95696b2ce 100644
--- a/app/src/main/res/layout/nav_feedlistitem.xml
+++ b/app/src/main/res/layout/nav_feedlistitem.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
index 75e052c12..826707f9f 100644
--- a/core/src/main/res/drawable/activated_color_dark.xml
+++ b/core/src/main/res/drawable/activated_color_dark.xml
@@ -1,4 +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"/>
+    <solid android:color="@color/overlay_dark"/>
 </shape>
\ No newline at end of file
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">

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

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

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>

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

---
 .../antennapod/adapter/NavListAdapter.java    |  3 ++
 app/src/main/res/layout/nav_feedlistitem.xml  |  3 +-
 app/src/main/res/layout/nav_listitem.xml      |  3 +-
 .../antennapod/core/util/ThemeUtils.java      | 32 +++++++++++++++++++
 .../res/drawable/activated_color_dark.xml     |  4 ---
 .../res/drawable/activated_color_light.xml    |  4 ---
 .../drawable/activated_color_trueblack.xml    |  4 ---
 .../drawable/drawer_list_selector_dark.xml    |  4 ---
 .../drawable/drawer_list_selector_light.xml   |  4 ---
 .../drawer_list_selector_trueblack.xml        |  4 ---
 core/src/main/res/values/attrs.xml            |  1 -
 core/src/main/res/values/colors.xml           |  1 +
 core/src/main/res/values/styles.xml           |  6 ----
 13 files changed, 38 insertions(+), 35 deletions(-)
 delete mode 100644 core/src/main/res/drawable/activated_color_dark.xml
 delete mode 100644 core/src/main/res/drawable/activated_color_light.xml
 delete mode 100644 core/src/main/res/drawable/activated_color_trueblack.xml
 delete mode 100644 core/src/main/res/drawable/drawer_list_selector_dark.xml
 delete mode 100644 core/src/main/res/drawable/drawer_list_selector_light.xml
 delete mode 100644 core/src/main/res/drawable/drawer_list_selector_trueblack.xml

diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
index fbf6b804a..85dcf7a35 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
@@ -34,6 +34,7 @@ import de.danoeh.antennapod.activity.MainActivity;
 import de.danoeh.antennapod.core.feed.Feed;
 import de.danoeh.antennapod.core.glide.ApGlideSettings;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
+import de.danoeh.antennapod.core.util.ThemeUtils;
 import de.danoeh.antennapod.fragment.AddFeedFragment;
 import de.danoeh.antennapod.fragment.AllEpisodesFragment;
 import de.danoeh.antennapod.fragment.DownloadsFragment;
@@ -216,8 +217,10 @@ public class NavListAdapter extends BaseAdapter
             TextView txtvTitle = v.findViewById(R.id.txtvTitle);
             if (position == itemAccess.getSelectedItemIndex()) {
                 txtvTitle.setTypeface(null, Typeface.BOLD);
+                v.setBackgroundResource(ThemeUtils.getSelectionDrawerActivatedColor());
             } else {
                 txtvTitle.setTypeface(null, Typeface.NORMAL);
+                v.setBackgroundResource(ThemeUtils.getSelectionDrawerNotActivatedColor());
             }
         }
         return v;
diff --git a/app/src/main/res/layout/nav_feedlistitem.xml b/app/src/main/res/layout/nav_feedlistitem.xml
index 95696b2ce..9f19157fc 100644
--- a/app/src/main/res/layout/nav_feedlistitem.xml
+++ b/app/src/main/res/layout/nav_feedlistitem.xml
@@ -5,8 +5,7 @@
                 android:orientation="vertical"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/listitem_iconwithtext_height"
-                tools:background="@android:color/darker_gray"
-                android:background= "?attr/nav_drawer_list_selector">
+                tools:background="@android:color/darker_gray">
 
     <ImageView
         android:id="@+id/imgvCover"
diff --git a/app/src/main/res/layout/nav_listitem.xml b/app/src/main/res/layout/nav_listitem.xml
index d60165d85..c140533e6 100644
--- a/app/src/main/res/layout/nav_listitem.xml
+++ b/app/src/main/res/layout/nav_listitem.xml
@@ -5,8 +5,7 @@
                 android:orientation="vertical"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/listitem_iconwithtext_height"
-                tools:background="@android:color/darker_gray"
-                android:background= "?attr/nav_drawer_list_selector">
+                tools:background="@android:color/darker_gray">
 
     <ImageView
         android:id="@+id/imgvCover"
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/ThemeUtils.java b/core/src/main/java/de/danoeh/antennapod/core/util/ThemeUtils.java
index 14f091249..7f6d2e01a 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/ThemeUtils.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/ThemeUtils.java
@@ -29,6 +29,38 @@ public class ThemeUtils {
         }
     }
 
+    public static int getSelectionDrawerActivatedColor() {
+        int theme = UserPreferences.getTheme();
+        if (theme == R.style.Theme_AntennaPod_Dark) {
+            return R.color.overlay_dark;
+        } else if (theme == R.style.Theme_AntennaPod_TrueBlack){
+            return R.color.highlight_trueblack;
+        } else if (theme == R.style.Theme_AntennaPod_Light) {
+            return R.color.highlight_light;
+        } else {
+            Log.e(TAG,
+                    "getSelectionBackgroundColor could not match the current theme to any color!");
+            return R.color.highlight_light;
+        }
+
+    }
+
+    public static int getSelectionDrawerNotActivatedColor() {
+        int theme = UserPreferences.getTheme();
+        if (theme == R.style.Theme_AntennaPod_Dark) {
+            return R.color.darktheme_drawer;
+        } else if (theme == R.style.Theme_AntennaPod_TrueBlack){
+            return R.color.black;
+        } else if (theme == R.style.Theme_AntennaPod_Light) {
+            return R.color.primary_light;
+        } else {
+            Log.e(TAG,
+                    "getSelectionBackgroundColor could not match the current theme to any color!");
+            return R.color.highlight_light;
+        }
+    }
+
+
     public static @ColorInt int getColorFromAttr(Context context, @AttrRes int attr) {
         TypedValue typedValue = new TypedValue();
         context.getTheme().resolveAttribute(attr, typedValue, true);
diff --git a/core/src/main/res/drawable/activated_color_dark.xml b/core/src/main/res/drawable/activated_color_dark.xml
deleted file mode 100644
index 826707f9f..000000000
--- a/core/src/main/res/drawable/activated_color_dark.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/overlay_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
deleted file mode 100644
index 6e547d8d9..000000000
--- a/core/src/main/res/drawable/activated_color_light.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?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
deleted file mode 100644
index 2b3036f49..000000000
--- a/core/src/main/res/drawable/activated_color_trueblack.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?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
deleted file mode 100644
index 9a1c85d06..000000000
--- a/core/src/main/res/drawable/drawer_list_selector_dark.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index bd81f2bfd..000000000
--- a/core/src/main/res/drawable/drawer_list_selector_light.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index 0694eb4a6..000000000
--- a/core/src/main/res/drawable/drawer_list_selector_trueblack.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<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 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>

From fd83665970569d44e25a6ac3d199300e75ec6e46 Mon Sep 17 00:00:00 2001
From: pachecosf <austinwim@gmail.com>
Date: Thu, 17 Jan 2019 16:21:34 -0800
Subject: [PATCH 5/7] Changed implementation using themeUtils instead

---
 .../main/java/de/danoeh/antennapod/core/util/ThemeUtils.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/ThemeUtils.java b/core/src/main/java/de/danoeh/antennapod/core/util/ThemeUtils.java
index 7f6d2e01a..dd03f0176 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/ThemeUtils.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/ThemeUtils.java
@@ -39,7 +39,7 @@ public class ThemeUtils {
             return R.color.highlight_light;
         } else {
             Log.e(TAG,
-                    "getSelectionBackgroundColor could not match the current theme to any color!");
+                    "getSelectionDrawerActivatedColor could not match the current theme to any color!");
             return R.color.highlight_light;
         }
 
@@ -55,7 +55,7 @@ public class ThemeUtils {
             return R.color.primary_light;
         } else {
             Log.e(TAG,
-                    "getSelectionBackgroundColor could not match the current theme to any color!");
+                    "getSelectionDrawerNotActivatedColor could not match the current theme to any color!");
             return R.color.highlight_light;
         }
     }

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

---
 .../antennapod/adapter/NavListAdapter.java    | 19 +++++++++--
 .../antennapod/core/util/ThemeUtils.java      | 32 -------------------
 core/src/main/res/values/attrs.xml            |  1 +
 core/src/main/res/values/colors.xml           |  4 +--
 core/src/main/res/values/styles.xml           | 10 ++++--
 5 files changed, 27 insertions(+), 39 deletions(-)

diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
index 85dcf7a35..7dc2d90a5 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
@@ -8,6 +8,7 @@ import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.preference.PreferenceManager;
 import android.support.v7.app.AlertDialog;
+import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -34,7 +35,6 @@ import de.danoeh.antennapod.activity.MainActivity;
 import de.danoeh.antennapod.core.feed.Feed;
 import de.danoeh.antennapod.core.glide.ApGlideSettings;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
-import de.danoeh.antennapod.core.util.ThemeUtils;
 import de.danoeh.antennapod.fragment.AddFeedFragment;
 import de.danoeh.antennapod.fragment.AllEpisodesFragment;
 import de.danoeh.antennapod.fragment.DownloadsFragment;
@@ -215,12 +215,25 @@ public class NavListAdapter extends BaseAdapter
         }
         if (v != null && viewType != VIEW_TYPE_SECTION_DIVIDER) {
             TextView txtvTitle = v.findViewById(R.id.txtvTitle);
+            TypedValue typedValue = new TypedValue();
+
             if (position == itemAccess.getSelectedItemIndex()) {
                 txtvTitle.setTypeface(null, Typeface.BOLD);
-                v.setBackgroundResource(ThemeUtils.getSelectionDrawerActivatedColor());
+                v.getContext().getTheme().resolveAttribute(de.danoeh.antennapod.core.R.attr.drawer_activated_color, typedValue, true);
+                int[] attribute = new int[] { de.danoeh.antennapod.core.R.attr.drawer_activated_color };
+                TypedArray array = v.getContext().obtainStyledAttributes(typedValue.resourceId, attribute);
+                int backgroundResource = array.getColor(0, 0);
+                array.recycle();
+                v.setBackgroundColor(backgroundResource);
+
             } else {
                 txtvTitle.setTypeface(null, Typeface.NORMAL);
-                v.setBackgroundResource(ThemeUtils.getSelectionDrawerNotActivatedColor());
+                v.getContext().getTheme().resolveAttribute(de.danoeh.antennapod.core.R.attr.nav_drawer_background, typedValue, true);
+                int[] attribute = new int[] { de.danoeh.antennapod.core.R.attr.nav_drawer_background};
+                TypedArray array = v.getContext().obtainStyledAttributes(typedValue.resourceId, attribute);
+                int backgroundResource = array.getColor(0, 0);
+                array.recycle();
+                v.setBackgroundColor(backgroundResource);
             }
         }
         return v;
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/ThemeUtils.java b/core/src/main/java/de/danoeh/antennapod/core/util/ThemeUtils.java
index dd03f0176..14f091249 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/ThemeUtils.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/ThemeUtils.java
@@ -29,38 +29,6 @@ public class ThemeUtils {
         }
     }
 
-    public static int getSelectionDrawerActivatedColor() {
-        int theme = UserPreferences.getTheme();
-        if (theme == R.style.Theme_AntennaPod_Dark) {
-            return R.color.overlay_dark;
-        } else if (theme == R.style.Theme_AntennaPod_TrueBlack){
-            return R.color.highlight_trueblack;
-        } else if (theme == R.style.Theme_AntennaPod_Light) {
-            return R.color.highlight_light;
-        } else {
-            Log.e(TAG,
-                    "getSelectionDrawerActivatedColor could not match the current theme to any color!");
-            return R.color.highlight_light;
-        }
-
-    }
-
-    public static int getSelectionDrawerNotActivatedColor() {
-        int theme = UserPreferences.getTheme();
-        if (theme == R.style.Theme_AntennaPod_Dark) {
-            return R.color.darktheme_drawer;
-        } else if (theme == R.style.Theme_AntennaPod_TrueBlack){
-            return R.color.black;
-        } else if (theme == R.style.Theme_AntennaPod_Light) {
-            return R.color.primary_light;
-        } else {
-            Log.e(TAG,
-                    "getSelectionDrawerNotActivatedColor could not match the current theme to any color!");
-            return R.color.highlight_light;
-        }
-    }
-
-
     public static @ColorInt int getColorFromAttr(Context context, @AttrRes int attr) {
         TypedValue typedValue = new TypedValue();
         context.getTheme().resolveAttribute(attr, typedValue, true);
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>

From a421c490e40fb56f611e268e1442e9d34a59059f Mon Sep 17 00:00:00 2001
From: pachecosf <austinwim@gmail.com>
Date: Fri, 18 Jan 2019 12:28:49 -0800
Subject: [PATCH 7/7] cleaned up a couple of lines

---
 .../de/danoeh/antennapod/adapter/NavListAdapter.java | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
index 7dc2d90a5..be8e52cfc 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
@@ -220,20 +220,12 @@ public class NavListAdapter extends BaseAdapter
             if (position == itemAccess.getSelectedItemIndex()) {
                 txtvTitle.setTypeface(null, Typeface.BOLD);
                 v.getContext().getTheme().resolveAttribute(de.danoeh.antennapod.core.R.attr.drawer_activated_color, typedValue, true);
-                int[] attribute = new int[] { de.danoeh.antennapod.core.R.attr.drawer_activated_color };
-                TypedArray array = v.getContext().obtainStyledAttributes(typedValue.resourceId, attribute);
-                int backgroundResource = array.getColor(0, 0);
-                array.recycle();
-                v.setBackgroundColor(backgroundResource);
+                v.setBackgroundResource(typedValue.resourceId);
 
             } else {
                 txtvTitle.setTypeface(null, Typeface.NORMAL);
                 v.getContext().getTheme().resolveAttribute(de.danoeh.antennapod.core.R.attr.nav_drawer_background, typedValue, true);
-                int[] attribute = new int[] { de.danoeh.antennapod.core.R.attr.nav_drawer_background};
-                TypedArray array = v.getContext().obtainStyledAttributes(typedValue.resourceId, attribute);
-                int backgroundResource = array.getColor(0, 0);
-                array.recycle();
-                v.setBackgroundColor(backgroundResource);
+                v.setBackgroundResource(typedValue.resourceId);
             }
         }
         return v;