Skip to content

Commit 3ef2dfa

Browse files
committed
Updated the color constants to match material.
1 parent fd3b398 commit 3ef2dfa

9 files changed

Lines changed: 22 additions & 19 deletions

File tree

app/src/main/java/com/example/android/sunshine/app/sync/SunshineSyncAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ private void notifyWeather() {
419419
// notifications. Just throw in some data.
420420
NotificationCompat.Builder mBuilder =
421421
new NotificationCompat.Builder(getContext())
422-
.setColor(resources.getColor(R.color.sunshine_light_blue))
422+
.setColor(resources.getColor(R.color.primary_light))
423423
.setSmallIcon(iconId)
424424
.setLargeIcon(largeIcon)
425425
.setContentTitle(title)

app/src/main/res/drawable-v21/today_touch_selector.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
</item>
2121

2222
<item android:state_activated="true"
23-
android:drawable="@color/sunshine_light_blue"/>
23+
android:drawable="@color/primary_light"/>
2424

2525
<item android:state_selected="true"
26-
android:drawable="@color/sunshine_light_blue"/>
26+
android:drawable="@color/primary_light"/>
2727

28-
<item android:drawable="@color/sunshine_blue" />
28+
<item android:drawable="@color/primary" />
2929
</selector>

app/src/main/res/drawable-v21/touch_selector.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<!-- When the view is "activated". In SINGLE_CHOICE_MODE, it flags the active row
2525
of a ListView -->
2626
<item android:state_activated="true"
27-
android:drawable="@color/sunshine_light_blue" />
27+
android:drawable="@color/primary_light" />
2828

2929
<!-- Default, "just hangin' out" state. -->
3030
<item android:drawable="@android:color/transparent" />

app/src/main/res/drawable/today_touch_selector.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
-->
1717
<selector xmlns:android="http://schemas.android.com/apk/res/android">
1818
<item android:state_pressed="true"
19-
android:drawable="@color/sunshine_light_blue"/>
19+
android:drawable="@color/primary_light"/>
2020

2121
<item android:state_activated="true"
22-
android:drawable="@color/sunshine_light_blue"/>
22+
android:drawable="@color/primary_light"/>
2323

2424
<item android:state_selected="true"
25-
android:drawable="@color/sunshine_light_blue"/>
25+
android:drawable="@color/primary_light"/>
2626

27-
<item android:drawable="@color/sunshine_blue" />
27+
<item android:drawable="@color/primary" />
2828
</selector>

app/src/main/res/drawable/touch_selector.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818

1919
<!-- State when a row is being pressed, but hasn't yet been activated (finger down) -->
2020
<item android:state_pressed="true"
21-
android:drawable="@color/sunshine_light_blue" />
21+
android:drawable="@color/primary_light" />
2222

2323
<!-- When the view is "activated". In SINGLE_CHOICE_MODE, it flags the active row
2424
of a ListView -->
2525
<item android:state_activated="true"
26-
android:drawable="@color/sunshine_light_blue" />
26+
android:drawable="@color/primary_light" />
2727

2828
<!-- Default, "just hangin' out" state. -->
2929
<item android:drawable="@android:color/transparent" />

app/src/main/res/values-v14/styles.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
<!-- Settings activity action bar styles -->
2424
<style name="ActionBar.V14.Sunshine.NoTitle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid.Inverse">
25-
<item name="android:background">@color/sunshine_blue</item>
25+
<item name="android:background">@color/primary</item>
2626
<item name="android:height">56dp</item>
2727
</style>
2828
</resources>

app/src/main/res/values-v21/styles.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
<resources>
1818
<!-- Settings activity theme. -->
1919
<style name="SettingsTheme" parent="@android:style/Theme.Material.Light.DarkActionBar">
20-
<item name="android:colorPrimary">@color/sunshine_blue</item>
21-
<item name="android:colorPrimaryDark">@color/sunshine_dark_blue</item>
20+
<item name="android:colorPrimary">@color/primary</item>
21+
<item name="android:colorPrimaryDark">@color/primary_dark</item>
2222
</style>
2323

2424
</resources>

app/src/main/res/values/colors.xml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,10 @@
2121
<color name="grey_700">#646464</color>
2222
<color name="black">#000000</color>
2323

24-
<color name="sunshine_light_blue">#ff64c2f4</color>
25-
<color name="sunshine_blue">#ff1ca8f4</color>
26-
<color name="sunshine_dark_blue">#0288D1</color>
24+
<!-- using the "Light Blue" Material Palette -->
25+
<color name="primary">#03A9F4</color> <!-- 500 -->
26+
<color name="primary_dark">#0288D1</color> <!-- 700 -->
27+
<color name="primary_light">#B3E5FC</color> <!-- 100 -->
28+
<color name="accent">#FFD740</color>
2729

2830
</resources>

app/src/main/res/values/styles.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@
1717

1818
<!-- Base application theme. -->
1919
<style name="AppTheme" parent="@style/Theme.AppCompat.Light.DarkActionBar">
20-
<item name="colorPrimary">@color/sunshine_blue</item>
21-
<item name="colorPrimaryDark">@color/sunshine_dark_blue</item>
20+
<item name="colorPrimary">@color/primary</item>
21+
<item name="colorPrimaryDark">@color/primary_dark</item>
22+
<item name="colorAccent">@color/accent</item>
2223
</style>
2324

2425
<!-- Main activity theme. -->

0 commit comments

Comments
 (0)