aboutsummaryrefslogtreecommitdiff
path: root/WordPress/src/main/java/org/wordpress/android/ui/stats
diff options
context:
space:
mode:
authorDanilo Ercoli <ercoli@gmail.com>2015-02-26 18:28:25 +0100
committerDanilo Ercoli <ercoli@gmail.com>2015-02-26 18:28:25 +0100
commit4aa572553ab6f1d52f203e355dccfad37af31dfd (patch)
treee9e8fc2f0561bc17b22f42deb1183774b4eed664 /WordPress/src/main/java/org/wordpress/android/ui/stats
parent3d3729c193118961e4ea045f529232ae73e4ee76 (diff)
downloadgradle-perf-android-medium-4aa572553ab6f1d52f203e355dccfad37af31dfd.tar.gz
Make the outer highlight color for bars customizable.
Diffstat (limited to 'WordPress/src/main/java/org/wordpress/android/ui/stats')
-rw-r--r--WordPress/src/main/java/org/wordpress/android/ui/stats/StatsBarGraph.java7
-rw-r--r--WordPress/src/main/java/org/wordpress/android/ui/stats/StatsVisitorsAndViewsFragment.java2
2 files changed, 4 insertions, 5 deletions
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsBarGraph.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsBarGraph.java
index daa86f098..fe0727142 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsBarGraph.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsBarGraph.java
@@ -113,7 +113,7 @@ class StatsBarGraph extends GraphView {
private class HorizontalLabelsBackgroundColor implements IndexDependentColor {
public int get(int index) {
if (mBarPositionToHighlight == index) {
- return getResources().getColor(R.color.calypso_orange_dark);
+ return getResources().getColor(R.color.stats_bar_graph_outer_highlight);
} else {
return Color.WHITE;
}
@@ -188,9 +188,8 @@ class StatsBarGraph extends GraphView {
float bottom = graphheight + border - 1;
// Draw the orange selection behind the selected bar
- if (mBarPositionToHighlight == i) {
- paint.setColor(getResources().getColor(R.color.calypso_orange_dark));
- paint.setAlpha(50);
+ if (mBarPositionToHighlight == i && style.outerhighlightColor != 0x00ffffff) {
+ paint.setColor(style.outerhighlightColor);
canvas.drawRect(left, 10f, right, bottom, paint);
}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsVisitorsAndViewsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsVisitorsAndViewsFragment.java
index 4fc6d8b3e..d6372956e 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsVisitorsAndViewsFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsVisitorsAndViewsFragment.java
@@ -393,6 +393,7 @@ public class StatsVisitorsAndViewsFragment extends StatsAbstractFragment
GraphViewSeries mainSeriesOnScreen = new GraphViewSeries(mainSeriesItems);
mainSeriesOnScreen.getStyle().color = getResources().getColor(R.color.stats_bar_graph_views);
mainSeriesOnScreen.getStyle().highlightColor = getResources().getColor(R.color.calypso_orange_dark);
+ mainSeriesOnScreen.getStyle().outerhighlightColor = getResources().getColor(R.color.stats_bar_graph_outer_highlight);
mainSeriesOnScreen.getStyle().padding = DisplayUtils.dpToPx(getActivity(), 5);
mGraphView.addSeries(mainSeriesOnScreen);
@@ -402,7 +403,6 @@ public class StatsVisitorsAndViewsFragment extends StatsAbstractFragment
secondarySeries.getStyle().padding = DisplayUtils.dpToPx(getActivity(), 10);
secondarySeries.getStyle().color = getResources().getColor(R.color.stats_bar_graph_views_inner);
secondarySeries.getStyle().highlightColor = getResources().getColor(R.color.orange_dark);
- mGraphView.addSeries(mainSeriesOnScreen);
mGraphView.addSeries(secondarySeries);
}