diff options
| author | Thialfihar <thi@thialfihar.org> | 2015-06-25 19:24:02 +0200 |
|---|---|---|
| committer | Thialfihar <thi@thialfihar.org> | 2015-07-21 20:49:08 +0200 |
| commit | 58cb6bb4b70795213f9609682c68d0025e0bab56 (patch) | |
| tree | 882a1ded5495c6c02ae00ee5d07596988176691d /OpenKeychain/src/main/res/values/colors.xml | |
| parent | 4d412d53dc85d2f1d50f43b92a03c3e374872445 (diff) | |
| download | open-keychain-58cb6bb4b70795213f9609682c68d0025e0bab56.tar.gz open-keychain-58cb6bb4b70795213f9609682c68d0025e0bab56.tar.bz2 open-keychain-58cb6bb4b70795213f9609682c68d0025e0bab56.zip | |
Start moving colors into themes
Using attrs instead of fixed colors it will be possible to style
everything and also dynamically grab the color where needed in code.
This is done with colorEmphasis as an initial test.
Also remove several unused colors.
Diffstat (limited to 'OpenKeychain/src/main/res/values/colors.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/values/colors.xml | 31 |
1 files changed, 3 insertions, 28 deletions
diff --git a/OpenKeychain/src/main/res/values/colors.xml b/OpenKeychain/src/main/res/values/colors.xml index ead006a63..b6b46ec8c 100644 --- a/OpenKeychain/src/main/res/values/colors.xml +++ b/OpenKeychain/src/main/res/values/colors.xml @@ -1,38 +1,15 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <!-- Main theme colors --> - - <!-- green colors from OpenKeychain logo bottom right --> - <!-- your app branding color for the app bar --> - <color name="primary">#7bad45</color> - <!-- darker variant for the status bar and contextual app bars --> - <color name="primary_dark">#6c983d</color> - <!-- theme UI controls like checkboxes and text fields --> - <color name="accent">#2196F3</color> - - <!-- Other colors --> - - <color name="black">#000000</color> - - <color name="primary_light">#C8E6C9</color> - <color name="fab">@color/accent</color> - <color name="fab_pressed">#1976D2</color> - <color name="primary_text">#212121</color> - <color name="secondary_text">#727272</color> <color name="icons">#FFFFFF</color> - <color name="divider">#B6B6B6</color> <color name="transparent">#00FFFFFF</color> <color name="header_text">#212121</color> - <!-- item selection, search highlight --> - <color name="emphasis">@color/accent</color> <color name="bg_gray">#cecbce</color> <color name="tertiary_text_light">#808080</color> <color name="alert">#ffdd3333</color> - <color name="holo_gray_light">#33999999</color> <color name="holo_gray_bright">#33CCCCCC</color> <!-- tabs --> @@ -43,10 +20,8 @@ <!-- floating action buttons --> <color name="black_semi_transparent">#B2000000</color> - <color name="background">#e5e5e5</color> - <color name="half_black">#808080</color> + <color name="black">#000000</color> <color name="white">#fafafa</color> - <color name="white_pressed">#f1f1f1</color> <!-- http://www.google.com/design/spec/style/color.html#color-color-palette @@ -59,8 +34,8 @@ <color name="android_red_dark">#b71c1c</color> <color name="android_orange_light">#ff9800</color> <color name="android_orange_dark">#e65100</color> - <color name="android_green_light">@color/primary</color> - <color name="android_green_dark">@color/primary_dark</color> + <color name="android_green_light">#00ff00</color> + <color name="android_green_dark">#008000</color> <color name="android_purple_light">#673ab7</color> <color name="android_purple_dark">#311b92</color> |