diff options
author | Daniel Gultsch <daniel@gultsch.de> | 2015-08-26 21:17:29 +0200 |
---|---|---|
committer | Daniel Gultsch <daniel@gultsch.de> | 2015-08-26 21:17:29 +0200 |
commit | eff9e417e02bef9c4d94b659f7a90f3ff334ce25 (patch) | |
tree | 177700bc617d2edf484321eb9319328a023c5d88 /src/main/res/values | |
parent | 593f5cdcbe2b7680d738d64fe0b5e59e01b8a9f0 (diff) |
use dedicated colors for primary and primary_dark
Diffstat (limited to '')
-rw-r--r-- | src/main/res/values-v21/themes.xml | 4 | ||||
-rw-r--r-- | src/main/res/values/colors.xml | 5 | ||||
-rw-r--r-- | src/main/res/values/themes.xml | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/main/res/values-v21/themes.xml b/src/main/res/values-v21/themes.xml index 8aa79ac3..91d43e77 100644 --- a/src/main/res/values-v21/themes.xml +++ b/src/main/res/values-v21/themes.xml @@ -2,8 +2,8 @@ <resources> <style name="ConversationsTheme" parent="@android:style/Theme.Material.Light.DarkActionBar"> - <item name="android:colorPrimary">@color/green500</item> - <item name="android:colorPrimaryDark">@color/green700</item> + <item name="android:colorPrimary">@color/primary</item> + <item name="android:colorPrimaryDark">@color/primary_dark</item> <item name="android:colorAccent">@color/accent</item> <item name="android:windowActionModeOverlay">true</item> diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml index c2a3ad60..b3567b44 100644 --- a/src/main/res/values/colors.xml +++ b/src/main/res/values/colors.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <color name="green500">#ff259b24</color> - <color name="green700">#ff0a7e07</color> + <color name="primary">#ff259b24</color> + <color name="primary_dark">#ff0a7e07</color> <color name="accent">#ff0091ea</color> <color name="black87">#de000000</color> <color name="black54">#8a000000</color> @@ -16,4 +16,5 @@ <color name="red500">#fff44336</color> <color name="red800">#ffc62828</color> <color name="orange500">#ffff9800</color> + <color name="green500">#ff259b24</color> </resources>
\ No newline at end of file diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index afdc3e80..0f8b95bb 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -39,8 +39,8 @@ </style> <style name="ConversationsActionBar" parent="@android:style/Widget.Holo.Light.ActionBar.Solid.Inverse"> - <item name="android:background">@color/green500</item> - <item name="android:backgroundStacked">@color/green700</item> + <item name="android:background">@color/primary</item> + <item name="android:backgroundStacked">@color/primary_dark</item> <item name="android:displayOptions">showHome|homeAsUp|showTitle</item> <item name="android:icon">@android:color/transparent</item> </style> |