Merge branch 'develop'1.0

5 files changed, 113 insertions, 2 deletions

diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml
index c46a2118f..f36119c8d 100644
--- a/core/src/main/res/values/attrs.xml
+++ b/core/src/main/res/values/attrs.xml
@@ -35,6 +35,7 @@
     <attr name="av_pause_big" format="reference"/>
     <attr name="av_ff_big" format="reference"/>
     <attr name="av_rew_big" format="reference"/>
+    <attr name="ic_settings" format="reference"/>
 
     <!-- Used in itemdescription -->
     <attr name="non_transparent_background" format="reference"/>
diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml
index ab48fafe7..e558a5c4e 100644
--- a/core/src/main/res/values/colors.xml
+++ b/core/src/main/res/values/colors.xml
@@ -11,11 +11,12 @@
     <color name="download_failed_red">#CC0000</color>
     <color name="status_progress">#E033B5E5</color>
     <color name="status_playing">#E0EE5F52</color>
-    <color name="overlay_dark">#262C31</color>
-    <color name="overlay_light">#DDDDDD</color>
+    <color name="overlay_dark">#2C2C2C</color>
+    <color name="overlay_light">#FFFFFF</color>
     <color name="swipe_refresh_secondary_color_light">#EDEDED</color>
     <color name="swipe_refresh_secondary_color_dark">#060708</color>
     <color name="new_indicator_green">#669900</color>
+    <color name="image_readability_tint">#80000000</color>
 
     <!-- Use Gingerbread-orange -->
     <color name="selection_background_color_dark">#FEBB20</color>
diff --git a/core/src/main/res/values/dimens.xml b/core/src/main/res/values/dimens.xml
index 38c14b024..81a55142a 100644
--- a/core/src/main/res/values/dimens.xml
+++ b/core/src/main/res/values/dimens.xml
@@ -33,4 +33,6 @@
     <dimen name="listitem_icon_leftpadding">16dp</dimen>
     <dimen name="listitem_icon_rightpadding">16dp</dimen>
 
+    <dimen name="audioplayer_playercontrols_length">64dp</dimen>
+
 </resources>
\ No newline at end of file
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 86f46a330..277d7d3c0 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -159,6 +159,12 @@
     <string name="removed_from_queue">Item removed</string>
     <string name="move_to_top_label">Move to top</string>
     <string name="move_to_bottom_label">Move to bottom</string>
+    <string name="sort">Sort</string>
+    <string name="alpha">Alphabetically</string>
+    <string name="date">Date</string>
+    <string name="duration">Duration</string>
+    <string name="ascending">Ascending</string>
+    <string name="descending">Descending</string>
 
     <!-- Flattr -->
     <string name="flattr_auth_label">Flattr sign-in</string>
@@ -205,7 +211,10 @@
     <string name="services_label">Services</string>
     <string name="flattr_label">Flattr</string>
     <string name="pref_pauseOnHeadsetDisconnect_sum">Pause playback when the headphones are disconnected</string>
+    <string name="pref_unpauseOnHeadsetReconnect_sum">Resume playback when the headphones are reconnected</string>
     <string name="pref_followQueue_sum">Jump to next queue item when playback completes</string>
+    <string name="pref_auto_delete_sum">Delete episode when playback completes</string>
+    <string name="pref_auto_delete_title">Auto Delete</string>
     <string name="playback_pref">Playback</string>
     <string name="network_pref">Network</string>
     <string name="pref_autoUpdateIntervall_title">Update interval</string>
@@ -214,6 +223,7 @@
     <string name="pref_followQueue_title">Continuous playback</string>
     <string name="pref_downloadMediaOnWifiOnly_title">WiFi media download</string>
     <string name="pref_pauseOnHeadsetDisconnect_title">Headphones disconnect</string>
+    <string name="pref_unpauseOnHeadsetReconnect_title">Headphones reconnect</string>
     <string name="pref_mobileUpdate_title">Mobile updates</string>
     <string name="pref_mobileUpdate_sum">Allow updates over the mobile data connection</string>
     <string name="refreshing_label">Refreshing</string>
@@ -233,6 +243,8 @@
     <string name="pref_automatic_download_sum">Configure the automatic download of episodes.</string>
     <string name="pref_autodl_wifi_filter_title">Enable Wi-Fi filter</string>
     <string name="pref_autodl_wifi_filter_sum">Allow automatic download only for selected Wi-Fi networks.</string>
+    <string name="pref_automatic_download_on_battery_title">Download when not charging</string>
+    <string name="pref_automatic_download_on_battery_sum">Allow automatic download when the battery is not charging</string>
     <string name="pref_episode_cache_title">Episode cache</string>
     <string name="pref_theme_title_light">Light</string>
     <string name="pref_theme_title_dark">Dark</string>
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index df7ae385c..a2f180395 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -40,6 +40,7 @@
         <item name="attr/av_pause_big">@drawable/ic_pause_grey600_36dp</item>
         <item name="attr/av_ff_big">@drawable/ic_fast_forward_grey600_36dp</item>
         <item name="attr/av_rew_big">@drawable/ic_fast_rewind_grey600_36dp</item>
+        <item name="attr/ic_settings">@drawable/ic_settings_grey600_24dp</item>
     </style>
 
     <style name="Theme.AntennaPod.Dark" parent="@style/Theme.AppCompat">
@@ -80,6 +81,94 @@
         <item name="attr/av_pause_big">@drawable/ic_pause_white_36dp</item>
         <item name="attr/av_ff_big">@drawable/ic_fast_forward_white_36dp</item>
         <item name="attr/av_rew_big">@drawable/ic_fast_rewind_white_36dp</item>
+        <item name="attr/ic_settings">@drawable/ic_settings_white_24dp</item>
+    </style>
+
+    <style name="Theme.AntennaPod.Light.NoTitle" parent="@style/Theme.AppCompat.Light.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowActionModeOverlay">true</item>
+        <item name="colorPrimary">@color/primary_light</item>
+        <item name="colorAccent">@color/color_accent</item>
+        <item name="attr/action_about">@drawable/ic_info_grey600_24dp</item>
+        <item name="attr/action_search">@drawable/ic_search_grey600_24dp</item>
+        <item name="attr/action_stream">@drawable/ic_settings_input_antenna_grey600_24dp</item>
+        <item name="attr/av_download">@drawable/ic_file_download_grey600_24dp</item>
+        <item name="attr/av_fast_forward">@drawable/ic_fast_forward_grey600_24dp</item>
+        <item name="attr/av_pause">@drawable/ic_pause_grey600_24dp</item>
+        <item name="attr/av_play">@drawable/ic_play_arrow_grey600_24dp</item>
+        <item name="attr/av_rewind">@drawable/ic_fast_rewind_grey600_24dp</item>
+        <item name="attr/content_discard">@drawable/ic_delete_grey600_24dp</item>
+        <item name="attr/content_new">@drawable/ic_add_grey600_24dp</item>
+        <item name="attr/device_access_time">@drawable/ic_timer_grey600_24dp</item>
+        <item name="attr/location_web_site">@drawable/ic_web_grey600_24dp</item>
+        <item name="attr/navigation_accept">@drawable/ic_done_grey600_24dp</item>
+        <item name="attr/navigation_cancel">@drawable/ic_cancel_grey600_24dp</item>
+        <item name="attr/navigation_expand">@drawable/ic_expand_more_grey600_36dp</item>
+        <item name="attr/navigation_refresh">@drawable/ic_refresh_grey600_24dp</item>
+        <item name="attr/navigation_up">@drawable/navigation_up</item>
+        <item name="attr/navigation_shownotes">@drawable/ic_description_grey600_36dp</item>
+        <item name="attr/navigation_chapters">@drawable/ic_toc_grey600_36dp</item>
+        <item name="attr/social_share">@drawable/ic_share_grey600_24dp</item>
+        <item name="attr/stat_playlist">@drawable/ic_list_grey600_24dp</item>
+        <item name="attr/type_audio">@drawable/ic_hearing_grey600_18dp</item>
+        <item name="attr/type_video">@drawable/ic_remove_red_eye_grey600_18dp</item>
+        <item name="attr/non_transparent_background">@color/white</item>
+        <item name="attr/overlay_background">@color/overlay_light</item>
+        <item name="attr/overlay_drawable">@drawable/overlay_drawable</item>
+        <item name="attr/dragview_background">@drawable/ic_drag_handle</item>
+        <item name="attr/dragview_float_background">@color/white</item>
+        <item name="attr/nav_drawer_background">@color/white</item>
+        <item name="attr/ic_action_overflow">@drawable/ic_more_vert_grey600_24dp</item>
+        <item name="attr/ic_new">@drawable/ic_new_releases_grey600_24dp</item>
+        <item name="attr/ic_history">@drawable/ic_history_grey600_24dp</item>
+        <item name="attr/av_play_big">@drawable/ic_play_arrow_grey600_36dp</item>
+        <item name="attr/av_pause_big">@drawable/ic_pause_grey600_36dp</item>
+        <item name="attr/av_ff_big">@drawable/ic_fast_forward_grey600_36dp</item>
+        <item name="attr/av_rew_big">@drawable/ic_fast_rewind_grey600_36dp</item>
+        <item name="attr/ic_settings">@drawable/ic_settings_grey600_24dp</item>
+    </style>
+
+    <style name="Theme.AntennaPod.Dark.NoTitle" parent="@style/Theme.AppCompat.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowActionModeOverlay">true</item>
+        <item name="colorAccent">@color/color_accent</item>
+        <item name="attr/action_about">@drawable/ic_info_white_24dp</item>
+        <item name="attr/action_search">@drawable/ic_search_white_24dp</item>
+        <item name="attr/action_stream">@drawable/ic_settings_input_antenna_white_24dp</item>
+        <item name="attr/av_download">@drawable/ic_file_download_white_24dp</item>
+        <item name="attr/av_fast_forward">@drawable/ic_fast_forward_white_24dp</item>
+        <item name="attr/av_pause">@drawable/ic_pause_white_24dp</item>
+        <item name="attr/av_play">@drawable/ic_play_arrow_white_24dp</item>
+        <item name="attr/av_rewind">@drawable/ic_fast_rewind_white_24dp</item>
+        <item name="attr/content_discard">@drawable/ic_delete_white_24dp</item>
+        <item name="attr/content_new">@drawable/ic_add_white_24dp</item>
+        <item name="attr/device_access_time">@drawable/ic_timer_white_24dp</item>
+        <item name="attr/location_web_site">@drawable/ic_web_white_24dp</item>
+        <item name="attr/navigation_accept">@drawable/ic_done_white_24dp</item>
+        <item name="attr/navigation_cancel">@drawable/ic_cancel_white_24dp</item>
+        <item name="attr/navigation_expand">@drawable/ic_expand_more_white_36dp</item>
+        <item name="attr/navigation_refresh">@drawable/ic_refresh_white_24dp</item>
+        <item name="attr/navigation_up">@drawable/navigation_up_dark</item>
+        <item name="attr/navigation_shownotes">@drawable/ic_description_white_36dp</item>
+        <item name="attr/navigation_chapters">@drawable/ic_toc_white_36dp</item>
+        <item name="attr/social_share">@drawable/ic_share_white_24dp</item>
+        <item name="attr/stat_playlist">@drawable/ic_list_white_24dp</item>
+        <item name="attr/type_audio">@drawable/ic_hearing_white_18dp</item>
+        <item name="attr/type_video">@drawable/ic_remove_red_eye_white_18dp</item>
+        <item name="attr/non_transparent_background">@color/black</item>
+        <item name="attr/overlay_background">@color/overlay_dark</item>
+        <item name="attr/overlay_drawable">@drawable/overlay_drawable_dark</item>
+        <item name="attr/dragview_background">@drawable/ic_drag_handle_dark</item>
+        <item name="attr/dragview_float_background">@color/black</item>
+        <item name="attr/nav_drawer_background">#3B3B3B</item>
+        <item name="attr/ic_action_overflow">@drawable/ic_more_vert_white_24dp</item>
+        <item name="attr/ic_new">@drawable/ic_new_releases_white_24dp</item>
+        <item name="attr/ic_history">@drawable/ic_history_white_24dp</item>
+        <item name="attr/av_play_big">@drawable/ic_play_arrow_white_36dp</item>
+        <item name="attr/av_pause_big">@drawable/ic_pause_white_36dp</item>
+        <item name="attr/av_ff_big">@drawable/ic_fast_forward_white_36dp</item>
+        <item name="attr/av_rew_big">@drawable/ic_fast_rewind_white_36dp</item>
+        <item name="attr/ic_settings">@drawable/ic_settings_white_24dp</item>
     </style>
 
     <style name="Theme.AntennaPod.VideoPlayer" parent="@style/Theme.AntennaPod.Dark">
@@ -157,4 +246,10 @@
         <item name="android:text">@string/new_label</item>
     </style>
 
+    <style name="BigBlurryBackground">
+        <item name="android:scaleType">centerCrop</item>
+        <item name="android:tint">@color/image_readability_tint</item>
+
+    </style>
+
 </resources>