Restore episode sharing that only includes a media URL (#5835)

5 files changed, 19 insertions, 36 deletions

diff --git a/app/src/main/res/layout/share_episode_dialog.xml b/app/src/main/res/layout/share_episode_dialog.xml
index d79854972..f03899671 100644
--- a/app/src/main/res/layout/share_episode_dialog.xml
+++ b/app/src/main/res/layout/share_episode_dialog.xml
@@ -11,17 +11,22 @@
         android:id="@+id/share_dialog_radio_group"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="16dp"
         android:orientation="vertical">
 
         <RadioButton
-            android:id="@+id/share_link_to_episode_radio"
+            android:id="@+id/share_social_radio"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/share_dialog_link_to_episode"
+            android:text="@string/share_dialog_for_social"
             android:checked="true" />
 
         <RadioButton
+            android:id="@+id/share_media_receiver_radio"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/share_dialog_media_address" />
+
+        <RadioButton
             android:id="@+id/share_media_file_radio"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -29,13 +34,14 @@
 
     </RadioGroup>
 
-    <TextView
+    <View
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:text="@string/share_dialog_include_label" />
+        android:layout_height="1dp"
+        android:layout_marginVertical="8dp"
+        android:background="?android:attr/listDivider" />
 
     <CheckBox
-        android:id="@+id/share_start_at_timer_dialog"
+        android:id="@+id/share_position_checkbox"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/share_playback_position_dialog_label" />
diff --git a/app/src/main/res/menu/feedinfo.xml b/app/src/main/res/menu/feedinfo.xml
index 83ad079b4..254e1834b 100644
--- a/app/src/main/res/menu/feedinfo.xml
+++ b/app/src/main/res/menu/feedinfo.xml
@@ -8,22 +8,11 @@
         android:title="@string/visit_website_label"
         android:visible="true"/>
     <item
-        android:id="@+id/share_parent"
+        android:id="@+id/share_item"
         custom:showAsAction="ifRoom"
-        android:title="@string/share_label_with_ellipses"
+        android:title="@string/share_label"
         android:icon="@drawable/ic_share"
-        android:visible="true">
-        <menu android:id="@+id/share_submenu">
-            <item
-                android:id="@+id/share_link_item"
-                custom:showAsAction="collapseActionView"
-                android:title="@string/share_website_url_label"/>
-            <item
-                android:id="@+id/share_download_url_item"
-                custom:showAsAction="collapseActionView"
-                android:title="@string/share_feed_url_label"/>
-        </menu>
-    </item>
+        android:visible="true" />
     <item
         android:id="@+id/reconnect_local_folder"
         custom:showAsAction="collapseActionView"
diff --git a/app/src/main/res/menu/feeditem_options.xml b/app/src/main/res/menu/feeditem_options.xml
index 70400fe55..bcb2a59b8 100644
--- a/app/src/main/res/menu/feeditem_options.xml
+++ b/app/src/main/res/menu/feeditem_options.xml
@@ -59,7 +59,7 @@
     <item
         android:id="@+id/share_item"
         android:menuCategory="container"
-        android:title="@string/share_label_with_ellipses">
+        android:title="@string/share_label">
     </item>
 
     <item
diff --git a/app/src/main/res/menu/feedlist.xml b/app/src/main/res/menu/feedlist.xml
index 3c66ec4ba..4c5050f82 100644
--- a/app/src/main/res/menu/feedlist.xml
+++ b/app/src/main/res/menu/feedlist.xml
@@ -49,19 +49,7 @@
         android:id="@+id/share_item"
         android:menuCategory="container"
         custom:showAsAction="never"
-        android:title="@string/share_label_with_ellipses">
-        <menu>
-            <item
-                android:id="@+id/share_link_item"
-                android:title="@string/share_website_url_label">
-            </item>
-            <item
-                android:id="@+id/share_download_url_item"
-                android:title="@string/share_feed_url_label">
-            </item>
-        </menu>
-    </item>
-
+        android:title="@string/share_label" />
 
     <item
         android:id="@+id/rename_item"
diff --git a/app/src/main/res/menu/mediaplayer.xml b/app/src/main/res/menu/mediaplayer.xml
index e25872ade..7c66a4d10 100644
--- a/app/src/main/res/menu/mediaplayer.xml
+++ b/app/src/main/res/menu/mediaplayer.xml
@@ -62,6 +62,6 @@
         android:id="@+id/share_item"
         android:menuCategory="container"
         custom:showAsAction="never"
-        android:title="@string/share_label_with_ellipses">
+        android:title="@string/share_label">
     </item>
 </menu>
\ No newline at end of file