Merge pull request #808 from mfietz/feature/nav-indicators+new-redone

Nav indicators, context menus and new "new"

2 files changed, 14 insertions, 4 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java
index 213afb57a..b59f6ba35 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java
@@ -703,8 +703,13 @@ public class AudioplayerActivity extends MediaplayerActivity implements ItemDesc
         }
 
         @Override
-        public int getNumberOfUnreadItems() {
-            return (navDrawerData != null) ? navDrawerData.numUnreadItems : 0;
+        public int getNumberOfNewItems() {
+            return (navDrawerData != null) ? navDrawerData.numNewItems : 0;
+        }
+
+        @Override
+        public int getNumberOfUnreadFeedItems(long feedId) {
+            return (navDrawerData != null) ? navDrawerData.numUnreadFeedItems.get(feedId) : 0;
         }
     };
 }
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 dfecfc837..d62612c76 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
@@ -507,8 +507,13 @@ public class MainActivity extends ActionBarActivity implements NavDrawerActivity
         }
 
         @Override
-        public int getNumberOfUnreadItems() {
-            return (navDrawerData != null) ? navDrawerData.numUnreadItems : 0;
+        public int getNumberOfNewItems() {
+            return (navDrawerData != null) ? navDrawerData.numNewItems : 0;
+        }
+
+        @Override
+        public int getNumberOfUnreadFeedItems(long feedId) {
+            return (navDrawerData != null) ? navDrawerData.numUnreadFeedItems.get(feedId) : 0;
         }
 
     };