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

account for feeds listview header when showing context menu

Browse Source 
do not enable all articles entry for special categories
This commit is contained in:
Andrew Dolgov 2014-11-07 01:06:46 +03:00
parent ef5ca11c43
commit 3ef8a660a8
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -239,10 +239,11 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh
getActivity().getMenuInflater().inflate(R.menu.feed_menu, menu); getActivity().getMenuInflater().inflate(R.menu.feed_menu, menu);
AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo; AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo;
Feed feed = m_adapter.getItem(info.position);
ListView list = (ListView) getView().findViewById(R.id.feeds);
Feed feed = (Feed) list.getItemAtPosition(info.position);
if (feed != null) menu.setHeaderTitle(feed.display_title != null ? feed.display_title : feed.title);
menu.setHeaderTitle(feed.display_title != null ? feed.display_title : feed.title);
if (!feed.is_cat) { if (!feed.is_cat) {
menu.findItem(R.id.browse_feeds).setVisible(false); menu.findItem(R.id.browse_feeds).setVisible(false);
@ -376,9 +377,9 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh
@Override @Override
public void onItemClick(AdapterView<?> av, View view, int position, long id) { public void onItemClick(AdapterView<?> av, View view, int position, long id) {
ListView list = (ListView)av; ListView list = (ListView)av;
if (list != null) { if (list != null) {
Feed feed = (Feed)list.getItemAtPosition(position); Feed feed = (Feed)list.getItemAtPosition(position);
if (feed.is_cat) { if (feed.is_cat) {
if (feed.always_display_as_feed) { if (feed.always_display_as_feed) {
@ -535,7 +536,7 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh
Type listType = new TypeToken<List<Feed>>() {}.getType(); Type listType = new TypeToken<List<Feed>>() {}.getType();
final List<Feed> feeds = new Gson().fromJson(content, listType); final List<Feed> feeds = new Gson().fromJson(content, listType);
m_feeds.clear(); m_feeds.clear();
int catUnread = 0; int catUnread = 0;
@ -548,13 +549,14 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh
sortFeeds(); sortFeeds();
if (m_enableParentBtn && m_activeCategory != null && m_activeCategory.id >= 0) { if (m_enableParentBtn && m_activeCategory != null && m_activeCategory.id >= 0 && m_feeds.size() > 0) {
Feed feed = new Feed(m_activeCategory.id, m_activeCategory.title, true); Feed feed = new Feed(m_activeCategory.id, m_activeCategory.title, true);
feed.unread = catUnread; feed.unread = catUnread;
feed.always_display_as_feed = true; feed.always_display_as_feed = true;
feed.display_title = getString(R.string.feed_all_articles); feed.display_title = getString(R.string.feed_all_articles);
m_feeds.add(0, feed); m_feeds.add(0, feed);
m_adapter.notifyDataSetChanged();
} }
/*if (m_feeds.size() == 0) /*if (m_feeds.size() == 0)
@ -722,7 +724,7 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh
// sort order got changed in prefs or something // sort order got changed in prefs or something
e.printStackTrace(); e.printStackTrace();
} }
try { try {
m_adapter.notifyDataSetChanged(); m_adapter.notifyDataSetChanged();
} catch (NullPointerException e) { } catch (NullPointerException e) {