bauer/UdacityProject6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated the color constants to match material.

Browse Source
This commit is contained in:
Dan Galpin
2015-05-25 01:14:28 -07:00
parent fd3b39883f
commit 3ef2dfaea6
9 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -419,7 +419,7 @@ public class SunshineSyncAdapter extends AbstractThreadedSyncAdapter {
// notifications. Just throw in some data. // notifications. Just throw in some data.
NotificationCompat.Builder mBuilder = NotificationCompat.Builder mBuilder =
new NotificationCompat.Builder(getContext()) new NotificationCompat.Builder(getContext())
.setColor(resources.getColor(R.color.sunshine_light_blue)) .setColor(resources.getColor(R.color.primary_light))
.setSmallIcon(iconId) .setSmallIcon(iconId)
.setLargeIcon(largeIcon) .setLargeIcon(largeIcon)
.setContentTitle(title) .setContentTitle(title)

6
app/src/main/res/drawable-v21/today_touch_selector.xml
View File

@@ -20,10 +20,10 @@
</item> </item>
<item android:state_activated="true" <item android:state_activated="true"
android:drawable="@color/sunshine_light_blue"/> android:drawable="@color/primary_light"/>
<item android:state_selected="true" <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> </selector>

2
app/src/main/res/drawable-v21/touch_selector.xml
View File

@@ -24,7 +24,7 @@
<!-- When the view is "activated". In SINGLE_CHOICE_MODE, it flags the active row <!-- When the view is "activated". In SINGLE_CHOICE_MODE, it flags the active row
of a ListView --> of a ListView -->
<item android:state_activated="true" <item android:state_activated="true"
android:drawable="@color/sunshine_light_blue" /> android:drawable="@color/primary_light" />
<!-- Default, "just hangin' out" state. --> <!-- Default, "just hangin' out" state. -->
<item android:drawable="@android:color/transparent" /> <item android:drawable="@android:color/transparent" />

8
app/src/main/res/drawable/today_touch_selector.xml
View File

@@ -16,13 +16,13 @@
--> -->
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" <item android:state_pressed="true"
android:drawable="@color/sunshine_light_blue"/> android:drawable="@color/primary_light"/>
<item android:state_activated="true" <item android:state_activated="true"
android:drawable="@color/sunshine_light_blue"/> android:drawable="@color/primary_light"/>
<item android:state_selected="true" <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> </selector>

4
app/src/main/res/drawable/touch_selector.xml
View File

@@ -18,12 +18,12 @@
<!-- State when a row is being pressed, but hasn't yet been activated (finger down) --> <!-- State when a row is being pressed, but hasn't yet been activated (finger down) -->
<item android:state_pressed="true" <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 <!-- When the view is "activated". In SINGLE_CHOICE_MODE, it flags the active row
of a ListView --> of a ListView -->
<item android:state_activated="true" <item android:state_activated="true"
android:drawable="@color/sunshine_light_blue" /> android:drawable="@color/primary_light" />
<!-- Default, "just hangin' out" state. --> <!-- Default, "just hangin' out" state. -->
<item android:drawable="@android:color/transparent" /> <item android:drawable="@android:color/transparent" />

2
app/src/main/res/values-v14/styles.xml
View File

@@ -22,7 +22,7 @@
<!-- Settings activity action bar styles --> <!-- Settings activity action bar styles -->
<style name="ActionBar.V14.Sunshine.NoTitle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid.Inverse"> <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> <item name="android:height">56dp</item>
</style> </style>
</resources> </resources>

4
app/src/main/res/values-v21/styles.xml
View File

@@ -17,8 +17,8 @@
<resources> <resources>
<!-- Settings activity theme. --> <!-- Settings activity theme. -->
<style name="SettingsTheme" parent="@android:style/Theme.Material.Light.DarkActionBar"> <style name="SettingsTheme" parent="@android:style/Theme.Material.Light.DarkActionBar">
<item name="android:colorPrimary">@color/sunshine_blue</item> <item name="android:colorPrimary">@color/primary</item>
<item name="android:colorPrimaryDark">@color/sunshine_dark_blue</item> <item name="android:colorPrimaryDark">@color/primary_dark</item>
</style> </style>
</resources> </resources>

8
app/src/main/res/values/colors.xml
View File

@@ -21,8 +21,10 @@
<color name="grey_700">#646464</color> <color name="grey_700">#646464</color>
<color name="black">#000000</color> <color name="black">#000000</color>
<color name="sunshine_light_blue">#ff64c2f4</color> <!-- using the "Light Blue" Material Palette -->
<color name="sunshine_blue">#ff1ca8f4</color> <color name="primary">#03A9F4</color> <!-- 500 -->
<color name="sunshine_dark_blue">#0288D1</color> <color name="primary_dark">#0288D1</color> <!-- 700 -->
<color name="primary_light">#B3E5FC</color> <!-- 100 -->
<color name="accent">#FFD740</color>
</resources> </resources>

5
app/src/main/res/values/styles.xml
View File

@@ -17,8 +17,9 @@
<!-- Base application theme. --> <!-- Base application theme. -->
<style name="AppTheme" parent="@style/Theme.AppCompat.Light.DarkActionBar"> <style name="AppTheme" parent="@style/Theme.AppCompat.Light.DarkActionBar">
<item name="colorPrimary">@color/sunshine_blue</item> <item name="colorPrimary">@color/primary</item>
<item name="colorPrimaryDark">@color/sunshine_dark_blue</item> <item name="colorPrimaryDark">@color/primary_dark</item>
<item name="colorAccent">@color/accent</item>
</style> </style>
<!-- Main activity theme. --> <!-- Main activity theme. -->