merged version 1.3 to master

9 files changed, 227 insertions, 35 deletions

diff --git a/app/src/main/res/menu/allepisodes_context.xml b/app/src/main/res/menu/allepisodes_context.xml
index f89ad5065..171e509a8 100644
--- a/app/src/main/res/menu/allepisodes_context.xml
+++ b/app/src/main/res/menu/allepisodes_context.xml
@@ -40,13 +40,32 @@
         android:title="@string/deactivate_auto_download" />
 
     <item
-        android:id="@+id/share_link_item"
-        android:menuCategory="container"
-        android:title="@string/share_link_label" />
-    <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" />
+        </menu>
+    </item>
 
     <item
         android:id="@+id/support_item"
diff --git a/app/src/main/res/menu/episodes_apply_action_options.xml b/app/src/main/res/menu/episodes_apply_action_options.xml
new file mode 100644
index 000000000..88bef8d1f
--- /dev/null
+++ b/app/src/main/res/menu/episodes_apply_action_options.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/sort"
+        android:title="@string/sort"
+        app:showAsAction="always">
+        <menu>
+            <item android:id="@+id/sort_title"
+                  android:title="@string/sort_title"/>
+            <item android:id="@+id/sort_title_a_z"
+                  android:title="@string/sort_title_a_z"/>
+            <item android:id="@+id/sort_title_z_a"
+                  android:title="@string/sort_title_z_a"/>
+            <item android:id="@+id/sort_date_new_old"
+                  android:title="@string/sort_date_new_old"/>
+            <item android:id="@+id/sort_date_old_new"
+                  android:title="@string/sort_date_old_new"/>
+            <item android:id="@+id/sort_duration_short_long"
+                  android:title="@string/sort_duration_short_long"/>
+            <item android:id="@+id/sort_duration_long_short"
+                  android:title="@string/sort_duration_long_short"/>
+        </menu>
+    </item>
+
+    <item
+        android:id="@+id/select_toggle"
+        android:title="@string/select_all_label"
+        app:showAsAction="always"/>
+
+    <item
+        android:id="@+id/select_options"
+        android:title="@string/all_label"
+        app:showAsAction="always">
+
+        <menu>
+            <item android:id="@+id/select_label"
+                  android:title="@string/select_label"/>
+            <item android:id="@+id/check_all"
+                android:title="@string/all_label"/>
+            <item android:id="@+id/check_none"
+                  android:title="@string/none_label"/>
+            <item android:id="@+id/check_played"
+                  android:title="@string/played_label"/>
+            <item android:id="@+id/check_unplayed"
+                  android:title="@string/unplayed_label"/>
+            <item android:id="@+id/check_downloaded"
+                  android:title="@string/downloaded_label"/>
+            <item android:id="@+id/check_not_downloaded"
+                  android:title="@string/not_downloaded_label"/>
+        </menu>
+    </item>
+
+</menu>
diff --git a/app/src/main/res/menu/feedinfo.xml b/app/src/main/res/menu/feedinfo.xml
index be50cb87d..9fdd56b6c 100644
--- a/app/src/main/res/menu/feedinfo.xml
+++ b/app/src/main/res/menu/feedinfo.xml
@@ -20,9 +20,9 @@
         android:title="@string/share_link_label">
     </item>
     <item
-        android:id="@+id/share_source_item"
+        android:id="@+id/share_download_url_item"
         custom:showAsAction="collapseActionView"
-        android:title="@string/share_source_label">
+        android:title="@string/share_feed_url_label">
     </item>
 
-</menu>
\ No newline at end of file
+</menu>
diff --git a/app/src/main/res/menu/feeditem_options.xml b/app/src/main/res/menu/feeditem_options.xml
index f8e9b9c75..650912ea2 100644
--- a/app/src/main/res/menu/feeditem_options.xml
+++ b/app/src/main/res/menu/feeditem_options.xml
@@ -48,17 +48,36 @@
     </item>
 
     <item
-        android:id="@+id/share_link_item"
-        custom:showAsAction="collapseActionView"
-        android:title="@string/share_link_label">
-    </item>
-    <item
         android:id="@+id/visit_website_item"
         android:icon="?attr/location_web_site"
         custom:showAsAction="ifRoom|collapseActionView"
         android:title="@string/visit_website_label">
     </item>
     <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" />
+        </menu>
+    </item>
+
+    <item
         android:id="@+id/support_item"
         custom:showAsAction="collapseActionView"
         android:title="@string/support_label">
diff --git a/app/src/main/res/menu/feeditemlist_context.xml b/app/src/main/res/menu/feeditemlist_context.xml
index f89ad5065..7b10e5cce 100644
--- a/app/src/main/res/menu/feeditemlist_context.xml
+++ b/app/src/main/res/menu/feeditemlist_context.xml
@@ -40,13 +40,33 @@
         android:title="@string/deactivate_auto_download" />
 
     <item
-        android:id="@+id/share_link_item"
-        android:menuCategory="container"
-        android:title="@string/share_link_label" />
-    <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" />
+        </menu>
+    </item>
+
 
     <item
         android:id="@+id/support_item"
diff --git a/app/src/main/res/menu/feedlist.xml b/app/src/main/res/menu/feedlist.xml
index e0da72667..54b90f5c6 100644
--- a/app/src/main/res/menu/feedlist.xml
+++ b/app/src/main/res/menu/feedlist.xml
@@ -10,6 +10,12 @@
         custom:showAsAction="always">
     </item>
     <item
+        android:id="@+id/episode_actions"
+        android:menuCategory="container"
+        android:title="@string/episode_actions"
+        custom:showAsAction="always">
+    </item>
+    <item
         android:id="@+id/refresh_item"
         android:icon="?attr/navigation_refresh"
         android:menuCategory="container"
@@ -31,18 +37,34 @@
         android:title="@string/search_label"/>
 
     <item
-        android:id="@+id/mark_all_read_item"
-        android:menuCategory="container"
-        android:title="@string/mark_all_read_label"
-        custom:showAsAction="collapseActionView">
-    </item>
-    <item
         android:id="@+id/support_item"
         android:menuCategory="container"
         android:title="@string/support_label"
         android:visible="false"
         custom:showAsAction="collapseActionView">
     </item>
+
+    <item
+        android:id="@+id/visit_website_item"
+        android:icon="?attr/location_web_site"
+        android:menuCategory="container"
+        custom:showAsAction="collapseActionView"
+        android:title="@string/visit_website_label"
+        android:visible="true">
+    </item>
+    <item
+        android:id="@+id/share_link_item"
+        android:menuCategory="container"
+        custom:showAsAction="collapseActionView"
+        android:title="@string/share_link_label">
+    </item>
+    <item
+        android:id="@+id/share_download_url_item"
+        android:menuCategory="container"
+        custom:showAsAction="collapseActionView"
+        android:title="@string/share_feed_url_label">
+    </item>
+
     <item
         android:id="@+id/remove_item"
         android:icon="?attr/content_discard"
diff --git a/app/src/main/res/menu/mediaplayer.xml b/app/src/main/res/menu/mediaplayer.xml
index 288e44401..053e68552 100644
--- a/app/src/main/res/menu/mediaplayer.xml
+++ b/app/src/main/res/menu/mediaplayer.xml
@@ -13,11 +13,14 @@
         custom:showAsAction="collapseActionView"
         android:title="@string/set_sleeptimer_label">
     </item>
+
     <item
-        android:id="@+id/share_link_item"
+        android:id="@+id/skip_episode_item"
         custom:showAsAction="collapseActionView"
-        android:title="@string/share_link_label">
+        android:title="@string/skip_episode_label"
+        android:visible="true">
     </item>
+
     <item
         android:id="@+id/visit_website_item"
         android:icon="?attr/location_web_site"
@@ -26,15 +29,33 @@
         android:visible="false">
     </item>
     <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" />
+        </menu>
+    </item>
+    <item
         android:id="@+id/support_item"
         custom:showAsAction="collapseActionView"
         android:title="@string/support_label"
         android:visible="false">
     </item>
-    <item
-        android:id="@id/skip_episode_item"
-        custom:showAsAction="collapseActionView"
-        android:title="@string/skip_episode_label"
-        android:visible="true"/>
 
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/nav_feed_context.xml b/app/src/main/res/menu/nav_feed_context.xml
new file mode 100644
index 000000000..4bf067d25
--- /dev/null
+++ b/app/src/main/res/menu/nav_feed_context.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/mark_all_seen_item"
+        android:menuCategory="container"
+        android:title="@string/mark_all_seen_label" />
+
+    <item
+        android:id="@+id/mark_all_read_item"
+        android:menuCategory="container"
+        android:title="@string/mark_all_read_label" />
+
+    <item
+        android:id="@+id/remove_item"
+        android:menuCategory="container"
+        android:title="@string/remove_feed_label" />
+
+</menu>
diff --git a/app/src/main/res/menu/queue_context.xml b/app/src/main/res/menu/queue_context.xml
index 6ab2daabf..d09f3c84c 100644
--- a/app/src/main/res/menu/queue_context.xml
+++ b/app/src/main/res/menu/queue_context.xml
@@ -36,21 +36,38 @@
         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/share_link_item"
-        android:menuCategory="container"
-        android:title="@string/share_link_label" />
-    <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" />
+        </menu>
+    </item>
     <item
         android:id="@+id/support_item"
         android:menuCategory="container"