summaryrefslogtreecommitdiff
path: root/app/src/main/java/de/danoeh/antennapod/activity
diff options
context:
space:
mode:
authorTom Hennen <TomHennen@users.noreply.github.com>2015-04-16 21:08:41 -0400
committerTom Hennen <TomHennen@users.noreply.github.com>2015-04-16 21:08:41 -0400
commitbeabcf4302a9e703a3fefa114ff946acb593b7e2 (patch)
tree731325a1cbd0e1fddbe81033690f8e43593b6c92 /app/src/main/java/de/danoeh/antennapod/activity
parentffc358ee671fc0bac5f1afa6bf2f672f474dfab3 (diff)
parent4e9597a95075e8384c6545b8d6c9a63be3c22e48 (diff)
downloadAntennaPod-beabcf4302a9e703a3fefa114ff946acb593b7e2.zip
Merge pull request #748 from TomHennen/new_and_all_episodes
New and all episodes fixes AntennaPod/AntennaPod#741 and fixes AntennaPod/AntennaPod#742
Diffstat (limited to 'app/src/main/java/de/danoeh/antennapod/activity')
-rw-r--r--app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java11
1 files changed, 8 insertions, 3 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 b749788da..6f6b68579 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
@@ -34,6 +34,7 @@ import de.danoeh.antennapod.core.preferences.UserPreferences;
import de.danoeh.antennapod.core.storage.DBReader;
import de.danoeh.antennapod.core.util.StorageUtils;
import de.danoeh.antennapod.fragment.AddFeedFragment;
+import de.danoeh.antennapod.fragment.AllEpisodesFragment;
import de.danoeh.antennapod.fragment.DownloadsFragment;
import de.danoeh.antennapod.fragment.ExternalPlayerFragment;
import de.danoeh.antennapod.fragment.ItemlistFragment;
@@ -69,9 +70,10 @@ public class MainActivity extends ActionBarActivity implements NavDrawerActivity
public static final int POS_QUEUE = 0,
POS_NEW = 1,
- POS_DOWNLOADS = 2,
- POS_HISTORY = 3,
- POS_ADD = 4;
+ POS_ALL_EPISODES = 2,
+ POS_DOWNLOADS = 3,
+ POS_HISTORY = 4,
+ POS_ADD = 5;
private Toolbar toolbar;
private ExternalPlayerFragment externalPlayerFragment;
@@ -224,6 +226,9 @@ public class MainActivity extends ActionBarActivity implements NavDrawerActivity
case POS_NEW:
fragment = new NewEpisodesFragment();
break;
+ case POS_ALL_EPISODES:
+ fragment = new AllEpisodesFragment();
+ break;
case POS_QUEUE:
fragment = new QueueFragment();
break;