Color tweaks

3 files changed, 4 insertions, 11 deletions

diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml
index deeb0fa10..40c9514f3 100644
--- a/core/src/main/res/values/attrs.xml
+++ b/core/src/main/res/values/attrs.xml
@@ -58,7 +58,6 @@
     <attr name="currently_playing_background" format="color"/>
     <attr name="ic_bookmark" format="reference"/>
     <attr name="ic_settings_speed" format="reference" />
-    <attr name="nav_drawer_background" format="color"/>
     <attr name="drawer_activated_color" format="color"/>
     <attr name="batch_edit_fab_icon" format="reference"/>
     <attr name="action_icon_color" format="color"/>
diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml
index b162038cf..efbc75f34 100644
--- a/core/src/main/res/values/colors.xml
+++ b/core/src/main/res/values/colors.xml
@@ -9,18 +9,13 @@
     <color name="holo_blue_dark">#0099CC</color>
     <color name="download_success_green">#248800</color>
     <color name="download_failed_red">#B00020</color>
-    <color name="status_progress">#E033B5E5</color>
-    <color name="overlay_dark">#2C2C2C</color>
-    <color name="overlay_light">#FFFFFF</color>
     <color name="new_indicator_green">#669900</color>
     <color name="image_readability_tint">#80000000</color>
     <color name="feed_image_bg">#50000000</color>
 
     <!-- Theme colors -->
     <color name="primary_light">#FFFFFF</color>
-    <color name="primary_darktheme">#212121</color>
-    <color name="nav_drawer_background_dark">#3B3B3B</color>
-    <color name="nav_drawer_highlighted_dark">#212121</color>
+    <color name="primary_darktheme">#303030</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 03309b523..377347ebd 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -10,6 +10,7 @@
         <item name="colorAccent">@color/holo_blue_light</item>
         <item name="progressBarTheme">@style/ProgressBarLight</item>
         <item name="buttonStyle">@style/Widget.AntennaPod.Button</item>
+        <item name="android:windowBackground">@color/primary_light</item>
         <item name="alertDialogTheme">@style/AntennaPod.Dialog.Light</item>
         <item name="action_bar_icon_color">@color/grey600</item>
         <item name="storage">@drawable/ic_sd_grey600_24dp</item>
@@ -41,7 +42,6 @@
         <item name="stat_playlist">@drawable/ic_list_grey600_24dp</item>
         <item name="type_video">@drawable/ic_videocam_grey600_24dp</item>
         <item name="dragview_background">@drawable/ic_drag_vertical_grey600_48dp</item>
-        <item name="nav_drawer_background">@color/white</item>
         <item name="drawer_activated_color">@color/highlight_light</item>
         <item name="ic_history">@drawable/ic_history_grey600_24dp</item>
         <item name="ic_folder">@drawable/ic_folder_grey600_24dp</item>
@@ -82,6 +82,7 @@
         <item name="colorAccent">@color/holo_blue_dark</item>
         <item name="colorPrimary">@color/primary_darktheme</item>
         <item name="colorPrimaryDark">@color/primary_darktheme</item>
+        <item name="android:windowBackground">@color/primary_darktheme</item>
         <item name="colorControlNormal">@color/white</item>
         <item name="buttonStyle">@style/Widget.AntennaPod.Button</item>
         <item name="progressBarTheme">@style/ProgressBarDark</item>
@@ -116,8 +117,7 @@
         <item name="stat_playlist">@drawable/ic_list_white_24dp</item>
         <item name="type_video">@drawable/ic_videocam_white_24dp</item>
         <item name="dragview_background">@drawable/ic_drag_vertical_white_48dp</item>
-        <item name="nav_drawer_background">@color/nav_drawer_background_dark</item>
-        <item name="drawer_activated_color">@color/nav_drawer_highlighted_dark</item>
+        <item name="drawer_activated_color">@color/highlight_dark</item>
         <item name="ic_history">@drawable/ic_history_white_24dp</item>
         <item name="ic_folder">@drawable/ic_folder_white_24dp</item>
         <item name="ic_settings_playback">@drawable/ic_av_play_white_24dp</item>
@@ -157,7 +157,6 @@
         <item name="progressBarTheme">@style/ProgressBarTrueBlack</item>
         <item name="dragview_background">@drawable/ic_drag_vertical_white_48dp</item>
         <item name="batch_edit_fab_icon">@drawable/ic_fab_edit_black</item>
-        <item name="nav_drawer_background">@color/black</item>
         <item name="drawer_activated_color">@color/highlight_trueblack</item>
         <item name="android:textColorPrimary">@color/white</item>
         <item name="android:color">@color/white</item>