Merge branch 'develop' into feat/simple-adjust-volume-per-feed

9 files changed, 39 insertions, 161 deletions

diff --git a/app/src/main/res/menu/allepisodes_context.xml b/app/src/main/res/menu/allepisodes_context.xml
deleted file mode 100644
index 907bc9334..000000000
--- a/app/src/main/res/menu/allepisodes_context.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@id/skip_episode_item"
-        android:menuCategory="container"
-        android:title="@string/skip_episode_label" />
-
-
-    <item
-        android:id="@+id/remove_new_flag_item"
-        android:menuCategory="container"
-        android:title="@string/remove_new_flag_label" />
-
-    <item
-        android:id="@+id/mark_read_item"
-        android:menuCategory="container"
-        android:title="@string/mark_read_label" />
-    <item
-        android:id="@+id/mark_unread_item"
-        android:menuCategory="container"
-        android:title="@string/mark_unread_label" />
-
-    <item
-        android:id="@+id/add_to_queue_item"
-        android:menuCategory="container"
-        android:title="@string/add_to_queue_label" />
-    <item
-        android:id="@+id/remove_from_queue_item"
-        android:menuCategory="container"
-        android:title="@string/remove_from_queue_label" />
-    <item
-        android:id="@+id/add_to_favorites_item"
-        android:menuCategory="container"
-        android:title="@string/add_to_favorite_label" />
-    <item
-        android:id="@+id/remove_from_favorites_item"
-        android:menuCategory="container"
-        android:title="@string/remove_from_favorite_label" />
-    <item
-        android:id="@+id/reset_position"
-        android:menuCategory="container"
-        android:title="@string/reset_position" />
-
-    <item
-        android:id="@+id/activate_auto_download"
-        android:menuCategory="container"
-        android:title="@string/activate_auto_download" />
-    <item
-        android:id="@+id/deactivate_auto_download"
-        android:menuCategory="container"
-        android:title="@string/deactivate_auto_download" />
-
-    <item
-        android:id="@+id/visit_website_item"
-        android:menuCategory="container"
-        android:title="@string/visit_website_label" />
-    <item
-        android:id="@+id/share_item"
-        android:menuCategory="container"
-        android:title="@string/share_label">
-        <menu>
-            <item
-                android:id="@+id/share_link_item"
-                android:menuCategory="container"
-                android:title="@string/share_link_label" />
-            <item
-                android:id="@+id/share_link_with_position_item"
-                android:menuCategory="container"
-                android:title="@string/share_link_with_position_label" />
-            <item
-                android:id="@+id/share_download_url_item"
-                android:menuCategory="container"
-                android:title="@string/share_item_url_label" />
-            <item
-                android:id="@+id/share_download_url_with_position_item"
-                android:menuCategory="container"
-                android:title="@string/share_item_url_with_position_label" />
-            <item
-                android:id="@+id/share_file"
-                android:menuCategory="container"
-                android:title="@string/share_file_label" />
-        </menu>
-    </item>
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/episodes.xml b/app/src/main/res/menu/episodes.xml
index 23c8f862a..1e1aa8f56 100644
--- a/app/src/main/res/menu/episodes.xml
+++ b/app/src/main/res/menu/episodes.xml
@@ -18,10 +18,19 @@
         android:icon="?attr/navigation_refresh"/>
 
     <item
+        android:id="@+id/filter_items"
+        android:icon="?attr/ic_filter"
+        android:menuCategory="container"
+        android:title="@string/filter"
+        android:visible="false"
+        custom:showAsAction="ifRoom"/>
+
+    <item
         android:id="@+id/mark_all_read_item"
         android:title="@string/mark_all_read_label"
         android:menuCategory="container"
         custom:showAsAction="collapseActionView"
+        android:visible="false"
         android:icon="?attr/navigation_accept"/>
 
     <item
@@ -29,6 +38,7 @@
         android:title="@string/remove_all_new_flags_label"
         android:menuCategory="container"
         custom:showAsAction="collapseActionView"
+        android:visible="false"
         android:icon="?attr/navigation_accept"/>
 
 </menu>
diff --git a/app/src/main/res/menu/feedinfo.xml b/app/src/main/res/menu/feedinfo.xml
index 300068007..f20d679a5 100644
--- a/app/src/main/res/menu/feedinfo.xml
+++ b/app/src/main/res/menu/feedinfo.xml
@@ -11,7 +11,7 @@
     <item
         android:id="@+id/share_link_item"
         custom:showAsAction="collapseActionView"
-        android:title="@string/share_link_label">
+        android:title="@string/share_website_url_label">
     </item>
     <item
         android:id="@+id/share_download_url_item"
diff --git a/app/src/main/res/menu/feeditem_options.xml b/app/src/main/res/menu/feeditem_options.xml
index 0801b79a1..e415ff85a 100644
--- a/app/src/main/res/menu/feeditem_options.xml
+++ b/app/src/main/res/menu/feeditem_options.xml
@@ -9,6 +9,11 @@
     </item>
 
     <item
+        android:id="@+id/remove_new_flag_item"
+        custom:showAsAction="collapseActionView"
+        android:title="@string/remove_new_flag_label" />
+
+    <item
         android:id="@+id/mark_read_item"
         custom:showAsAction="collapseActionView"
         android:title="@string/mark_read_label">
diff --git a/app/src/main/res/menu/feeditemlist_context.xml b/app/src/main/res/menu/feeditemlist_context.xml
index df13cb027..6e4966206 100644
--- a/app/src/main/res/menu/feeditemlist_context.xml
+++ b/app/src/main/res/menu/feeditemlist_context.xml
@@ -8,6 +8,11 @@
         android:title="@string/skip_episode_label" />
 
     <item
+        android:id="@+id/remove_new_flag_item"
+        android:menuCategory="container"
+        android:title="@string/remove_new_flag_label" />
+
+    <item
         android:id="@+id/mark_read_item"
         android:menuCategory="container"
         android:title="@string/mark_read_label" />
diff --git a/app/src/main/res/menu/feedlist.xml b/app/src/main/res/menu/feedlist.xml
index e62fc9d36..4144c392f 100644
--- a/app/src/main/res/menu/feedlist.xml
+++ b/app/src/main/res/menu/feedlist.xml
@@ -33,7 +33,7 @@
     <item
         android:id="@+id/action_search"
         android:icon="?attr/action_search"
-        custom:showAsAction="always"
+        custom:showAsAction="always|collapseActionView"
         custom:actionViewClass="android.support.v7.widget.SearchView"
         android:title="@string/search_label"/>
 
@@ -49,7 +49,7 @@
         android:id="@+id/share_link_item"
         android:menuCategory="container"
         custom:showAsAction="collapseActionView"
-        android:title="@string/share_link_label">
+        android:title="@string/share_website_url_label">
     </item>
     <item
         android:id="@+id/share_download_url_item"
diff --git a/app/src/main/res/menu/mediaplayer.xml b/app/src/main/res/menu/mediaplayer.xml
index 44d511ee4..055951760 100644
--- a/app/src/main/res/menu/mediaplayer.xml
+++ b/app/src/main/res/menu/mediaplayer.xml
@@ -35,6 +35,14 @@
     </item>
 
     <item
+        android:id="@+id/open_feed_item"
+        android:icon="?attr/feed"
+        custom:showAsAction="collapseActionView"
+        android:title="@string/open_podcast"
+        android:visible="false">
+    </item>
+
+    <item
         android:id="@+id/visit_website_item"
         android:icon="?attr/location_web_site"
         custom:showAsAction="collapseActionView"
diff --git a/app/src/main/res/menu/queue_context.xml b/app/src/main/res/menu/queue_context.xml
index e1c3e6216..522e712e2 100644
--- a/app/src/main/res/menu/queue_context.xml
+++ b/app/src/main/res/menu/queue_context.xml
@@ -11,77 +11,6 @@
         android:id="@+id/move_to_bottom_item"
         android:menuCategory="container"
         android:title="@string/move_to_bottom_label" />
+    <!-- rest of the menu items can be found in the generic feeditemlist_context.xml -->
 
-    <item
-        android:id="@+id/mark_read_item"
-        android:menuCategory="container"
-        android:title="@string/mark_read_label" />
-
-    <item
-        android:id="@+id/mark_unread_item"
-        android:menuCategory="container"
-        android:title="@string/mark_unread_label" />
-
-    <item
-        android:id="@+id/remove_from_queue_item"
-        android:menuCategory="container"
-        android:title="@string/remove_from_queue_label" />
-    <item
-        android:id="@+id/remove_item"
-        android:menuCategory="container"
-        android:title="@string/delete_label" />
-
-    <item
-        android:id="@+id/add_to_favorites_item"
-        android:menuCategory="container"
-        android:title="@string/add_to_favorite_label" />
-    <item
-        android:id="@+id/remove_from_favorites_item"
-        android:menuCategory="container"
-        android:title="@string/remove_from_favorite_label" />
-    <item
-        android:id="@+id/reset_position"
-        android:menuCategory="container"
-        android:title="@string/reset_position" />
-
-    <item
-        android:id="@+id/activate_auto_download"
-        android:menuCategory="container"
-        android:title="@string/activate_auto_download" />
-    <item
-        android:id="@+id/deactivate_auto_download"
-        android:menuCategory="container"
-        android:title="@string/deactivate_auto_download" />
-
-    <item
-        android:id="@+id/visit_website_item"
-        android:menuCategory="container"
-        android:title="@string/visit_website_label" />
-    <item
-        android:id="@+id/share_item"
-        android:menuCategory="container"
-        android:title="@string/share_label">
-        <menu>
-            <item
-                android:id="@+id/share_link_item"
-                android:menuCategory="container"
-                android:title="@string/share_link_label" />
-            <item
-                android:id="@+id/share_link_with_position_item"
-                android:menuCategory="container"
-                android:title="@string/share_link_with_position_label" />
-            <item
-                android:id="@+id/share_download_url_item"
-                android:menuCategory="container"
-                android:title="@string/share_item_url_label" />
-            <item
-                android:id="@+id/share_download_url_with_position_item"
-                android:menuCategory="container"
-                android:title="@string/share_item_url_with_position_label" />
-            <item
-                android:id="@+id/share_file"
-                android:menuCategory="container"
-                android:title="@string/share_file_label" />
-        </menu>
-    </item>
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/subscriptions.xml b/app/src/main/res/menu/subscriptions.xml
index f39e0ac97..1780592d5 100644
--- a/app/src/main/res/menu/subscriptions.xml
+++ b/app/src/main/res/menu/subscriptions.xml
@@ -3,6 +3,13 @@
       xmlns:custom="http://schemas.android.com/apk/res-auto">
 
     <item
+            android:id="@+id/refresh_item"
+            android:title="@string/refresh_label"
+            android:menuCategory="container"
+            custom:showAsAction="always"
+            android:icon="?attr/navigation_refresh"/>
+
+    <item
             android:id="@+id/subscription_num_columns"
             android:title="@string/subscription_num_columns"
             custom:showAsAction="never">