Update colors - first pass.

24 files changed, 45 insertions, 57 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 1f1853ffa..dc0e0aecf 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
@@ -103,7 +103,7 @@ class StatsBarGraph extends GraphView {
     private class HorizontalLabelsColor implements IndexDependentColor {
         public int get(int index) {
             if (mBarPositionToHighlight == index) {
-                return getResources().getColor(R.color.notification_status_unapproved_dark);
+                return getResources().getColor(R.color.orange_jazzy);
             } else {
                 return getResources().getColor(R.color.blue_dark);
             }
@@ -114,10 +114,10 @@ class StatsBarGraph extends GraphView {
         GraphViewStyle gStyle =  getGraphViewStyle();
         gStyle.setHorizontalLabelsIndexDependentColor(new HorizontalLabelsColor());
         gStyle.setHorizontalLabelsColor(getResources().getColor(R.color.blue_dark));
-        gStyle.setVerticalLabelsColor(getResources().getColor(R.color.stats_bar_graph_vertical_label));
+        gStyle.setVerticalLabelsColor(getResources().getColor(R.color.grey_darken_10));
         gStyle.setTextSize(getResources().getDimensionPixelSize(R.dimen.text_sz_extra_small));
         gStyle.setGridXColor(Color.TRANSPARENT);
-        gStyle.setGridYColor(getResources().getColor(R.color.stats_bar_graph_grid));
+        gStyle.setGridYColor(getResources().getColor(R.color.grey_lighten_30));
         gStyle.setNumVerticalLabels(3);
 
         setCustomLabelFormatter(new CustomLabelFormatter() {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsSinglePostDetailsActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsSinglePostDetailsActivity.java
index b27c49fa9..20b294a0b 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsSinglePostDetailsActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsSinglePostDetailsActivity.java
@@ -325,7 +325,9 @@ public class StatsSinglePostDetailsActivity extends ActionBarActivity
         }
 
         GraphViewSeries mCurrentSeriesOnScreen = new GraphViewSeries(views);
-        mCurrentSeriesOnScreen.getStyle().color = getResources().getColor(R.color.stats_bar_graph_views);
+        mCurrentSeriesOnScreen.getStyle().color = getResources().getColor(R.color.stats_bar_graph_main_series);
+        mCurrentSeriesOnScreen.getStyle().highlightColor = getResources().getColor(R.color.stats_bar_graph_main_series_highlight);
+        mCurrentSeriesOnScreen.getStyle().outerhighlightColor = getResources().getColor(R.color.stats_bar_graph_outer_highlight);
         mCurrentSeriesOnScreen.getStyle().padding = DisplayUtils.dpToPx(this, 5);
 
         StatsBarGraph mGraphView;
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 06956d9ed..f81a9a3dc 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
@@ -169,9 +169,11 @@ public class StatsVisitorsAndViewsFragment extends StatsAbstractFragment
 
         public void updateBackGroundAndIcon() {
             if (isChecked) {
-                value.setTextColor(getResources().getColor(R.color.notification_status_unapproved_dark));
+                label.setTextColor(getResources().getColor(R.color.grey_dark));
+                value.setTextColor(getResources().getColor(R.color.orange_jazzy));
             } else {
-                value.setTextColor(getResources().getColor(R.color.blue_medium));
+                label.setTextColor(getResources().getColor(R.color.grey_darken_20));
+                value.setTextColor(getResources().getColor(R.color.blue_wordpress));
             }
 
             icon.setImageDrawable(getTabIcon());
@@ -402,8 +404,8 @@ public class StatsVisitorsAndViewsFragment extends StatsAbstractFragment
         mGraphView.removeAllSeries();
 
         GraphViewSeries mainSeriesOnScreen = new GraphViewSeries(mainSeriesItems);
-        mainSeriesOnScreen.getStyle().color = getResources().getColor(R.color.stats_bar_graph_views);
-        mainSeriesOnScreen.getStyle().highlightColor = getResources().getColor(R.color.orange_fire);
+        mainSeriesOnScreen.getStyle().color = getResources().getColor(R.color.stats_bar_graph_main_series);
+        mainSeriesOnScreen.getStyle().highlightColor = getResources().getColor(R.color.stats_bar_graph_main_series_highlight);
         mainSeriesOnScreen.getStyle().outerhighlightColor = getResources().getColor(R.color.stats_bar_graph_outer_highlight);
         mainSeriesOnScreen.getStyle().padding = DisplayUtils.dpToPx(getActivity(), 5);
         mGraphView.addSeries(mainSeriesOnScreen);
@@ -412,7 +414,7 @@ public class StatsVisitorsAndViewsFragment extends StatsAbstractFragment
         if (mIsCheckboxChecked && secondarySeriesItems != null && selectedStatsType == OverviewLabel.VIEWS) {
             GraphViewSeries secondarySeries = new GraphViewSeries(secondarySeriesItems);
             secondarySeries.getStyle().padding = DisplayUtils.dpToPx(getActivity(), 10);
-            secondarySeries.getStyle().color = getResources().getColor(R.color.stats_bar_graph_views_inner);
+            secondarySeries.getStyle().color = getResources().getColor(R.color.stats_bar_graph_secondary_series);
             secondarySeries.getStyle().highlightColor = getResources().getColor(R.color.orange_fire);
             mGraphView.addSeries(secondarySeries);
         }
diff --git a/WordPress/src/main/res/drawable/stats_list_item_background.xml b/WordPress/src/main/res/drawable/stats_list_item_background.xml
index 49cbcf5fb..5a8c7fcf3 100644
--- a/WordPress/src/main/res/drawable/stats_list_item_background.xml
+++ b/WordPress/src/main/res/drawable/stats_list_item_background.xml
@@ -2,7 +2,7 @@
 
     <item>
         <shape android:shape="rectangle">
-            <solid android:color="@color/grey_light" />
+            <solid android:color="@color/grey_lighten_30" />
         </shape>
     </item>
 
diff --git a/WordPress/src/main/res/drawable/stats_list_item_child_background.xml b/WordPress/src/main/res/drawable/stats_list_item_child_background.xml
index e71ec5448..80d2b3df1 100644
--- a/WordPress/src/main/res/drawable/stats_list_item_child_background.xml
+++ b/WordPress/src/main/res/drawable/stats_list_item_child_background.xml
@@ -2,13 +2,13 @@
 
     <item>
         <shape android:shape="rectangle">
-            <solid android:color="@color/grey_light" />
+            <solid android:color="@color/grey_lighten_30" />
         </shape>
     </item>
 
     <item android:top="1dp">
         <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-            <solid android:color="@color/stats_lists_background_color" />
+            <solid android:color="@color/grey_light" />
         </shape>
     </item>
 
diff --git a/WordPress/src/main/res/drawable/stats_list_item_expanded_background.xml b/WordPress/src/main/res/drawable/stats_list_item_expanded_background.xml
index e71ec5448..80d2b3df1 100644
--- a/WordPress/src/main/res/drawable/stats_list_item_expanded_background.xml
+++ b/WordPress/src/main/res/drawable/stats_list_item_expanded_background.xml
@@ -2,13 +2,13 @@
 
     <item>
         <shape android:shape="rectangle">
-            <solid android:color="@color/grey_light" />
+            <solid android:color="@color/grey_lighten_30" />
         </shape>
     </item>
 
     <item android:top="1dp">
         <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-            <solid android:color="@color/stats_lists_background_color" />
+            <solid android:color="@color/grey_light" />
         </shape>
     </item>
 
diff --git a/WordPress/src/main/res/drawable/stats_visitors_and_views_button_blue_light.xml b/WordPress/src/main/res/drawable/stats_visitors_and_views_button_blue_light.xml
index 4c12a5ee7..aab007aae 100644
--- a/WordPress/src/main/res/drawable/stats_visitors_and_views_button_blue_light.xml
+++ b/WordPress/src/main/res/drawable/stats_visitors_and_views_button_blue_light.xml
@@ -2,14 +2,14 @@
 
     <item>
         <shape android:shape="rectangle">
-            <solid android:color="@color/grey_light" />
+            <solid android:color="@color/grey_lighten_30" />
         </shape>
     </item>
 
     <item android:right="1dp" android:bottom="1dp">
         <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
             <solid
-                android:color="@color/stats_lists_background_color"/>
+                android:color="@color/grey_light"/>
         </shape>
     </item>
 
diff --git a/WordPress/src/main/res/drawable/stats_visitors_and_views_button_grey.xml b/WordPress/src/main/res/drawable/stats_visitors_and_views_button_grey.xml
deleted file mode 100644
index 30840947b..000000000
--- a/WordPress/src/main/res/drawable/stats_visitors_and_views_button_grey.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@color/light_gray" />
-        </shape>
-    </item>
-
-</layer-list>
-
-
diff --git a/WordPress/src/main/res/drawable/stats_visitors_and_views_button_latest_blue_light.xml b/WordPress/src/main/res/drawable/stats_visitors_and_views_button_latest_blue_light.xml
index 9adadf88a..98cc068f2 100644
--- a/WordPress/src/main/res/drawable/stats_visitors_and_views_button_latest_blue_light.xml
+++ b/WordPress/src/main/res/drawable/stats_visitors_and_views_button_latest_blue_light.xml
@@ -2,14 +2,14 @@
 
     <item>
         <shape android:shape="rectangle">
-            <solid android:color="@color/grey_light" />
+            <solid android:color="@color/grey_lighten_30" />
         </shape>
     </item>
 
     <item android:bottom="1dp">
         <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
             <solid
-                android:color="@color/stats_lists_background_color"/>
+                android:color="@color/grey_light"/>
         </shape>
     </item>
 
diff --git a/WordPress/src/main/res/drawable/stats_visitors_and_views_button_white.xml b/WordPress/src/main/res/drawable/stats_visitors_and_views_button_white.xml
index 422433f4c..c18df5545 100644
--- a/WordPress/src/main/res/drawable/stats_visitors_and_views_button_white.xml
+++ b/WordPress/src/main/res/drawable/stats_visitors_and_views_button_white.xml
@@ -2,7 +2,7 @@
 
     <item>
         <shape android:shape="rectangle">
-            <solid android:color="@color/grey_light" />
+            <solid android:color="@color/grey_lighten_30" />
         </shape>
     </item>
 
diff --git a/WordPress/src/main/res/drawable/stats_visitors_and_views_legend_background_primary.xml b/WordPress/src/main/res/drawable/stats_visitors_and_views_legend_background_primary.xml
index 336d9baa9..5aa2dd12b 100644
--- a/WordPress/src/main/res/drawable/stats_visitors_and_views_legend_background_primary.xml
+++ b/WordPress/src/main/res/drawable/stats_visitors_and_views_legend_background_primary.xml
@@ -3,7 +3,7 @@
 
     <item>
         <shape android:shape="rectangle">
-            <solid android:color="@color/stats_bar_graph_views"/>
+            <solid android:color="@color/stats_bar_graph_main_series"/>
             <corners android:radius="@dimen/stats_button_corner_radius"/>
             <size
                 android:width="@dimen/stats_barchart_legend_item"
diff --git a/WordPress/src/main/res/drawable/stats_visitors_and_views_legend_background_secondary.xml b/WordPress/src/main/res/drawable/stats_visitors_and_views_legend_background_secondary.xml
index 42fc67906..a613a5e0d 100644
--- a/WordPress/src/main/res/drawable/stats_visitors_and_views_legend_background_secondary.xml
+++ b/WordPress/src/main/res/drawable/stats_visitors_and_views_legend_background_secondary.xml
@@ -3,7 +3,7 @@
 
     <item>
         <shape android:shape="rectangle">
-            <solid android:color="@color/stats_bar_graph_views_inner"/>
+            <solid android:color="@color/stats_bar_graph_secondary_series"/>
             <corners android:radius="@dimen/stats_button_corner_radius"/>
             <size
                 android:width="@dimen/stats_barchart_legend_item"
diff --git a/WordPress/src/main/res/drawable/theme_feature_text_bg.xml b/WordPress/src/main/res/drawable/theme_feature_text_bg.xml
index 20552585e..7345ac7f3 100644
--- a/WordPress/src/main/res/drawable/theme_feature_text_bg.xml
+++ b/WordPress/src/main/res/drawable/theme_feature_text_bg.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" >
     <corners android:radius="4dp" />
-    <solid android:color="@color/stats_bar_graph_grid"/>
+    <solid android:color="@color/grey_lighten_30"/>
 </shape>
diff --git a/WordPress/src/main/res/layout/stats_activity.xml b/WordPress/src/main/res/layout/stats_activity.xml
index 4f2ba6f6f..fe233e94f 100644
--- a/WordPress/src/main/res/layout/stats_activity.xml
+++ b/WordPress/src/main/res/layout/stats_activity.xml
@@ -3,7 +3,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/ptr_layout"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@color/grey_lighten_30">
 
     <org.wordpress.android.ui.stats.ScrollViewExt xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
diff --git a/WordPress/src/main/res/layout/stats_activity_single_post_details.xml b/WordPress/src/main/res/layout/stats_activity_single_post_details.xml
index f5673b65e..adff46e9a 100644
--- a/WordPress/src/main/res/layout/stats_activity_single_post_details.xml
+++ b/WordPress/src/main/res/layout/stats_activity_single_post_details.xml
@@ -23,7 +23,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/margin_large"
                 android:layout_marginBottom="@dimen/margin_medium"
-                android:textColor="@color/stats_link_text_color"
+                android:textColor="@color/grey_darken_20"
                 android:gravity="center"
                 android:text="Title"/>
 
diff --git a/WordPress/src/main/res/layout/stats_activity_view_all.xml b/WordPress/src/main/res/layout/stats_activity_view_all.xml
index a0de507a5..9389cb7a3 100644
--- a/WordPress/src/main/res/layout/stats_activity_view_all.xml
+++ b/WordPress/src/main/res/layout/stats_activity_view_all.xml
@@ -3,7 +3,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/ptr_layout"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@color/grey_lighten_30">
 
     <org.wordpress.android.ui.stats.ScrollViewExt xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
diff --git a/WordPress/src/main/res/layout/stats_expandable_list_fragment.xml b/WordPress/src/main/res/layout/stats_expandable_list_fragment.xml
index 5985b215e..132811fac 100644
--- a/WordPress/src/main/res/layout/stats_expandable_list_fragment.xml
+++ b/WordPress/src/main/res/layout/stats_expandable_list_fragment.xml
@@ -133,7 +133,7 @@
             android:id="@+id/stats_list_empty_text"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@color/stats_lists_background_color"
+            android:background="@color/grey_light"
             android:padding="@dimen/margin_large"
             android:visibility="gone" />
     </LinearLayout>
diff --git a/WordPress/src/main/res/layout/stats_list_cell.xml b/WordPress/src/main/res/layout/stats_list_cell.xml
index 8c2c32f09..8c008de80 100644
--- a/WordPress/src/main/res/layout/stats_list_cell.xml
+++ b/WordPress/src/main/res/layout/stats_list_cell.xml
@@ -95,7 +95,7 @@
         android:id="@+id/layout_child_container"
         android:orientation="vertical"
         android:visibility="gone"
-        android:background="@color/stats_lists_background_color"
+        android:background="@color/grey_light"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
diff --git a/WordPress/src/main/res/layout/stats_list_fragment.xml b/WordPress/src/main/res/layout/stats_list_fragment.xml
index 05ac520a8..d6d55cc7e 100644
--- a/WordPress/src/main/res/layout/stats_list_fragment.xml
+++ b/WordPress/src/main/res/layout/stats_list_fragment.xml
@@ -132,7 +132,7 @@
             android:id="@+id/stats_list_empty_text"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@color/stats_lists_background_color"
+            android:background="@color/grey_light"
             android:padding="@dimen/margin_large"
             android:visibility="gone" />
     </LinearLayout>
diff --git a/WordPress/src/main/res/layout/stats_vertical_line.xml b/WordPress/src/main/res/layout/stats_vertical_line.xml
deleted file mode 100644
index 5e1eb4ba6..000000000
--- a/WordPress/src/main/res/layout/stats_vertical_line.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<View xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="1dp"
-    android:layout_height="match_parent"
-    android:background="@color/stats_div_color" />
diff --git a/WordPress/src/main/res/layout/stats_visitors_and_views_fragment.xml b/WordPress/src/main/res/layout/stats_visitors_and_views_fragment.xml
index 2a74517a1..eddef1ae3 100644
--- a/WordPress/src/main/res/layout/stats_visitors_and_views_fragment.xml
+++ b/WordPress/src/main/res/layout/stats_visitors_and_views_fragment.xml
@@ -95,7 +95,7 @@
                     android:drawablePadding="@dimen/margin_medium"
                     android:textSize="@dimen/text_sz_small"
                     android:text="@string/stats_views"
-                    android:textColor="@color/grey_dark"/>
+                    android:textColor="@color/grey_darken_30"/>
             </LinearLayout>
             <LinearLayout
                 android:id="@+id/stats_checkbox_visitors_container"
@@ -114,7 +114,7 @@
                     android:drawablePadding="@dimen/margin_medium"
                     android:textSize="@dimen/text_sz_small"
                     android:text="@string/stats_visitors"
-                    android:textColor="@color/grey_dark"/>
+                    android:textColor="@color/grey_darken_30"/>
             </LinearLayout>
         </LinearLayout>
 
@@ -127,6 +127,6 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/margin_extra_large"
         android:layout_marginBottom="@dimen/margin_small"
-        android:textColor="@color/stats_blue_labels"
+        android:textColor="@color/grey_darken_20"
         android:text="Date"/>
 </LinearLayout>
diff --git a/WordPress/src/main/res/layout/stats_visitors_and_views_tab.xml b/WordPress/src/main/res/layout/stats_visitors_and_views_tab.xml
index 446df86b5..b23e5f031 100644
--- a/WordPress/src/main/res/layout/stats_visitors_and_views_tab.xml
+++ b/WordPress/src/main/res/layout/stats_visitors_and_views_tab.xml
@@ -32,7 +32,7 @@
 
             <org.wordpress.android.widgets.WPAutoResizeTextView
                 android:id="@+id/stats_visitors_and_views_tab_label"
-                android:textColor="@color/grey_dark"
+                android:textColor="@color/grey_darken_20"
                 android:textSize="@dimen/text_sz_extra_small"
                 android:maxLines="1"
                 android:ellipsize="end"
@@ -42,7 +42,7 @@
 
         <org.wordpress.android.widgets.WPTextView
             android:id="@+id/stats_visitors_and_views_tab_value"
-            android:textColor="@color/blue_medium"
+            android:textColor="@color/blue_wordpress"
             android:textSize="@dimen/text_sz_small"
             android:maxLines="1"
             android:ellipsize="end"
diff --git a/WordPress/src/main/res/values/colors.xml b/WordPress/src/main/res/values/colors.xml
index fd2618e0b..2fa994f55 100644
--- a/WordPress/src/main/res/values/colors.xml
+++ b/WordPress/src/main/res/values/colors.xml
@@ -104,16 +104,13 @@
     <color name="stats_link_text_color">@color/blue_wordpress</color>
     <color name="stats_module_content_list_header">@color/grey</color>
     <color name="stats_blue_labels">@color/grey_darken_20</color>
-    <color name="stats_bar_graph_views">@color/blue_wordpress</color>
-    <color name="stats_bar_graph_grid">@color/grey_lighten_20</color>
-    <color name="stats_bar_graph_vertical_label">@color/grey</color>
-    <color name="stats_div_color">@color/grey_lighten_10</color>
-    <color name="stats_lists_background_color">@color/grey_light</color>
+    <color name="stats_bar_graph_main_series">@color/blue_wordpress</color>
+    <color name="stats_bar_graph_main_series_highlight">@color/orange_jazzy</color>
+    <color name="stats_bar_graph_outer_highlight">#1Af0821e</color> <!-- 10% Opacity on orange_jazzy #f0821e -->
+    <color name="stats_bar_graph_secondary_series">@color/blue_dark</color>
+    <color name="stats_bar_graph_secondary_series_highlight">@color/orange_fire</color>
     <color name="stats_empty_placeholder_color">@color/translucent_grey_lighten_30</color>
 
-    <!-- TODO: Stats "custom" colors - calypso_orange_dark doesn't exist anymore -->
-    <color name="stats_bar_graph_views_inner">#004e70</color>
-    <color name="stats_bar_graph_outer_highlight">#40f0821e</color> <!-- 25% Opacity on calypso_orange_dark -->
 
     <!-- Reader  -->
     <color name="reader_divider_grey">@color/grey_lighten_30</color>
diff --git a/WordPress/src/main/res/values/stats_styles.xml b/WordPress/src/main/res/values/stats_styles.xml
index e105877ba..00f0da1ff 100644
--- a/WordPress/src/main/res/values/stats_styles.xml
+++ b/WordPress/src/main/res/values/stats_styles.xml
@@ -42,7 +42,7 @@
     <style name="StatsModuleTitle">
         <item name="android:textSize">@dimen/text_sz_medium</item>
         <item name="android:textStyle">bold</item>
-        <item name="android:textColor">@color/stats_text_color</item>
+        <item name="android:textColor">@color/grey_darken_10</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
     </style>