diff options
| author | Andrew Dolgov <[email protected]> | 2023-10-05 10:12:14 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2023-10-05 10:12:14 +0300 |
| commit | 6acdb2cc4520f41549694ad552026b562270a093 (patch) | |
| tree | f0f0beade62edc045fe4c6d4dcc940b97e2f50c0 | |
| parent | 008978016c99760201668aaaf93ca3d529249058 (diff) | |
lint issues, use Feed.getSpecialFeedTitleById in one more place
3 files changed, 4 insertions, 26 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 d4f431c0..60020086 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 @@ -114,30 +114,8 @@ public class FeedsFragment extends BaseFeedlistFragment implements OnItemClickLi catUnread += f.unread; } - // TODO: use Feed.getSpecialFeedTitleById - // TODO: join with shortcut title lookup by id? - if (m_activeCategory != null && m_activeCategory.id == -1) { - switch (f.id) { - case -1: - f.title = getString(R.string.feed_starred_articles); - break; - case -2: - f.title = getString(R.string.feed_published_articles); - break; - case -3: - f.title = getString(R.string.fresh_articles); - break; - case -4: - f.title = getString(R.string.feed_all_articles); - break; - case -6: - f.title = getString(R.string.feed_recently_read); - break; - case 0: - f.title = getString(R.string.feed_archived_articles); - break; - } - } + if (m_activeCategory != null && m_activeCategory.id == -1) + f.title = Feed.getSpecialFeedTitleById(m_activity, f.id); } sortFeeds(); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineDetailActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineDetailActivity.java index 1871ad0b..50335966 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineDetailActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineDetailActivity.java @@ -74,7 +74,7 @@ public class OfflineDetailActivity extends OfflineActivity implements OfflineHea } }; - m_drawerLayout.setDrawerListener(m_drawerToggle); + m_drawerLayout.addDrawerListener(m_drawerToggle); m_drawerToggle.setDrawerIndicatorEnabled(true); } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineMasterActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineMasterActivity.java index 0a3b6378..efd1ed97 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineMasterActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineMasterActivity.java @@ -79,7 +79,7 @@ public class OfflineMasterActivity extends OfflineActivity implements OfflineHea } }; - m_drawerLayout.setDrawerListener(m_drawerToggle); + m_drawerLayout.addDrawerListener(m_drawerToggle); m_drawerToggle.setDrawerIndicatorEnabled(true); } |