From 3ef2dfaea6e108a9c04103f53153813a79b0f541 Mon Sep 17 00:00:00 2001
From: Dan Galpin <dgalpin@google.com>
Date: Mon, 25 May 2015 01:14:28 -0700
Subject: [PATCH] Updated the color constants to match material.

---
 .../android/sunshine/app/sync/SunshineSyncAdapter.java    | 2 +-
 app/src/main/res/drawable-v21/today_touch_selector.xml    | 6 +++---
 app/src/main/res/drawable-v21/touch_selector.xml          | 2 +-
 app/src/main/res/drawable/today_touch_selector.xml        | 8 ++++----
 app/src/main/res/drawable/touch_selector.xml              | 4 ++--
 app/src/main/res/values-v14/styles.xml                    | 2 +-
 app/src/main/res/values-v21/styles.xml                    | 4 ++--
 app/src/main/res/values/colors.xml                        | 8 +++++---
 app/src/main/res/values/styles.xml                        | 5 +++--
 9 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/com/example/android/sunshine/app/sync/SunshineSyncAdapter.java b/app/src/main/java/com/example/android/sunshine/app/sync/SunshineSyncAdapter.java
index 21e39e0..e248235 100644
--- a/app/src/main/java/com/example/android/sunshine/app/sync/SunshineSyncAdapter.java
+++ b/app/src/main/java/com/example/android/sunshine/app/sync/SunshineSyncAdapter.java
@@ -419,7 +419,7 @@ public class SunshineSyncAdapter extends AbstractThreadedSyncAdapter {
                     // notifications.  Just throw in some data.
                     NotificationCompat.Builder mBuilder =
                             new NotificationCompat.Builder(getContext())
-                                    .setColor(resources.getColor(R.color.sunshine_light_blue))
+                                    .setColor(resources.getColor(R.color.primary_light))
                                     .setSmallIcon(iconId)
                                     .setLargeIcon(largeIcon)
                                     .setContentTitle(title)
diff --git a/app/src/main/res/drawable-v21/today_touch_selector.xml b/app/src/main/res/drawable-v21/today_touch_selector.xml
index 24db9c9..90d8c5b 100644
--- a/app/src/main/res/drawable-v21/today_touch_selector.xml
+++ b/app/src/main/res/drawable-v21/today_touch_selector.xml
@@ -20,10 +20,10 @@
     </item>
 
     <item android:state_activated="true"
-        android:drawable="@color/sunshine_light_blue"/>
+        android:drawable="@color/primary_light"/>
 
     <item android:state_selected="true"
-        android:drawable="@color/sunshine_light_blue"/>
+        android:drawable="@color/primary_light"/>
 
-    <item android:drawable="@color/sunshine_blue" />
+    <item android:drawable="@color/primary" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/touch_selector.xml b/app/src/main/res/drawable-v21/touch_selector.xml
index 40e060c..d94b24b 100644
--- a/app/src/main/res/drawable-v21/touch_selector.xml
+++ b/app/src/main/res/drawable-v21/touch_selector.xml
@@ -24,7 +24,7 @@
     <!-- When the view is "activated".  In SINGLE_CHOICE_MODE, it flags the active row
          of a ListView -->
     <item android:state_activated="true"
-        android:drawable="@color/sunshine_light_blue" />
+        android:drawable="@color/primary_light" />
 
     <!-- Default, "just hangin' out" state. -->
     <item android:drawable="@android:color/transparent" />
diff --git a/app/src/main/res/drawable/today_touch_selector.xml b/app/src/main/res/drawable/today_touch_selector.xml
index c37aee3..87ad6e5 100644
--- a/app/src/main/res/drawable/today_touch_selector.xml
+++ b/app/src/main/res/drawable/today_touch_selector.xml
@@ -16,13 +16,13 @@
  -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true"
-        android:drawable="@color/sunshine_light_blue"/>
+        android:drawable="@color/primary_light"/>
 
     <item android:state_activated="true"
-        android:drawable="@color/sunshine_light_blue"/>
+        android:drawable="@color/primary_light"/>
 
     <item android:state_selected="true"
-        android:drawable="@color/sunshine_light_blue"/>
+        android:drawable="@color/primary_light"/>
 
-    <item android:drawable="@color/sunshine_blue" />
+    <item android:drawable="@color/primary" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/touch_selector.xml b/app/src/main/res/drawable/touch_selector.xml
index cabcb06..b16e075 100644
--- a/app/src/main/res/drawable/touch_selector.xml
+++ b/app/src/main/res/drawable/touch_selector.xml
@@ -18,12 +18,12 @@
 
     <!-- State when a row is being pressed, but hasn't yet been activated (finger down) -->
     <item android:state_pressed="true"
-        android:drawable="@color/sunshine_light_blue" />
+        android:drawable="@color/primary_light" />
 
     <!-- When the view is "activated".  In SINGLE_CHOICE_MODE, it flags the active row
          of a ListView -->
     <item android:state_activated="true"
-        android:drawable="@color/sunshine_light_blue" />
+        android:drawable="@color/primary_light" />
 
     <!-- Default, "just hangin' out" state. -->
     <item android:drawable="@android:color/transparent" />
diff --git a/app/src/main/res/values-v14/styles.xml b/app/src/main/res/values-v14/styles.xml
index 92981e0..2e685a1 100644
--- a/app/src/main/res/values-v14/styles.xml
+++ b/app/src/main/res/values-v14/styles.xml
@@ -22,7 +22,7 @@
 
     <!-- Settings activity action bar styles -->
     <style name="ActionBar.V14.Sunshine.NoTitle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid.Inverse">
-        <item name="android:background">@color/sunshine_blue</item>
+        <item name="android:background">@color/primary</item>
         <item name="android:height">56dp</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index f17a657..5cc3f61 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -17,8 +17,8 @@
 <resources>
     <!-- Settings activity theme. -->
     <style name="SettingsTheme" parent="@android:style/Theme.Material.Light.DarkActionBar">
-        <item name="android:colorPrimary">@color/sunshine_blue</item>
-        <item name="android:colorPrimaryDark">@color/sunshine_dark_blue</item>
+        <item name="android:colorPrimary">@color/primary</item>
+        <item name="android:colorPrimaryDark">@color/primary_dark</item>
     </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f03f257..ab9ea4d 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -21,8 +21,10 @@
     <color name="grey_700">#646464</color>
     <color name="black">#000000</color>
 
-    <color name="sunshine_light_blue">#ff64c2f4</color>
-    <color name="sunshine_blue">#ff1ca8f4</color>
-    <color name="sunshine_dark_blue">#0288D1</color>
+    <!-- using the "Light Blue" Material Palette -->
+    <color name="primary">#03A9F4</color>  <!-- 500 -->
+    <color name="primary_dark">#0288D1</color>  <!-- 700 -->
+    <color name="primary_light">#B3E5FC</color> <!-- 100 -->
+    <color name="accent">#FFD740</color>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a1f6c43..6c4a3c7 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -17,8 +17,9 @@
 
    <!-- Base application theme. -->
     <style name="AppTheme" parent="@style/Theme.AppCompat.Light.DarkActionBar">
-        <item name="colorPrimary">@color/sunshine_blue</item>
-        <item name="colorPrimaryDark">@color/sunshine_dark_blue</item>
+            <item name="colorPrimary">@color/primary</item>
+            <item name="colorPrimaryDark">@color/primary_dark</item>
+            <item name="colorAccent">@color/accent</item>
     </style>
 
     <!-- Main activity theme. -->