about summary refs log tree commit diff stats
path: root/org.fox.ttrss/src/main/java/org
diff options
context:
space:
mode:
authorAndrew Dolgov <fox@fakecake.org>2025-05-17 13:07:47 +0300
committerAndrew Dolgov <fox@fakecake.org>2025-05-17 13:07:47 +0300
commit625979e2cd83aa29f88ea308c2277fe00f9b6bcd (patch)
treea474b0b2609dd0b2d3b33bcd533c8b8f8138044a /org.fox.ttrss/src/main/java/org
parent0a5074d92cac7fb912cc874a877a898e2b18dc9c (diff)
downloadtt-rss-android-625979e2cd83aa29f88ea308c2277fe00f9b6bcd.tar.gz
tt-rss-android-625979e2cd83aa29f88ea308c2277fe00f9b6bcd.tar.xz
bring back option to disable cats
Diffstat (limited to 'org.fox.ttrss/src/main/java/org')
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java6
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java13
2 files changed, 16 insertions, 3 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 f6df912c..e6daed4b 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
@@ -355,6 +355,12 @@ public class FeedsFragment extends Fragment implements OnSharedPreferenceChangeL
 
 				feedsWork.add(1, feed);
 			}
+		} else if (m_rootFeed.id == Feed.ALL_ARTICLES) {
+			// if all articles feed is requested as a root element (no parent button) let's filter
+			// labels out so this is at least somewhat readable, instead we'll insert a link to this category to the top
+			loadedFeeds = loadedFeeds.stream().filter(a -> a.id >= -10).collect(Collectors.toList());
+
+			loadedFeeds.add(0, new Feed(Feed.CAT_LABELS, getString(R.string.cat_labels), true));
 		}
 
 		feedsWork.addAll(loadedFeeds);
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java
index b35a7b34..f2ef3aa0 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java
@@ -159,10 +159,17 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList
 			}
 
 			FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
-			RootCategoriesFragment fc = new RootCategoriesFragment();
+			FeedsFragment fc;
+
+			if (m_prefs.getBoolean("enable_cats", true)) {
+				fc = new RootCategoriesFragment();
+				// it doesn't matter which feed is used here
+				fc.initialize(new Feed(Feed.CAT_SPECIAL, getString(R.string.cat_special), true), false);
+			} else {
+				fc = new FeedsFragment();
+				fc.initialize(new Feed(Feed.ALL_ARTICLES, getString(R.string.feed_all_articles), true), false);
+			}
 
-			// it doesn't matter which feed is used here
-			fc.initialize(new Feed(-1, getString(R.string.cat_special), true), false);
 			ft.replace(R.id.feeds_fragment, fc, FRAG_FEEDS);
 
 			/* FeedsFragment ff = new FeedsFragment();