diff options
author | Martin Fietz <Martin.Fietz@gmail.com> | 2016-06-01 12:13:13 +0200 |
---|---|---|
committer | Martin Fietz <Martin.Fietz@gmail.com> | 2016-06-06 20:11:42 +0200 |
commit | a16f2d2124f12e4c0a46afdbb588baa959983048 (patch) | |
tree | 53e8e1cc1b4f36c6f601664b2d9c5fba77964278 /app/src/main/java/de/danoeh/antennapod | |
parent | d33fda21a5cd6392eb848ec2000bee0274889f0d (diff) | |
download | AntennaPod-a16f2d2124f12e4c0a46afdbb588baa959983048.zip |
New episodes: Mark all as seen instead of played
Diffstat (limited to 'app/src/main/java/de/danoeh/antennapod')
-rw-r--r-- | app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java | 14 | ||||
-rw-r--r-- | app/src/main/java/de/danoeh/antennapod/fragment/NewEpisodesFragment.java | 2 |
2 files changed, 10 insertions, 6 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 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; |