now we have 'All Episodes' and 'New Episodes'

2 files changed, 16 insertions, 14 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
index 05783e3ee..3f3ee6e23 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
@@ -25,7 +25,13 @@ public class NavListAdapter extends BaseAdapter {
     public static final int VIEW_TYPE_SECTION_DIVIDER = 1;
     public static final int VIEW_TYPE_SUBSCRIPTION = 2;
 
-    public static final int[] NAV_TITLES = {R.string.queue_label, R.string.new_episodes_label, R.string.downloads_label, R.string.playback_history_label, R.string.add_feed_label};
+    public static final int[] NAV_TITLES = {
+            R.string.queue_label,
+            R.string.new_episodes_label,
+            R.string.all_episodes_label,
+            R.string.downloads_label,
+            R.string.playback_history_label,
+            R.string.add_feed_label};
 
     private final Drawable[] drawables;
 
@@ -38,10 +44,16 @@ public class NavListAdapter extends BaseAdapter {
         this.itemAccess = itemAccess;
         this.context = context;
 
-        TypedArray ta = context.obtainStyledAttributes(new int[]{R.attr.stat_playlist, R.attr.ic_new,
-                R.attr.av_download, R.attr.ic_history, R.attr.content_new});
+        TypedArray ta = context.obtainStyledAttributes(new int[]{
+                R.attr.stat_playlist,
+                // TODO: wouldn't be bad to have a different icon for all/new episodes
+                R.attr.ic_new,
+                R.attr.ic_new,
+                R.attr.av_download,
+                R.attr.ic_history,
+                R.attr.content_new});
         drawables = new Drawable[]{ta.getDrawable(0), ta.getDrawable(1), ta.getDrawable(2),
-                ta.getDrawable(3), ta.getDrawable(4)};
+                ta.getDrawable(3), ta.getDrawable(4), ta.getDrawable(5)};
         ta.recycle();
     }
 
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/NewEpisodesListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/NewEpisodesListAdapter.java
index 2d481a7ef..1f98ec158 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/NewEpisodesListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/NewEpisodesListAdapter.java
@@ -1,7 +1,6 @@
 package de.danoeh.antennapod.adapter;
 
 import android.content.Context;
-import android.graphics.Color;
 import android.text.format.DateUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -12,11 +11,9 @@ import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
-import com.nineoldandroids.view.ViewHelper;
 import com.squareup.picasso.Picasso;
 
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.core.feed.EventDistributor;
 import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.feed.FeedMedia;
 import de.danoeh.antennapod.core.storage.DownloadRequester;
@@ -142,13 +139,6 @@ public class NewEpisodesListAdapter extends BaseAdapter {
                 .fit()
                 .into(holder.imageView);
 
-        if (item.isRead()) {
-            // grey it out
-            ViewHelper.setAlpha(convertView, .2f);
-        } else {
-            ViewHelper.setAlpha(convertView, 1.0f);
-        }
-
         return convertView;
     }