return all icon drawables in base feeds fragment getIconForFeed()

4 files changed, 24 insertions, 18 deletions

diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java
index 87bdc96f..d86969cc 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java
@@ -609,19 +609,23 @@ public class FeedsFragment extends Fragment implements OnSharedPreferenceChangeL
 	protected int getIconForFeed(Feed feed) {
 		if (feed.id == Feed.TYPE_GOBACK) {
 			return R.drawable.baseline_arrow_back_24;
+		} else if (feed.id == Feed.CAT_LABELS && feed.is_cat) {
+			return R.drawable.outline_label_24;
+		} else if (feed.id == Feed.CAT_SPECIAL && feed.is_cat) {
+			return R.drawable.baseline_folder_special_24;
 		} else if (feed.id == Feed.TYPE_TOGGLE_UNREAD) {
 			return R.drawable.baseline_filter_alt_24;
-		} else if (feed.id == 0 && !feed.is_cat) {
+		} else if (feed.id == Feed.ARCHIVED && !feed.is_cat) {
 			return R.drawable.baseline_archive_24;
-		} else if (feed.id == -1 && !feed.is_cat) {
+		} else if (feed.id == Feed.MARKED && !feed.is_cat) {
 			return R.drawable.baseline_star_24;
-		} else if (feed.id == -2 && !feed.is_cat) {
+		} else if (feed.id == Feed.PUBLISHED && !feed.is_cat) {
 			return R.drawable.rss;
-		} else if (feed.id == -3 && !feed.is_cat) {
+		} else if (feed.id == Feed.FRESH && !feed.is_cat) {
 			return R.drawable.baseline_local_fire_department_24;
-		} else if (feed.id == -4 && !feed.is_cat) {
+		} else if (feed.id == Feed.ALL_ARTICLES && !feed.is_cat) {
 			return R.drawable.baseline_inbox_24;
-		} else if (feed.id == -6 && !feed.is_cat) {
+		} else if (feed.id == Feed.RECENTLY_READ && !feed.is_cat) {
 			return R.drawable.baseline_restore_24;
 		} else if (feed.is_cat) {
 			return R.drawable.baseline_folder_open_24;
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/RootCategoriesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/RootCategoriesFragment.java
index 55c23226..e94d0405 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/RootCategoriesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/RootCategoriesFragment.java
@@ -50,18 +50,6 @@ public class RootCategoriesFragment extends FeedsFragment {
 	}
 
 	@Override
-	protected int getIconForFeed(Feed feed) {
-		if (feed.id == Feed.TYPE_TOGGLE_UNREAD)
-			return super.getIconForFeed(feed);
-		else if (feed.id == Feed.CAT_LABELS)
-			return R.drawable.outline_label_24;
-		else if (feed.id == Feed.CAT_SPECIAL)
-			return R.drawable.baseline_folder_special_24;
-		else
-			return R.drawable.baseline_folder_open_24;
-	}
-
-	@Override
 	public void refresh() {
 		if (!isAdded())
 			return;
@@ -92,6 +80,12 @@ public class RootCategoriesFragment extends FeedsFragment {
 				.peek(f -> f.is_cat = true)
 				.collect(Collectors.toList());
 
+		/* if (m_prefs.getBoolean("expand_special_cat", true)) {
+			loadedFeeds = loadedFeeds.stream()
+					.filter(f -> f.id != Feed.CAT_SPECIAL && f.id != Feed.CAT_LABELS)
+					.collect(Collectors.toList());
+		} */
+
 		feedsWork.addAll(loadedFeeds);
 
 		feedsWork.add(new Feed(Feed.TYPE_DIVIDER));
diff --git a/org.fox.ttrss/src/main/res/values/strings.xml b/org.fox.ttrss/src/main/res/values/strings.xml
index 36d177c4..e3111027 100755
--- a/org.fox.ttrss/src/main/res/values/strings.xml
+++ b/org.fox.ttrss/src/main/res/values/strings.xml
@@ -313,4 +313,5 @@
     <string name="enable_dynamic_colors">Dynamic colors</string>
     <string name="enable_icon_tinting">Enable icon tinting</string>
     <string name="enable_icon_tinting_summary">Disable if you have trouble distinguishing icons because of their color</string>
+    <string name="expand_special_cat">Expand Special category</string>
 </resources>
diff --git a/org.fox.ttrss/src/main/res/xml/preferences.xml b/org.fox.ttrss/src/main/res/xml/preferences.xml
index 19c718ca..a5a49e04 100755
--- a/org.fox.ttrss/src/main/res/xml/preferences.xml
+++ b/org.fox.ttrss/src/main/res/xml/preferences.xml
@@ -62,6 +62,13 @@
             android:summary="@string/browse_cats_like_feeds_summary"
             android:title="@string/browse_cats_like_feeds" />
 
+        <!--
+        <SwitchPreferenceCompat
+            android:defaultValue="true"
+            android:dependency="@string/enable_cats"
+            android:key="expand_special_cat"
+            android:title="@string/expand_special_cat" /> -->
+
         <ListPreference
             android:defaultValue="0"
             android:entries="@array/open_on_startup_names"