From a16f2d2124f12e4c0a46afdbb588baa959983048 Mon Sep 17 00:00:00 2001
From: Martin Fietz <Martin.Fietz@gmail.com>
Date: Wed, 1 Jun 2016 12:13:13 +0200
Subject: New episodes: Mark all as seen instead of played

---
 .../antennapod/fragment/AllEpisodesFragment.java   | 14 +++++----
 .../antennapod/fragment/NewEpisodesFragment.java   |  2 ++
 app/src/main/res/menu/episodes.xml                 | 34 ++++++++++++++++++++++
 app/src/main/res/menu/new_episodes.xml             | 27 -----------------
 core/src/main/res/values/strings.xml               |  1 +
 5 files changed, 45 insertions(+), 33 deletions(-)
 create mode 100644 app/src/main/res/menu/episodes.xml
 delete mode 100644 app/src/main/res/menu/new_episodes.xml

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 8ae7f1cf9..37fb4ca4f 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..8f786eb46 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;
 
diff --git a/app/src/main/res/menu/episodes.xml b/app/src/main/res/menu/episodes.xml
new file mode 100644
index 000000000..bbaabcd8b
--- /dev/null
+++ b/app/src/main/res/menu/episodes.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:custom="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/action_search"
+        android:icon="?attr/action_search"
+        custom:showAsAction="always"
+        custom:actionViewClass="android.support.v7.widget.SearchView"
+        android:title="@string/search_label"/>
+
+    <item
+        android:id="@+id/refresh_item"
+        android:title="@string/refresh_label"
+        android:menuCategory="container"
+        custom:showAsAction="always"
+        android:icon="?attr/navigation_refresh"/>
+
+    <item
+        android:id="@+id/mark_all_read_item"
+        android:title="@string/mark_all_read_label"
+        android:menuCategory="container"
+        custom:showAsAction="collapseActionView"
+        android:icon="?attr/navigation_accept"/>
+
+    <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/app/src/main/res/menu/new_episodes.xml b/app/src/main/res/menu/new_episodes.xml
deleted file mode 100644
index 1e1d7ab78..000000000
--- a/app/src/main/res/menu/new_episodes.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:custom="http://schemas.android.com/apk/res-auto">
-
-    <item
-        android:id="@+id/action_search"
-        android:icon="?attr/action_search"
-        custom:showAsAction="always"
-        custom:actionViewClass="android.support.v7.widget.SearchView"
-        android:title="@string/search_label"/>
-
-    <item
-        android:id="@+id/refresh_item"
-        android:title="@string/refresh_label"
-        android:menuCategory="container"
-        custom:showAsAction="always"
-        android:icon="?attr/navigation_refresh"/>
-
-    <item
-        android:id="@+id/mark_all_read_item"
-        android:title="@string/mark_all_read_label"
-        android:menuCategory="container"
-        custom:showAsAction="collapseActionView"
-        android:icon="?attr/navigation_accept"/>
-
-</menu>
\ No newline at end of file
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 7e0982294..620bc2b65 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -143,6 +143,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>
-- 
cgit v1.2.3