diff options
| author | Tom Hennen <TomHennen@users.noreply.github.com> | 2016-03-25 08:23:17 -0400 |
|---|---|---|
| committer | Tom Hennen <TomHennen@users.noreply.github.com> | 2016-03-25 08:23:17 -0400 |
| commit | 866747814a36c30665e1c83a2963d1b99626a8fa (patch) | |
| tree | 0183f0c3d3907f864434da4c3dd0026a918d7f97 | |
| parent | 04026ca48c2b557aff1e373bad06a836072721b5 (diff) | |
| parent | f43d5636acd941991c9f7dbff4955aa9356f874c (diff) | |
| download | AntennaPod-866747814a36c30665e1c83a2963d1b99626a8fa.zip | |
Merge pull request #1821 from mfietz/issue/1819-navbar-highlight
Fix navbar counter highlighting
| -rw-r--r-- | app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java index ec1e18ee8..c98a2fac7 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java @@ -177,7 +177,7 @@ public class NavListAdapter extends BaseAdapter } else if (viewType == VIEW_TYPE_SECTION_DIVIDER) { v = getSectionDividerView(convertView, parent); } else { - v = getFeedView(position - getSubscriptionOffset(), convertView, parent); + v = getFeedView(position, convertView, parent); } if (v != null && viewType != VIEW_TYPE_SECTION_DIVIDER) { TextView txtvTitle = (TextView) v.findViewById(R.id.txtvTitle); @@ -267,10 +267,11 @@ public class NavListAdapter extends BaseAdapter return convertView; } - private View getFeedView(int feedPos, View convertView, ViewGroup parent) { - FeedHolder holder; + private View getFeedView(int position, View convertView, ViewGroup parent) { + int feedPos = position - getSubscriptionOffset(); Feed feed = itemAccess.getItem(feedPos); + FeedHolder holder; if (convertView == null) { holder = new FeedHolder(); LayoutInflater inflater = (LayoutInflater) context @@ -298,7 +299,6 @@ public class NavListAdapter extends BaseAdapter holder.title.setText(feed.getTitle()); - if(feed.hasLastUpdateFailed()) { RelativeLayout.LayoutParams p = (RelativeLayout.LayoutParams) holder.title.getLayoutParams(); p.addRule(RelativeLayout.LEFT_OF, R.id.itxtvFailure); @@ -312,7 +312,11 @@ public class NavListAdapter extends BaseAdapter if(counter > 0) { holder.count.setVisibility(View.VISIBLE); holder.count.setText(String.valueOf(counter)); - holder.count.setTypeface(holder.title.getTypeface()); + if (itemAccess.getSelectedItemIndex() == position) { + holder.count.setTypeface(null, Typeface.BOLD); + } else { + holder.count.setTypeface(null, Typeface.NORMAL); + } } else { holder.count.setVisibility(View.GONE); } |