diff options
author | ByteHamster <info@bytehamster.com> | 2021-01-02 20:17:17 +0100 |
---|---|---|
committer | ByteHamster <info@bytehamster.com> | 2021-01-02 20:17:17 +0100 |
commit | 3104232e5d8c355aa090e13cc9ff871beb200b4e (patch) | |
tree | 648984f85e22414ba823f3b7d1d482a66bedc262 /core/src/main/java/de/danoeh/antennapod | |
parent | 052884e0813fbd4580d6139d3034a4fe57e2bce0 (diff) | |
download | AntennaPod-3104232e5d8c355aa090e13cc9ff871beb200b4e.zip |
Calculate layer in makeFlatDrawerData
Diffstat (limited to 'core/src/main/java/de/danoeh/antennapod')
-rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java | 10 | ||||
-rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/storage/NavDrawerData.java | 21 |
2 files changed, 19 insertions, 12 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java b/core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java index e1bb93db3..e285d82ff 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java +++ b/core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java @@ -868,22 +868,22 @@ public final class DBReader { List<NavDrawerData.DrawerItem> items = new ArrayList<>(); for (int i = 0, feedsSize = feeds.size(); i < feedsSize; i++) { - items.add(new NavDrawerData.FeedDrawerItem(feeds.get(i), 0, i, feedCounters.get(feeds.get(i).getId()))); + items.add(new NavDrawerData.FeedDrawerItem(feeds.get(i), i, feedCounters.get(feeds.get(i).getId()))); } List<NavDrawerData.DrawerItem> folderItems = new ArrayList<>(); for (int i = 0, feedsSize = feeds.size(); i < feedsSize; i++) { - folderItems.add(new NavDrawerData.FeedDrawerItem(feeds.get(i), 1, 10001 + i, + folderItems.add(new NavDrawerData.FeedDrawerItem(feeds.get(i), 10001 + i, feedCounters.get(feeds.get(i).getId()))); } - items.add(new NavDrawerData.FolderDrawerItem("Folder 1", folderItems, 0, 10000)); + items.add(new NavDrawerData.FolderDrawerItem("Folder 1", folderItems, 10000)); List<NavDrawerData.DrawerItem> folderItems2 = new ArrayList<>(); for (int i = 0, feedsSize = feeds.size(); i < feedsSize; i++) { - folderItems2.add(new NavDrawerData.FeedDrawerItem(feeds.get(i), 1, 20001 + i, + folderItems2.add(new NavDrawerData.FeedDrawerItem(feeds.get(i), 20001 + i, feedCounters.get(feeds.get(i).getId()))); } - items.add(new NavDrawerData.FolderDrawerItem("Folder 2", folderItems2, 0, 20000)); + items.add(new NavDrawerData.FolderDrawerItem("Folder 2", folderItems2, 20000)); NavDrawerData result = new NavDrawerData(items, queueSize, numNewItems, numDownloadedItems, feedCounters, UserPreferences.getEpisodeCleanupAlgorithm().getReclaimableItems()); diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/NavDrawerData.java b/core/src/main/java/de/danoeh/antennapod/core/storage/NavDrawerData.java index 3af9ef9d3..66d3f7940 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/storage/NavDrawerData.java +++ b/core/src/main/java/de/danoeh/antennapod/core/storage/NavDrawerData.java @@ -33,15 +33,22 @@ public class NavDrawerData { } public final Type type; - public final int layer; + private int layer; public final long id; - public DrawerItem(Type type, int layer, long id) { + public DrawerItem(Type type, long id) { this.type = type; - this.layer = layer; this.id = id; } + public int getLayer() { + return layer; + } + + public void setLayer(int layer) { + this.layer = layer; + } + public abstract String getTitle(); public abstract int getCounter(); @@ -52,8 +59,8 @@ public class NavDrawerData { public final String name; public boolean isOpen; - public FolderDrawerItem(String name, List<DrawerItem> children, int layer, long id) { - super(DrawerItem.Type.FOLDER, layer, id); + public FolderDrawerItem(String name, List<DrawerItem> children, long id) { + super(DrawerItem.Type.FOLDER, id); this.children = children; this.name = name; } @@ -75,8 +82,8 @@ public class NavDrawerData { public final Feed feed; public final int counter; - public FeedDrawerItem(Feed feed, int layer, long id, int counter) { - super(DrawerItem.Type.FEED, layer, id); + public FeedDrawerItem(Feed feed, long id, int counter) { + super(DrawerItem.Type.FEED, id); this.feed = feed; this.counter = counter; } |