diff options
| -rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/feed/FeedItemFilterGroup.java | 25 | ||||
| -rw-r--r-- | model/src/main/java/de/danoeh/antennapod/model/feed/FeedItemFilter.java | 40 |
2 files changed, 41 insertions, 24 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItemFilterGroup.java b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItemFilterGroup.java index fcbe2e4ab..fbdf6b3a9 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItemFilterGroup.java +++ b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItemFilterGroup.java @@ -1,20 +1,21 @@ package de.danoeh.antennapod.core.feed; import de.danoeh.antennapod.core.R; +import de.danoeh.antennapod.model.feed.FeedItemFilter; public enum FeedItemFilterGroup { - PLAYED(new ItemProperties(R.string.hide_played_episodes_label, "played"), - new ItemProperties(R.string.not_played, "unplayed")), - PAUSED(new ItemProperties(R.string.hide_paused_episodes_label, "paused"), - new ItemProperties(R.string.not_paused, "not_paused")), - FAVORITE(new ItemProperties(R.string.hide_is_favorite_label, "is_favorite"), - new ItemProperties(R.string.not_favorite, "not_favorite")), - MEDIA(new ItemProperties(R.string.has_media, "has_media"), - new ItemProperties(R.string.no_media, "no_media")), - QUEUED(new ItemProperties(R.string.queued_label, "queued"), - new ItemProperties(R.string.not_queued_label, "not_queued")), - DOWNLOADED(new ItemProperties(R.string.hide_downloaded_episodes_label, "downloaded"), - new ItemProperties(R.string.hide_not_downloaded_episodes_label, "not_downloaded")); + PLAYED(new ItemProperties(R.string.hide_played_episodes_label, FeedItemFilter.PLAYED), + new ItemProperties(R.string.not_played, FeedItemFilter.UNPLAYED)), + PAUSED(new ItemProperties(R.string.hide_paused_episodes_label, FeedItemFilter.PAUSED), + new ItemProperties(R.string.not_paused, FeedItemFilter.NOT_PAUSED)), + FAVORITE(new ItemProperties(R.string.hide_is_favorite_label, FeedItemFilter.IS_FAVORITE), + new ItemProperties(R.string.not_favorite, FeedItemFilter.NOT_FAVORITE)), + MEDIA(new ItemProperties(R.string.has_media, FeedItemFilter.HAS_MEDIA), + new ItemProperties(R.string.no_media, FeedItemFilter.NO_MEDIA)), + QUEUED(new ItemProperties(R.string.queued_label, FeedItemFilter.QUEUED), + new ItemProperties(R.string.not_queued_label, FeedItemFilter.NOT_QUEUED)), + DOWNLOADED(new ItemProperties(R.string.hide_downloaded_episodes_label, FeedItemFilter.DOWNLOADED), + new ItemProperties(R.string.hide_not_downloaded_episodes_label, FeedItemFilter.NOT_DOWNLOADED)); public final ItemProperties[] values; diff --git a/model/src/main/java/de/danoeh/antennapod/model/feed/FeedItemFilter.java b/model/src/main/java/de/danoeh/antennapod/model/feed/FeedItemFilter.java index 20434213a..4f0736c58 100644 --- a/model/src/main/java/de/danoeh/antennapod/model/feed/FeedItemFilter.java +++ b/model/src/main/java/de/danoeh/antennapod/model/feed/FeedItemFilter.java @@ -11,6 +11,7 @@ public class FeedItemFilter { public final boolean showUnplayed; public final boolean showPaused; public final boolean showNotPaused; + public final boolean showNew; public final boolean showQueued; public final boolean showNotQueued; public final boolean showDownloaded; @@ -20,6 +21,20 @@ public class FeedItemFilter { public final boolean showIsFavorite; public final boolean showNotFavorite; + public static final String PLAYED = "played"; + public static final String UNPLAYED = "unplayed"; + public static final String NEW = "new"; + public static final String PAUSED = "paused"; + public static final String NOT_PAUSED = "not_paused"; + public static final String IS_FAVORITE = "is_favorite"; + public static final String NOT_FAVORITE = "not_favorite"; + public static final String HAS_MEDIA = "has_media"; + public static final String NO_MEDIA = "no_media"; + public static final String QUEUED = "queued"; + public static final String NOT_QUEUED = "not_queued"; + public static final String DOWNLOADED = "downloaded"; + public static final String NOT_DOWNLOADED = "not_downloaded"; + public static FeedItemFilter unfiltered() { return new FeedItemFilter(""); } @@ -32,18 +47,19 @@ public class FeedItemFilter { this.properties = properties; // see R.arrays.feed_filter_values - showUnplayed = hasProperty("unplayed"); - showPaused = hasProperty("paused"); - showNotPaused = hasProperty("not_paused"); - showPlayed = hasProperty("played"); - showQueued = hasProperty("queued"); - showNotQueued = hasProperty("not_queued"); - showDownloaded = hasProperty("downloaded"); - showNotDownloaded = hasProperty("not_downloaded"); - showHasMedia = hasProperty("has_media"); - showNoMedia = hasProperty("no_media"); - showIsFavorite = hasProperty("is_favorite"); - showNotFavorite = hasProperty("not_favorite"); + showUnplayed = hasProperty(UNPLAYED); + showPaused = hasProperty(PAUSED); + showNotPaused = hasProperty(NOT_PAUSED); + showPlayed = hasProperty(PLAYED); + showQueued = hasProperty(QUEUED); + showNotQueued = hasProperty(NOT_QUEUED); + showDownloaded = hasProperty(DOWNLOADED); + showNotDownloaded = hasProperty(NOT_DOWNLOADED); + showHasMedia = hasProperty(HAS_MEDIA); + showNoMedia = hasProperty(NO_MEDIA); + showIsFavorite = hasProperty(IS_FAVORITE); + showNotFavorite = hasProperty(NOT_FAVORITE); + showNew = hasProperty(NEW); } private boolean hasProperty(String property) { |