Merge pull request #861 from mfietz/feature/120-share-download-url

Share feeds and episodes

7 files changed, 146 insertions, 27 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/feedinfo.xml b/app/src/main/res/menu/feedinfo.xml
index be50cb87d..94f34db93 100644
--- a/app/src/main/res/menu/feedinfo.xml
+++ b/app/src/main/res/menu/feedinfo.xml
@@ -20,7 +20,7 @@
         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">
     </item>
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..e6e85093b 100644
--- a/app/src/main/res/menu/feedlist.xml
+++ b/app/src/main/res/menu/feedlist.xml
@@ -36,6 +36,7 @@
         android:title="@string/mark_all_read_label"
         custom:showAsAction="collapseActionView">
     </item>
+
     <item
         android:id="@+id/support_item"
         android:menuCategory="container"
@@ -43,6 +44,28 @@
         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/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"