Merge pull request #1968 from mfietz/issue/1929-new-episodes-marked-as

New episodes: Mark (all) as seen

4 files changed, 20 insertions, 8 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java
index c27e64807..29db19cf8 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java
@@ -180,7 +180,7 @@ public class AllEpisodesFragment extends Fragment {
         }
         super.onCreateOptionsMenu(menu, inflater);
         if (itemsLoaded) {
-            inflater.inflate(R.menu.new_episodes, menu);
+            inflater.inflate(R.menu.episodes, menu);
 
             MenuItem searchItem = menu.findItem(R.id.action_search);
             final SearchView sv = (SearchView) MenuItemCompat.getActionView(searchItem);
@@ -206,11 +206,13 @@ public class AllEpisodesFragment extends Fragment {
     @Override
     public void onPrepareOptionsMenu(Menu menu) {
         super.onPrepareOptionsMenu(menu);
-        if (itemsLoaded) {
-            MenuItem menuItem = menu.findItem(R.id.mark_all_read_item);
-            if (menuItem != null) {
-                menuItem.setVisible(episodes != null && !episodes.isEmpty());
-            }
+        MenuItem markAllRead = menu.findItem(R.id.mark_all_read_item);
+        if (markAllRead != null) {
+            markAllRead.setVisible(!showOnlyNewEpisodes() && episodes != null && !episodes.isEmpty());
+        }
+        MenuItem markAllSeen = menu.findItem(R.id.mark_all_seen_item);
+        if(markAllSeen != null) {
+            markAllSeen.setVisible(showOnlyNewEpisodes() && episodes != null && !episodes.isEmpty());
         }
     }
 
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/NewEpisodesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/NewEpisodesFragment.java
index 7ef070f21..183c10f3d 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/NewEpisodesFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/NewEpisodesFragment.java
@@ -7,6 +7,8 @@ import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.helper.ItemTouchHelper;
 import android.util.Log;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 
@@ -92,7 +94,7 @@ public class NewEpisodesFragment extends AllEpisodesFragment {
                     }
                 };
 
-                Snackbar snackbar = Snackbar.make(root, getString(R.string.marked_as_read_label),
+                Snackbar snackbar = Snackbar.make(root, getString(R.string.marked_as_seen_label),
                         Snackbar.LENGTH_LONG);
                 snackbar.setAction(getString(R.string.undo), v -> {
                     DBWriter.markItemPlayed(FeedItem.NEW, item.getId());
diff --git a/app/src/main/res/menu/new_episodes.xml b/app/src/main/res/menu/episodes.xml
index 1e1d7ab78..bbaabcd8b 100644
--- a/app/src/main/res/menu/new_episodes.xml
+++ b/app/src/main/res/menu/episodes.xml
@@ -24,4 +24,11 @@
         custom:showAsAction="collapseActionView"
         android:icon="?attr/navigation_accept"/>
 
-</menu>
\ No newline at end of file
+    <item
+        android:id="@+id/mark_all_seen_item"
+        android:title="@string/mark_all_seen_label"
+        android:menuCategory="container"
+        custom:showAsAction="collapseActionView"
+        android:icon="?attr/navigation_accept"/>
+
+</menu>
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 60e2daa7d..f4ed79937 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -142,6 +142,7 @@
     <string name="stream_label">Stream</string>
     <string name="remove_label">Remove</string>
     <string name="remove_episode_lable">Remove Episode</string>
+    <string name="marked_as_seen_label">Marked as seen</string>
     <string name="mark_read_label">Mark as played</string>
     <string name="marked_as_read_label">Marked as played</string>
     <string name="mark_unread_label">Mark as unplayed</string>