diff options
author | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-08-06 00:20:48 +0530 |
---|---|---|
committer | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-08-06 02:02:11 +0530 |
commit | f17dabce8c85dbc2e9c18f068d84c398215b3ce9 (patch) | |
tree | 4df595faee9b7d9668e2f88356cfa442b9e5e77e /OpenKeychain/src/main/res/values | |
parent | 7086a67c2e131542c0ce903e1a5db887deae59fe (diff) | |
download | open-keychain-f17dabce8c85dbc2e9c18f068d84c398215b3ce9.tar.gz open-keychain-f17dabce8c85dbc2e9c18f068d84c398215b3ce9.tar.bz2 open-keychain-f17dabce8c85dbc2e9c18f068d84c398215b3ce9.zip |
fixed crash on api < 21 due to drawable using attrs
Diffstat (limited to 'OpenKeychain/src/main/res/values')
-rw-r--r-- | OpenKeychain/src/main/res/values/attrs.xml | 5 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values/styles.xml | 6 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values/themes.xml | 18 |
3 files changed, 20 insertions, 9 deletions
diff --git a/OpenKeychain/src/main/res/values/attrs.xml b/OpenKeychain/src/main/res/values/attrs.xml index 5c570e62b..b36c6ae3e 100644 --- a/OpenKeychain/src/main/res/values/attrs.xml +++ b/OpenKeychain/src/main/res/values/attrs.xml @@ -3,19 +3,20 @@ <declare-styleable name="CustomTheme"> <attr name="colorFab" format="color" /> <attr name="colorFabPressed" format="color" /> - <attr name="colorFabBackground" format="color" /> + <attr name="fabLabelBackgroundDrawable" format="reference" /> <attr name="colorFabText" format="color" /> <attr name="colorEmphasis" format="color" /> <attr name="colorHeaderText" format="color" /> <attr name="colorTertiaryText" format="color" /> <attr name="colorButtonRow" format="color" /> <attr name="colorLogBackground" format="color" /> - <attr name="colorCardViewHeaderDivider" format="color" /> + <attr name="cardViewHeaderDrawable" format="reference" /> <attr name="colorText" format="color" /> <attr name="colorBrightToolbar" format="color" /> <attr name="colorCardViewBackground" format="color" /> <attr name="colorTabText" format="color" /> <attr name="colorTabTextSelected" format="color" /> <attr name="colorTabIndicator" format="color" /> + <attr name="sectionHeaderDrawable" format="reference" /> </declare-styleable> </resources> diff --git a/OpenKeychain/src/main/res/values/styles.xml b/OpenKeychain/src/main/res/values/styles.xml index 73a594ac4..c5710dadf 100644 --- a/OpenKeychain/src/main/res/values/styles.xml +++ b/OpenKeychain/src/main/res/values/styles.xml @@ -2,7 +2,7 @@ <resources> <style name="CardViewHeader"> - <item name="android:drawableBottom">@drawable/cardview_header</item> + <item name="android:drawableBottom">?attr/cardViewHeaderDrawable</item> <item name="android:drawablePadding">16dp</item> <item name="android:layout_marginTop">16dp</item> <item name="android:paddingLeft">16dp</item> @@ -12,7 +12,7 @@ </style> <style name="SectionHeader"> - <item name="android:drawableBottom">@drawable/section_header</item> + <item name="android:drawableBottom">?attr/sectionHeaderDrawable</item> <item name="android:drawablePadding">4dp</item> <item name="android:layout_marginTop">8dp</item> <item name="android:paddingLeft">8dp</item> @@ -22,7 +22,7 @@ </style> <style name="FabMenuStyle"> - <item name="android:background">@drawable/fab_label_background</item> + <item name="android:background">?attr/fabLabelBackgroundDrawable</item> <item name="android:textColor">?attr/colorFabText</item> </style> diff --git a/OpenKeychain/src/main/res/values/themes.xml b/OpenKeychain/src/main/res/values/themes.xml index 3bdbf811d..4fc4ea1f5 100644 --- a/OpenKeychain/src/main/res/values/themes.xml +++ b/OpenKeychain/src/main/res/values/themes.xml @@ -9,9 +9,11 @@ <item name="colorFab">#2196f3</item> <item name="colorFabPressed">#1976d2</item> - <item name="colorFabBackground">#b2000000</item> <item name="colorFabText">#fafafa</item> + <!-- using an attribute for color will crash on API <= 20. Different drawable xmls are necessary for each theme. Refer to http://stackoverflow.com/a/13471695/3000919 --> + <item name="fabLabelBackgroundDrawable">@drawable/fab_label_background</item> + <item name="colorTabText">#70ffffff</item> <item name="colorTabTextSelected">#ffffff</item> <item name="colorTabIndicator">#ffffff</item> @@ -19,12 +21,15 @@ <item name="colorEmphasis">#2196f3</item> <item name="colorButtonRow">#33cccccc</item> <item name="colorLogBackground">#cecbce</item> - <item name="colorCardViewHeaderDivider">#808080</item> <item name="colorCardViewBackground">#ffffff</item> + <!-- using an attribute for color will crash on API <= 20. Different drawable xmls are necessary for each theme. Refer to http://stackoverflow.com/a/13471695/3000919 --> + <item name="cardViewHeaderDrawable">@drawable/cardview_header</item> <item name="colorText">#000000</item> <item name="colorHeaderText">#212121</item> <item name="colorTertiaryText">#808080</item> + <!-- using an attribute for color will crash on API <= 20. Different drawable xmls are necessary for each theme. Refer to http://stackoverflow.com/a/13471695/3000919 --> + <item name="sectionHeaderDrawable">@drawable/section_header_light</item> <!-- remove actionbar and title, we use toolbar! --> <item name="windowNoTitle">true</item> @@ -42,9 +47,11 @@ <item name="colorFab">#2196f3</item> <item name="colorFabPressed">#1976d2</item> - <item name="colorFabBackground">#b2000000</item> <item name="colorFabText">#fafafa</item> + <!-- using an attribute for color will crash on API <= 20. Different drawable xmls are necessary for each theme. Refer to http://stackoverflow.com/a/13471695/3000919 --> + <item name="fabLabelBackgroundDrawable">@drawable/fab_label_background</item> + <item name="colorTabText">#70ffffff</item> <item name="colorTabTextSelected">#ffffff</item> <item name="colorTabIndicator">#ffffff</item> @@ -52,12 +59,15 @@ <item name="colorEmphasis">#2196f3</item> <item name="colorButtonRow">#33cccccc</item> <item name="colorLogBackground">#303030</item> - <item name="colorCardViewHeaderDivider">#808080</item> <item name="colorCardViewBackground">#505050</item> + <!-- using an attribute for color will crash on API <= 20. Different drawable xmls are necessary for each theme. Refer to http://stackoverflow.com/a/13471695/3000919 --> + <item name="cardViewHeaderDrawable">@drawable/cardview_header</item> <item name="colorText">#ffffff</item> <item name="colorHeaderText">#d0d0d0</item> <item name="colorTertiaryText">#808080</item> + <!-- using an attribute for color will crash on API <= 20. Different drawable xmls are necessary for each theme. Refer to http://stackoverflow.com/a/13471695/3000919 --> + <item name="sectionHeaderDrawable">@drawable/section_header_dark</item> <item name="material_drawer_selected_text">#268bd2</item> |