From 4f1c690e91f5f37aa24c336180120e451f87822a Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 22 Jun 2012 15:05:50 +0400 Subject: initial support for categories in offline mode layout tweaks --- .../fox/ttrss/offline/OfflineFeedsFragment.java | 24 ++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) (limited to 'src/org/fox/ttrss/offline/OfflineFeedsFragment.java') diff --git a/src/org/fox/ttrss/offline/OfflineFeedsFragment.java b/src/org/fox/ttrss/offline/OfflineFeedsFragment.java index 682fb168..ee91eb5b 100644 --- a/src/org/fox/ttrss/offline/OfflineFeedsFragment.java +++ b/src/org/fox/ttrss/offline/OfflineFeedsFragment.java @@ -40,10 +40,19 @@ public class OfflineFeedsFragment extends Fragment implements OnItemClickListene private FeedListAdapter m_adapter; private static final String ICON_PATH = "/data/org.fox.ttrss/icons/"; private int m_selectedFeedId; + private int m_catId = -1; private boolean m_enableFeedIcons; private Cursor m_cursor; private OfflineServices m_offlineServices; + public OfflineFeedsFragment() { + // + } + + public OfflineFeedsFragment(int catId) { + m_catId = catId; + } + @Override public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) { @@ -61,12 +70,16 @@ public class OfflineFeedsFragment extends Fragment implements OnItemClickListene } public Cursor createCursor() { - String unreadOnly = m_offlineServices.getUnreadOnly() ? "unread > 0" : null; - + String unreadOnly = m_offlineServices.getUnreadOnly() ? "unread > 0" : "1"; String order = m_prefs.getBoolean("sort_feeds_by_unread", false) ? "unread DESC, title" : "title"; - return m_offlineServices.getReadableDb().query("feeds_unread", + if (m_catId != -1) { + return m_offlineServices.getReadableDb().query("feeds_unread", + null, unreadOnly + " AND cat_id = ?", new String[] { String.valueOf(m_catId) }, null, null, order); + } else { + return m_offlineServices.getReadableDb().query("feeds_unread", null, unreadOnly, null, null, null, order); + } } public void refresh() { @@ -85,6 +98,7 @@ public class OfflineFeedsFragment extends Fragment implements OnItemClickListene if (savedInstanceState != null) { m_selectedFeedId = savedInstanceState.getInt("selectedFeedId"); + m_catId = savedInstanceState.getInt("catId"); } View view = inflater.inflate(R.layout.feeds_fragment, container, false); @@ -131,6 +145,7 @@ public class OfflineFeedsFragment extends Fragment implements OnItemClickListene super.onSaveInstanceState(out); out.putInt("selectedFeedId", m_selectedFeedId); + out.putInt("catId", m_catId); } @Override @@ -146,7 +161,8 @@ public class OfflineFeedsFragment extends Fragment implements OnItemClickListene m_offlineServices.viewFeed(feedId); - m_selectedFeedId = feedId; + if (!m_offlineServices.isSmallScreen()) + m_selectedFeedId = feedId; m_adapter.notifyDataSetChanged(); } -- cgit v1.2.3-54-g00ecf