diff options
| author | Thialfihar <thi@thialfihar.org> | 2015-06-26 11:33:53 +0200 |
|---|---|---|
| committer | Thialfihar <thi@thialfihar.org> | 2015-07-21 20:50:32 +0200 |
| commit | 0f6acbd03022b5f74a37c56e08bee11032428f70 (patch) | |
| tree | f4fe02569612eafe0a1314be526c26006584807d /OpenKeychain/src/main/res/values | |
| parent | fe9c802bbb318aef9cd2fbcaa85fc761b1797086 (diff) | |
| download | open-keychain-0f6acbd03022b5f74a37c56e08bee11032428f70.tar.gz open-keychain-0f6acbd03022b5f74a37c56e08bee11032428f70.tar.bz2 open-keychain-0f6acbd03022b5f74a37c56e08bee11032428f70.zip | |
Make FAB colors themeable
Diffstat (limited to 'OpenKeychain/src/main/res/values')
| -rw-r--r-- | OpenKeychain/src/main/res/values/attrs.xml | 2 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/colors.xml | 1 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/styles.xml | 2 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/themes.xml | 4 |
4 files changed, 7 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/res/values/attrs.xml b/OpenKeychain/src/main/res/values/attrs.xml index 27fba221a..7357221a2 100644 --- a/OpenKeychain/src/main/res/values/attrs.xml +++ b/OpenKeychain/src/main/res/values/attrs.xml @@ -3,6 +3,8 @@ <declare-styleable name="CustomTheme"> <attr name="colorFab" format="color" /> <attr name="colorFabPressed" format="color" /> + <attr name="colorFabBackground" format="color" /> + <attr name="colorFabText" format="color" /> <attr name="colorEmphasis" format="color" /> <attr name="colorHeaderText" format="color" /> <attr name="colorTertiaryText" format="color" /> diff --git a/OpenKeychain/src/main/res/values/colors.xml b/OpenKeychain/src/main/res/values/colors.xml index 38ac21e21..f943e0325 100644 --- a/OpenKeychain/src/main/res/values/colors.xml +++ b/OpenKeychain/src/main/res/values/colors.xml @@ -13,7 +13,6 @@ <!-- floating action buttons --> - <color name="black_semi_transparent">#B2000000</color> <color name="black">#000000</color> <color name="white">#fafafa</color> diff --git a/OpenKeychain/src/main/res/values/styles.xml b/OpenKeychain/src/main/res/values/styles.xml index e21e3749c..73a594ac4 100644 --- a/OpenKeychain/src/main/res/values/styles.xml +++ b/OpenKeychain/src/main/res/values/styles.xml @@ -23,7 +23,7 @@ <style name="FabMenuStyle"> <item name="android:background">@drawable/fab_label_background</item> - <item name="android:textColor">@color/white</item> + <item name="android:textColor">?attr/colorFabText</item> </style> <!-- This style is for use with our drag and drop RecyclerView since ItemDecoration did not diff --git a/OpenKeychain/src/main/res/values/themes.xml b/OpenKeychain/src/main/res/values/themes.xml index df5d63a3e..83143cbbf 100644 --- a/OpenKeychain/src/main/res/values/themes.xml +++ b/OpenKeychain/src/main/res/values/themes.xml @@ -8,6 +8,8 @@ <item name="colorFab">#2196f3</item> <item name="colorFabPressed">#1976d2</item> + <item name="colorFabBackground">#b2000000</item> + <item name="colorFabText">#fafafa</item> <item name="colorEmphasis">#2196f3</item> <item name="colorHeaderText">#212121</item> @@ -29,6 +31,8 @@ <item name="colorFab">#2196f3</item> <item name="colorFabPressed">#1976d2</item> + <item name="colorFabBackground">#b2000000</item> + <item name="colorFabText">#fafafa</item> <item name="colorEmphasis">#2196f3</item> <item name="colorHeaderText">#a0a0a0</item> |