Merge branch 'newgui' into develop. closes #407

Conflicts:
	res/layout/feedinfo.xml

5 files changed, 136 insertions, 71 deletions

diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index e8334cd60..08a8063c1 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -1,39 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <attr name="action_about" format="reference" />
-    <attr name="action_search" format="reference" />
-    <attr name="action_settings" format="reference" />
-    <attr name="action_stream" format="reference" />
-    <attr name="av_download" format="reference" />
-    <attr name="av_fast_forward" format="reference" />
-    <attr name="av_pause" format="reference" />
-    <attr name="av_play" format="reference" />
-    <attr name="av_rewind" format="reference" />
-    <attr name="content_discard" format="reference" />
-    <attr name="content_new" format="reference" />
-    <attr name="default_cover" format="reference" />
-    <attr name="device_access_time" format="reference" />
-    <attr name="location_web_site" format="reference" />
-    <attr name="navigation_accept" format="reference" />
-    <attr name="navigation_cancel" format="reference" />
-    <attr name="navigation_expand" format="reference" />
-    <attr name="navigation_collapse" format="reference" />
-    <attr name="navigation_refresh" format="reference" />
-    <attr name="navigation_up" format="reference" />
-    <attr name="navigation_shownotes" format="reference" />
-    <attr name="navigation_chapters" format="reference" />
-    <attr name="social_share" format="reference" />
-    <attr name="stat_playlist" format="reference" />
-    <attr name="type_audio" format="reference" />
-    <attr name="type_video" format="reference" />
-    <attr name="borderless_button" format="reference" />
-    <attr name="spinner_button" format="reference" />
-    <attr name="overlay_drawable" format="reference" />
-    <attr name="dragview_background" format="reference" />
-    <attr name="dragview_float_background" format="reference" />
+    <attr name="action_about" format="reference"/>
+    <attr name="action_search" format="reference"/>
+    <attr name="action_settings" format="reference"/>
+    <attr name="action_stream" format="reference"/>
+    <attr name="av_download" format="reference"/>
+    <attr name="av_fast_forward" format="reference"/>
+    <attr name="av_pause" format="reference"/>
+    <attr name="av_play" format="reference"/>
+    <attr name="av_rewind" format="reference"/>
+    <attr name="content_discard" format="reference"/>
+    <attr name="content_new" format="reference"/>
+    <attr name="default_cover" format="reference"/>
+    <attr name="device_access_time" format="reference"/>
+    <attr name="location_web_site" format="reference"/>
+    <attr name="navigation_accept" format="reference"/>
+    <attr name="navigation_cancel" format="reference"/>
+    <attr name="navigation_expand" format="reference"/>
+    <attr name="navigation_collapse" format="reference"/>
+    <attr name="navigation_refresh" format="reference"/>
+    <attr name="navigation_up" format="reference"/>
+    <attr name="navigation_shownotes" format="reference"/>
+    <attr name="navigation_chapters" format="reference"/>
+    <attr name="social_share" format="reference"/>
+    <attr name="stat_playlist" format="reference"/>
+    <attr name="type_audio" format="reference"/>
+    <attr name="type_video" format="reference"/>
+    <attr name="borderless_button" format="reference"/>
+    <attr name="spinner_button" format="reference"/>
+    <attr name="overlay_drawable" format="reference"/>
+    <attr name="dragview_background" format="reference"/>
+    <attr name="dragview_float_background" format="reference"/>
+    <attr name="ic_action_overflow" format="reference"/>
+    <attr name="ic_new" format="reference"/>
     <!-- Used in itemdescription -->
-    <attr name="non_transparent_background" format="reference" />
-    <attr name="overlay_background" format="color" />
+    <attr name="non_transparent_background" format="reference"/>
+    <attr name="overlay_background" format="color"/>
 
+    <attr name="nav_drawer_background" format="color"/>
+    <attr name="nav_drawer_toggle" format="reference"/>
 </resources>
\ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 7ce05bc13..155f0efcf 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -28,6 +28,9 @@
     <color name="status_playing">#E0EE5F52</color>
     <color name="overlay_dark">#262C31</color>
     <color name="overlay_light">#DDDDDD</color>
+    <color name="swipe_refresh_secondary_color_light">#EDEDED</color>
+    <color name="swipe_refresh_secondary_color_dark">#060708</color>
+
 
     <!-- Use Gingerbread-orange -->
     <color name="selection_background_color_dark">#FEBB20</color>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 8dea65a5b..e7c9b9242 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -4,13 +4,21 @@
     <dimen name="widget_margin">8dp</dimen>
     <dimen name="thumbnail_length">70dp</dimen>
     <dimen name="dragview_length">54dp</dimen>
-    <dimen name="external_player_height">55dp</dimen>
+    <dimen name="external_player_height">70dp</dimen>
     <dimen name="enc_icons_size">20dp</dimen>
     <dimen name="text_size_micro">12sp</dimen>
     <dimen name="text_size_small">14sp</dimen>
+    <dimen name="text_size_navdrawer">16sp</dimen>
     <dimen name="text_size_medium">18sp</dimen>
     <dimen name="text_size_large">22sp</dimen>
-    <dimen name="status_indicator_width">36dp</dimen>
+    <dimen name="status_indicator_width">32dp</dimen>
 	<dimen name="thumbnail_length_itemlist">80dp</dimen>
+    <dimen name="thumbnail_length_queue_item">70dp</dimen>
+    <dimen name="thumbnail_length_downloaded_item">70dp</dimen>
     <dimen name="thumbnail_length_onlinefeedview">110dp</dimen>
+    <dimen name="thumbnail_length_navlist">42dp</dimen>
+    <dimen name="listview_secondary_button_width">48dp</dimen>
+    <dimen name="drawer_width">280dp</dimen>
+    <dimen name="queue_title_text_size">@dimen/text_size_small</dimen>
+
 </resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8639b4503..5da95cb94 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4,22 +4,35 @@
     tools:ignore="MissingTranslation"
     >
 
-    <!-- Activitiy titles -->
+    <!-- Activitiy and fragment titles -->
     <string name="app_name">AntennaPod</string>
     <string name="feeds_label">Feeds</string>
     <string name="podcasts_label">PODCASTS</string>
     <string name="episodes_label">EPISODES</string>
+    <string name="new_episodes_label">New episodes</string>
+    <string name="all_episodes_label">All episodes</string>
     <string name="new_label">New</string>
     <string name="waiting_list_label">Waiting list</string>
     <string name="settings_label">Settings</string>
     <string name="add_new_feed_label">Add podcast</string>
     <string name="downloads_label">Downloads</string>
+    <string name="downloads_running_label">Running</string>
+    <string name="downloads_completed_label">Completed</string>
+    <string name="downloads_log_label">Log</string>
     <string name="cancel_download_label">Cancel Download</string>
     <string name="download_log_label">Download log</string>
     <string name="playback_history_label">Playback history</string>
     <string name="gpodnet_main_label">gpodder.net</string>
     <string name="gpodnet_auth_label">gpodder.net login</string>
 
+    <!-- New episodes fragment -->
+    <string name="recently_published_episodes_label">Recently published</string>
+    <string name="episode_filter_label">Show only new episodes</string>
+
+    <!-- Main activity -->
+    <string name="drawer_open">Open menu</string>
+    <string name="drawer_close">Close menu</string>
+
     <!-- Webview actions -->
     <string name="open_in_browser_label">Open in browser</string>
     <string name="copy_url_label">Copy URL</string>
@@ -59,12 +72,15 @@
     <!-- 'Add Feed' Activity labels -->
     <string name="feedurl_label">Feed URL</string>
     <string name="txtvfeedurl_label">Add Podcast by URL</string>
-    <string name="podcastdirectories_label">Podcast directories</string>
+    <string name="podcastdirectories_label">Find podcast in directory</string>
+    <string name="podcastdirectories_descr">You can search for new podcasts by name, category or popularity in the gpodder.net directory.</string>
+    <string name="browse_gpoddernet_label">Browse gpodder.net</string>
 
     <!-- Actions on feeds -->
     <string name="mark_all_read_label">Mark all as read</string>
+    <string name="mark_all_read_msg">Marked all episodes as read</string>
     <string name="show_info_label">Show information</string>
-    <string name="remove_feed_label">Remove Feed</string>
+    <string name="remove_feed_label">Remove podcast</string>
     <string name="share_link_label">Share website link</string>
     <string name="share_source_label">Share feed link</string>
     <string name="feed_delete_confirmation_msg">Please confirm that you want to delete this feed and ALL episodes of this feed that you have downloaded.</string>
@@ -76,6 +92,7 @@
     <string name="pause_label">Pause</string>
     <string name="stream_label">Stream</string>
     <string name="remove_label">Remove</string>
+    <string name="remove_episode_lable">Remove episode</string>
     <string name="mark_read_label">Mark as read</string>
     <string name="mark_unread_label">Mark as unread</string>
     <string name="add_to_queue_label">Add to Queue</string>
@@ -87,8 +104,8 @@
     <string name="skip_episode_label">Skip episode</string>
 
     <!-- Download messages and labels -->
-    <string name="download_successful">Download successful</string>
-    <string name="download_failed">Download failed</string>
+    <string name="download_successful">successful</string>
+    <string name="download_failed">failed</string>
     <string name="download_pending">Download pending</string>
     <string name="download_running">Download running</string>
     <string name="download_error_device_not_found">Storage device not found</string>
@@ -353,10 +370,12 @@
     <string name="status_playing_label">Episode is being played</string>
     <string name="status_downloading_label">Episode is being downloaded</string>
     <string name="status_downloaded_label">Episode is downloaded</string>
+    <string name="status_not_downloaded_label">Episode has not been downloaded yet</string>
     <string name="status_unread_label">Item is new</string>
     <string name="in_queue_label">Episode is in the queue</string>
     <string name="new_episodes_count_label">Number of new episodes</string>
     <string name="in_progress_episodes_count_label">Number of episodes you have started listening to</string>
+    <string name="drag_handle_content_description">Drag to change the position of this item</string>
 
     <!-- Feed information screen -->
     <string name="authentication_label">Authentication</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index d08b8060f..94edd7413 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -33,8 +33,12 @@
         <item name="attr/overlay_background">@color/overlay_light</item>
         <item name="attr/spinner_button">@drawable/spinner_button</item>
         <item name="attr/overlay_drawable">@drawable/overlay_drawable</item>
-        <item name="attr/dragview_background">@drawable/dragview_background</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/nav_drawer_toggle">@drawable/ic_drawer</item>
+        <item name="attr/ic_action_overflow">@drawable/ic_action_overflow</item>
+        <item name="attr/ic_new">@drawable/ic_new</item>
     </style>
 
     <style name="Theme.AntennaPod.Dark" parent="@style/Theme.AppCompat">
@@ -69,43 +73,70 @@
         <item name="attr/overlay_background">@color/overlay_dark</item>
         <item name="attr/spinner_button">@drawable/spinner_button_dark</item>
         <item name="attr/overlay_drawable">@drawable/overlay_drawable_dark</item>
-        <item name="attr/dragview_background">@drawable/dragview_background_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/nav_drawer_toggle">@drawable/ic_drawer_dark</item>
+        <item name="attr/ic_action_overflow">@drawable/ic_action_overflow_dark</item>
+        <item name="attr/ic_new">@drawable/ic_new_dark</item>
+
     </style>
 
     <style name="UndoBar">
-      <item name="android:layout_width">match_parent</item>
-      <item name="android:layout_height">48dp</item>
-      <item name="android:layout_gravity">bottom</item>
-      <item name="android:layout_marginLeft">8dp</item>
-      <item name="android:layout_marginRight">8dp</item>
-      <item name="android:layout_marginBottom">16dp</item>
-      <item name="android:orientation">horizontal</item>
-      <item name="android:background">@drawable/undobar</item>
-      <item name="android:clickable">true</item>
-      <item name="android:divider">@drawable/undobar_divider</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">48dp</item>
+        <item name="android:layout_gravity">bottom</item>
+        <item name="android:layout_marginLeft">8dp</item>
+        <item name="android:layout_marginRight">8dp</item>
+        <item name="android:layout_marginBottom">16dp</item>
+        <item name="android:orientation">horizontal</item>
+        <item name="android:background">@drawable/undobar</item>
+        <item name="android:clickable">true</item>
+        <item name="android:divider">@drawable/undobar_divider</item>
     </style>
+
     <style name="UndoBarMessage">
-      <item name="android:layout_width">0dp</item>
-      <item name="android:layout_weight">1</item>
-      <item name="android:layout_height">wrap_content</item>
-      <item name="android:layout_marginLeft">16dp</item>
-      <item name="android:layout_gravity">center_vertical</item>
-      <item name="android:layout_marginRight">16dp</item>
-      <item name="android:textAppearance">?android:textAppearanceMedium</item>
-      <item name="android:textColor">#fff</item>
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_weight">1</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginLeft">16dp</item>
+        <item name="android:layout_gravity">center_vertical</item>
+        <item name="android:layout_marginRight">16dp</item>
+        <item name="android:textAppearance">?android:textAppearanceMedium</item>
+        <item name="android:textColor">#fff</item>
     </style>
+
     <style name="UndoBarButton">
-      <item name="android:layout_width">wrap_content</item>
-      <item name="android:layout_height">match_parent</item>
-      <item name="android:paddingLeft">16dp</item>
-      <item name="android:paddingRight">16dp</item>
-      <item name="android:background">@drawable/undobar_button</item>
-      <item name="android:drawableLeft">@drawable/ic_undobar_undo</item>
-      <item name="android:drawablePadding">12dp</item>
-      <item name="android:textAppearance">?android:textAppearanceSmall</item>
-      <item name="android:textStyle">bold</item>
-      <item name="android:textColor">#fff</item>
-      <item name="android:text">@string/undo</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:paddingLeft">16dp</item>
+        <item name="android:paddingRight">16dp</item>
+        <item name="android:background">@drawable/undobar_button</item>
+        <item name="android:drawableLeft">@drawable/ic_undobar_undo</item>
+        <item name="android:drawablePadding">12dp</item>
+        <item name="android:textAppearance">?android:textAppearanceSmall</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:textColor">#fff</item>
+        <item name="android:text">@string/undo</item>
+    </style>
+
+    <style name="AntennaPod.TextView.Heading" parent="@android:style/TextAppearance.Medium">
+        <item name="android:textSize">@dimen/text_size_large</item>
+        <item name="android:textStyle">italic</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+    </style>
+
+    <style name="AntennaPod.TextView.ListItemPrimaryTitle" parent="@android:style/TextAppearance.Small">
+        <item name="android:textSize">15sp</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:lines">2</item>
+        <item name="android:ellipsize">end</item>
+    </style>
+
+    <style name="AntennaPod.Dialog.Title" parent="@android:style/TextAppearance.Medium">
+        <item name="android:textSize">@dimen/text_size_medium</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:maxLines">2</item>
+        <item name="android:ellipsize">end</item>
     </style>
 </resources>