diff options
Diffstat (limited to 'app/src/main/java')
| -rw-r--r-- | app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java | 13 | ||||
| -rw-r--r-- | app/src/main/java/de/danoeh/antennapod/view/PagerIndicatorView.java | 11 |
2 files changed, 8 insertions, 16 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 befe142cc..59cde717e 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java @@ -202,17 +202,13 @@ public class NavListAdapter extends BaseAdapter v = getFeedView(position, convertView, parent); } if (v != null && viewType != VIEW_TYPE_SECTION_DIVIDER) { - TextView txtvTitle = v.findViewById(R.id.txtvTitle); TypedValue typedValue = new TypedValue(); if (position == itemAccess.getSelectedItemIndex()) { - txtvTitle.setTypeface(null, Typeface.BOLD); - v.getContext().getTheme().resolveAttribute(de.danoeh.antennapod.core.R.attr.drawer_activated_color, typedValue, true); + v.getContext().getTheme().resolveAttribute(R.attr.drawer_activated_color, typedValue, true); v.setBackgroundResource(typedValue.resourceId); - } else { - txtvTitle.setTypeface(null, Typeface.NORMAL); - v.getContext().getTheme().resolveAttribute(de.danoeh.antennapod.core.R.attr.nav_drawer_background, typedValue, true); + v.getContext().getTheme().resolveAttribute(android.R.attr.windowBackground, typedValue, true); v.setBackgroundResource(typedValue.resourceId); } } @@ -356,11 +352,6 @@ public class NavListAdapter extends BaseAdapter if(counter > 0) { holder.count.setVisibility(View.VISIBLE); holder.count.setText(String.valueOf(counter)); - if (itemAccess.getSelectedItemIndex() == position) { - holder.count.setTypeface(null, Typeface.BOLD); - } else { - holder.count.setTypeface(null, Typeface.NORMAL); - } } else { holder.count.setVisibility(View.GONE); } diff --git a/app/src/main/java/de/danoeh/antennapod/view/PagerIndicatorView.java b/app/src/main/java/de/danoeh/antennapod/view/PagerIndicatorView.java index 60ef820a9..53a95eede 100644 --- a/app/src/main/java/de/danoeh/antennapod/view/PagerIndicatorView.java +++ b/app/src/main/java/de/danoeh/antennapod/view/PagerIndicatorView.java @@ -86,11 +86,12 @@ public class PagerIndicatorView extends View { } private void drawCircle(Canvas canvas, int position, float frac) { - float circleRadiusSmall = canvas.getHeight() * 0.26f; - float circleRadiusBig = canvas.getHeight() * 0.35f; + float availableHeight = canvas.getHeight() - getPaddingTop() - getPaddingBottom(); + float circleRadiusSmall = availableHeight * 0.26f; + float circleRadiusBig = availableHeight * 0.35f; float circleRadiusDelta = (circleRadiusBig - circleRadiusSmall); - float start = 0.5f * (canvas.getWidth() - numPages * 1.5f * canvas.getHeight()); - paint.setStrokeWidth(canvas.getHeight() * 0.3f); + float start = 0.5f * (canvas.getWidth() - numPages * 1.5f * availableHeight); + paint.setStrokeWidth(availableHeight * 0.3f); if (position == disabledPage) { paint.setStyle(Paint.Style.STROKE); @@ -99,7 +100,7 @@ public class PagerIndicatorView extends View { } paint.setColor((Integer) new ArgbEvaluator().evaluate(frac, circleColor, circleColorHighlight)); - canvas.drawCircle(start + (position * 1.5f + 0.75f) * canvas.getHeight(), 0.5f * canvas.getHeight(), + canvas.drawCircle(start + (position * 1.5f + 0.75f) * availableHeight, 0.5f * availableHeight + getPaddingTop(), circleRadiusSmall + frac * circleRadiusDelta, paint); } }
\ No newline at end of file |