diff options
Diffstat (limited to 'ui')
4 files changed, 38 insertions, 27 deletions
diff --git a/ui/app-start-intent/src/main/java/de/danoeh/antennapod/ui/appstartintent/MainActivityStarter.java b/ui/app-start-intent/src/main/java/de/danoeh/antennapod/ui/appstartintent/MainActivityStarter.java index 88c0378c1..f91bb9244 100644 --- a/ui/app-start-intent/src/main/java/de/danoeh/antennapod/ui/appstartintent/MainActivityStarter.java +++ b/ui/app-start-intent/src/main/java/de/danoeh/antennapod/ui/appstartintent/MainActivityStarter.java @@ -12,6 +12,8 @@ import android.os.Build; public class MainActivityStarter { public static final String INTENT = "de.danoeh.antennapod.intents.MAIN_ACTIVITY"; public static final String EXTRA_OPEN_PLAYER = "open_player"; + public static final String EXTRA_FEED_ID = "fragment_feed_id"; + public static final String EXTRA_ADD_TO_BACK_STACK = "add_to_back_stack"; private final Intent intent; private final Context context; @@ -39,4 +41,14 @@ public class MainActivityStarter { intent.putExtra(EXTRA_OPEN_PLAYER, true); return this; } + + public MainActivityStarter withOpenFeed(long feedId) { + intent.putExtra(EXTRA_FEED_ID, feedId); + return this; + } + + public MainActivityStarter withAddToBackStack() { + intent.putExtra(EXTRA_ADD_TO_BACK_STACK, true); + return this; + } } diff --git a/ui/i18n/src/main/res/values/strings.xml b/ui/i18n/src/main/res/values/strings.xml index aa7fa18d4..fe2b4b3bc 100644 --- a/ui/i18n/src/main/res/values/strings.xml +++ b/ui/i18n/src/main/res/values/strings.xml @@ -13,19 +13,16 @@ <string name="episodes_label">Episodes</string> <string name="queue_label">Queue</string> <string name="all_episodes_short_label">All</string> - <string name="new_episodes_label">New</string> + <string name="inbox_label">Inbox</string> <string name="favorite_episodes_label">Favorites</string> - <string name="new_label">New</string> <string name="settings_label">Settings</string> <string name="downloads_label">Downloads</string> <string name="open_autodownload_settings">Open Settings</string> - <string name="downloads_completed_label">Completed</string> - <string name="downloads_log_label">Log</string> + <string name="downloads_log_label">Download Log</string> <string name="subscriptions_label">Subscriptions</string> <string name="subscriptions_list_label">Subscriptions List</string> <string name="cancel_download_label">Cancel Download</string> <string name="playback_history_label">Playback History</string> - <string name="gpodnet_main_label">gpodder.net</string> <string name="episode_cache_full_title">Episode cache full</string> <string name="episode_cache_full_message">The episode cache limit has been reached. You can increase the cache size in the Settings.</string> <string name="years_statistics_label">Years</string> @@ -66,8 +63,8 @@ <string name="drawer_feed_order_alphabetical">Sort alphabetically</string> <string name="drawer_feed_order_last_update">Sort by publication date</string> <string name="drawer_feed_order_most_played">Sort by number of played episodes</string> - <string name="drawer_feed_counter_new_unplayed">Number of new and unplayed episodes</string> - <string name="drawer_feed_counter_new">Number of new episodes</string> + <string name="drawer_feed_counter_inbox_unplayed">Number of unplayed episodes and episodes in the inbox</string> + <string name="drawer_feed_counter_inbox">Number of episodes in the inbox</string> <string name="drawer_feed_counter_unplayed">Number of unplayed episodes</string> <string name="drawer_feed_counter_downloaded">Number of downloaded episodes</string> <string name="drawer_feed_counter_none">None</string> @@ -154,13 +151,11 @@ <string name="new_episode_notification_group_text">Your subscriptions have new episodes.</string> <!-- Actions on feeds --> - <string name="mark_all_read_label">Mark all as played</string> - <string name="mark_all_read_msg">Marked all Episodes as played</string> - <string name="mark_all_read_confirmation_msg">Please confirm that you want to mark all episodes as being played.</string> - <string name="mark_all_read_feed_confirmation_msg">Please confirm that you want to mark all episodes in this podcast as being played.</string> - <string name="remove_all_new_flags_label">Remove all \"new\" flags</string> - <string name="removed_all_new_flags_msg">Removed all \"new\" flags</string> - <string name="remove_all_new_flags_confirmation_msg">Please confirm that you want to remove the \"new\" flag from all episodes.</string> + <string name="remove_all_inbox_label">Remove all from inbox</string> + <string name="removed_all_inbox_msg">Removed all from inbox</string> + <string name="remove_all_inbox_confirmation_msg">Please confirm that you want to remove all from the inbox.</string> + <string name="multi_select_mark_played_confirmation">Please confirm that you want to mark all selected items as played.</string> + <string name="multi_select_mark_unplayed_confirmation">Please confirm that you want to mark all selected items as unplayed.</string> <string name="show_info_label">Show information</string> <string name="show_feed_settings_label">Show podcast settings</string> <string name="feed_settings_label">Podcast settings</string> @@ -206,9 +201,10 @@ <item quantity="one">1 downloaded episode deleted.</item> <item quantity="other">%d downloaded episodes deleted.</item> </plurals> - <string name="remove_new_flag_label">Remove \"new\" flag</string> - <string name="removed_new_flag_label">Removed \"new\" flag</string> + <string name="remove_inbox_label">Remove from inbox</string> + <string name="removed_inbox_label">Removed from inbox</string> <string name="mark_read_label">Mark as played</string> + <string name="toggle_played_label">Toggle played state</string> <string name="marked_as_played_label">Marked as played</string> <string name="marked_as_unplayed_label">Marked as unplayed</string> <string name="mark_read_no_media_label">Mark as read</string> @@ -345,8 +341,8 @@ <string name="no_history_label">After you listen to an episode, it will appear here.</string> <string name="no_all_episodes_head_label">No Episodes</string> <string name="no_all_episodes_label">When you add a podcast, the episodes will be shown here.</string> - <string name="no_new_episodes_head_label">No new episodes</string> - <string name="no_new_episodes_label">When new episodes arrive, they will be shown here.</string> + <string name="no_inbox_head_label">No episodes in the inbox</string> + <string name="no_inbox_label">When new episodes arrive, they will be shown here. You can then decide if you are interested in them or not.</string> <string name="no_fav_episodes_head_label">No favorite episodes</string> <string name="no_fav_episodes_label">You can add episodes to the favorites by long-pressing them.</string> <string name="no_subscriptions_head_label">No subscriptions</string> @@ -627,17 +623,11 @@ <string name="sleep_timer_enabled_label">Sleep timer enabled</string> <!-- gpodder.net --> - <string name="gpodnet_taglist_header">CATEGORIES</string> - <string name="gpodnet_toplist_header">TOP PODCASTS</string> - <string name="gpodnet_search_hint">Search gpodder.net</string> <string name="gpodnetauth_login_butLabel">Login</string> <string name="gpodnetauth_encryption_warning">Password and data are not encrypted!</string> - <string name="create_account">Create account</string> <string name="username_label">Username</string> <string name="password_label">Password</string> - <string name="gpodnet_description">Gpodder.net is an open-source podcast synchronization service that is independent of the AntennaPod project.</string> - <string name="gpodnetauth_server_official">Official gpodder.net server</string> - <string name="gpodnetauth_server_custom">Custom server</string> + <string name="gpodnet_description">Gpodder.net is an open-source podcast synchronization service that you can install on your own server. Gpodder.net is independent of the AntennaPod project.</string> <string name="gpodnetauth_host">Hostname</string> <string name="gpodnetauth_select_server">Select server</string> <string name="gpodnetauth_device_name">Device name</string> @@ -678,6 +668,7 @@ <string name="status_downloading_label">Episode is being downloaded</string> <string name="in_queue_label">Episode is in the queue</string> <string name="is_favorite_label">Episode is marked as favorite</string> + <string name="is_inbox_label">Episode is in the inbox</string> <string name="load_next_page_label">Load next page</string> <string name="position">Position: %1$s</string> <string name="apply_action">Apply action</string> @@ -718,10 +709,10 @@ <string name="search_itunes_label">Search iTunes</string> <string name="search_podcastindex_label">Search Podcastindex.org</string> <string name="search_fyyd_label">Search fyyd</string> + <string name="gpodnet_search_hint">Search gpodder.net</string> <string name="advanced">Advanced</string> <string name="add_podcast_by_url">Add Podcast by RSS address</string> <string name="add_podcast_by_url_hint" translatable="false">www.example.com/feed</string> - <string name="browse_gpoddernet_label">Browse gpodder.net</string> <string name="discover">Discover</string> <string name="discover_hide">Hide</string> <string name="discover_is_hidden">You selected to hide suggestions.</string> diff --git a/ui/statistics/build.gradle b/ui/statistics/build.gradle index 53ebd5acc..905db0b5e 100644 --- a/ui/statistics/build.gradle +++ b/ui/statistics/build.gradle @@ -13,8 +13,9 @@ android { dependencies { implementation project(":core") - implementation project(':event') + implementation project(":event") implementation project(":model") + implementation project(":ui:app-start-intent") implementation project(":ui:common") annotationProcessor "androidx.annotation:annotation:$annotationVersion" diff --git a/ui/statistics/src/main/java/de/danoeh/antennapod/ui/statistics/feed/FeedStatisticsDialogFragment.java b/ui/statistics/src/main/java/de/danoeh/antennapod/ui/statistics/feed/FeedStatisticsDialogFragment.java index 7109bd6a1..f0308e364 100644 --- a/ui/statistics/src/main/java/de/danoeh/antennapod/ui/statistics/feed/FeedStatisticsDialogFragment.java +++ b/ui/statistics/src/main/java/de/danoeh/antennapod/ui/statistics/feed/FeedStatisticsDialogFragment.java @@ -2,10 +2,13 @@ package de.danoeh.antennapod.ui.statistics.feed; import android.app.Dialog; import android.os.Bundle; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.DialogFragment; + +import de.danoeh.antennapod.ui.appstartintent.MainActivityStarter; import de.danoeh.antennapod.ui.statistics.R; public class FeedStatisticsDialogFragment extends DialogFragment { @@ -26,6 +29,10 @@ public class FeedStatisticsDialogFragment extends DialogFragment { public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { AlertDialog.Builder dialog = new AlertDialog.Builder(getContext()); dialog.setPositiveButton(android.R.string.ok, null); + dialog.setNeutralButton(R.string.open_podcast, (dialogInterface, i) -> { + long feedId = getArguments().getLong(EXTRA_FEED_ID); + new MainActivityStarter(getContext()).withOpenFeed(feedId).withAddToBackStack().start(); + }); dialog.setTitle(getArguments().getString(EXTRA_FEED_TITLE)); dialog.setView(R.layout.feed_statistics_dialog); return dialog.create(); |