iamthefij/tt-rss-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

allow browsing child categories as categories

Browse Source
This commit is contained in:
Andrew Dolgov 2012-09-24 22:10:01 +04:00
parent c6225cd16e
commit 53a1c5d5fe
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
res/menu/feed_menu.xml
View File

@ -8,6 +8,10 @@
android:id="@+id/browse_articles" android:id="@+id/browse_articles"
android:title="@string/category_browse_articles"/> android:title="@string/category_browse_articles"/>
<item
android:id="@+id/browse_feeds"
android:title="@string/category_browse_feeds"/>
<item <item
android:id="@+id/catchup_feed" android:id="@+id/catchup_feed"
android:title="@string/catchup"/> android:title="@string/catchup"/>

18
src/org/fox/ttrss/FeedsFragment.java
View File

@ -155,6 +155,14 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh
} }
} }
return true; return true;
case R.id.browse_feeds:
if (true) {
Feed feed = getFeedAtPosition(info.position);
if (feed != null) {
m_activity.onCatSelected(new FeedCategory(feed.id, feed.title, feed.unread), false);
}
}
return true;
case R.id.catchup_feed: case R.id.catchup_feed:
if (true) { if (true) {
Feed feed = getFeedAtPosition(info.position); Feed feed = getFeedAtPosition(info.position);
@ -186,6 +194,10 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh
menu.findItem(R.id.browse_articles).setVisible(false); menu.findItem(R.id.browse_articles).setVisible(false);
} }
if (!feed.is_cat) {
menu.findItem(R.id.browse_feeds).setVisible(false);
}
super.onCreateContextMenu(menu, v, menuInfo); super.onCreateContextMenu(menu, v, menuInfo);
} }
@ -263,11 +275,7 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh
m_activity.openFeedArticles(feed); m_activity.openFeedArticles(feed);
} else { } else {
FeedCategory cat = new FeedCategory(); m_activity.onCatSelected(new FeedCategory(feed.id, feed.title, feed.unread));
cat.id = feed.id;
cat.title = feed.title;
m_activity.onCatSelected(cat);
} }
} else { } else {
if ("ARTICLES".equals(m_prefs.getString("default_view_mode", "HEADLINES"))) { if ("ARTICLES".equals(m_prefs.getString("default_view_mode", "HEADLINES"))) {