diff options
| author | H. Lehmann <ByteHamster@users.noreply.github.com> | 2020-07-11 17:50:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-11 17:50:00 +0200 |
| commit | d110b1818bbfb0bbc9677b9fc44860c2a1a870ea (patch) | |
| tree | 04e2e79a44af02bdf8808fa60a57f27a5e025fbb /core | |
| parent | c353cf79ec67be8d6404193ceb9d0af3eceee84c (diff) | |
| parent | 9d2c2d8f370af84922f8197e252ee4474d0c3acb (diff) | |
| download | AntennaPod-d110b1818bbfb0bbc9677b9fc44860c2a1a870ea.zip | |
Merge pull request #4260 from gerardolgvr/replace-share-menu-by-dialog
fixes #1215 replacing share menu by dialog
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/feed/FeedItem.java | 3 | ||||
| -rw-r--r-- | core/src/main/res/values/strings.xml | 13 |
2 files changed, 12 insertions, 4 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItem.java b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItem.java index 20ed402fc..60ebe6965 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItem.java +++ b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItem.java @@ -7,6 +7,7 @@ import android.text.TextUtils; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; +import java.io.Serializable; import java.util.Date; import java.util.HashSet; import java.util.List; @@ -24,7 +25,7 @@ import de.danoeh.antennapod.core.util.ShownotesProvider; * * @author daniel */ -public class FeedItem extends FeedComponent implements ShownotesProvider, ImageResource { +public class FeedItem extends FeedComponent implements ShownotesProvider, ImageResource, Serializable { /** tag that indicates this item is in the queue */ public static final String TAG_QUEUE = "Queue"; diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index 3496d4290..fd1bb9aa9 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -136,12 +136,13 @@ <string name="feed_settings_label">Podcast settings</string> <string name="rename_feed_label">Rename podcast</string> <string name="remove_feed_label">Remove podcast</string> - <string name="share_label">Share…</string> + <string name="share_label">Share</string> + <string name="share_label_with_ellipses">Share…</string> <string name="share_link_label">Share Episode URL</string> <string name="share_link_with_position_label">Share Episode URL with Position</string> <string name="share_file_label">Share File</string> - <string name="share_website_url_label">Share Website URL</string> - <string name="share_feed_url_label">Share Podcast URL</string> + <string name="share_website_url_label">Website address</string> + <string name="share_feed_url_label">Podcast feed URL</string> <string name="share_item_url_label">Share Media File URL</string> <string name="share_item_url_with_position_label">Share Media File URL with Position</string> <string name="feed_delete_confirmation_msg">Please confirm that you want to delete the podcast \"%1$s\" and ALL its episodes (including downloaded episodes).</string> @@ -765,6 +766,12 @@ <string name="rating_later_label">Remind me later</string> <string name="rating_now_label">Sure, let\'s do this!</string> + <!-- Share episode dialog --> + <string name="share_dialog_include_label">Include:</string> + <string name="share_playback_position_dialog_label">Playback position</string> + <string name="share_dialog_media_file_label">Media file URL</string> + <string name="share_dialog_episode_website_label">Episode webpage</string> + <!-- Audio controls --> <string name="audio_controls">Audio controls</string> <string name="playback_speed">Playback Speed</string> |