switched to 'New Episodes', also displaying queue first in the drawer

4 files changed, 7 insertions, 5 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
index b3e95f0c0..2efee838d 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
@@ -66,8 +66,8 @@ public class MainActivity extends ActionBarActivity implements NavDrawerActivity
     public static final String SAVE_TITLE = "title";
 
 
-    public static final int POS_NEW = 0,
-            POS_QUEUE = 1,
+    public static final int POS_QUEUE = 0,
+            POS_NEW = 1,
             POS_DOWNLOADS = 2,
             POS_HISTORY = 3,
             POS_ADD = 4;
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 a0ba0f794..5494869a6 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,7 @@ 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.all_episodes_label, R.string.queue_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.downloads_label, R.string.playback_history_label, R.string.add_feed_label};
 
     private final Drawable[] drawables;
 
@@ -132,7 +132,7 @@ public class NavListAdapter extends BaseAdapter {
             } else {
                 holder.count.setVisibility(View.GONE);
             }
-        } else if (NAV_TITLES[position] == R.string.all_episodes_label) {
+        } else if (NAV_TITLES[position] == R.string.new_episodes_label) {
             int unreadItems = itemAccess.getNumberOfUnreadItems();
             if (unreadItems > 0) {
                 holder.count.setVisibility(View.VISIBLE);
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 61daa6a74..f556d9542 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/NewEpisodesListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/NewEpisodesListAdapter.java
@@ -144,6 +144,8 @@ public class NewEpisodesListAdapter extends BaseAdapter {
         if (item.isRead()) {
             // grey it out
             ViewHelper.setAlpha(convertView, .2f);
+        } else {
+            ViewHelper.setAlpha(convertView, 1.0f);
         }
 
         return convertView;
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 de00cf3ae..6a4e6bbee 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/NewEpisodesFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/NewEpisodesFragment.java
@@ -230,7 +230,7 @@ public class NewEpisodesFragment extends Fragment {
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         super.onCreateView(inflater, container, savedInstanceState);
-        ((MainActivity) getActivity()).getSupportActionBar().setTitle(R.string.all_episodes_label);
+        ((MainActivity) getActivity()).getSupportActionBar().setTitle(R.string.new_episodes_label);
 
         View root = inflater.inflate(R.layout.new_episodes_fragment, container, false);