Merge pull request #1474 from open-keychain/themes-drawables
Fixed crash on api < 21 due to drawable using attrs
This commit is contained in:
Dominik Schürmann
commit
8fb3d1e166
|
|
@ -6,6 +6,6 @@
|
|||
android:height="1dp"
|
||||
android:width="1000dp" />
|
||||
|
||||
<solid android:color="?attr/colorCardViewHeaderDivider" />
|
||||
<solid android:color="#808080" />
|
||||
|
||||
</shape>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<solid android:color="?attr/colorFabBackground"/>
|
||||
<!-- using an attribute for color will crash on API <= 20. Refer to http://stackoverflow.com/a/13471695/3000919 -->
|
||||
<solid android:color="#b2000000"/>
|
||||
<padding
|
||||
android:left="16dp"
|
||||
android:top="4dp"
|
||||
|
|
|
|||
|
|
@ -6,6 +6,6 @@
|
|||
android:height="2dp"
|
||||
android:width="1000dp" />
|
||||
|
||||
<solid android:color="?attr/colorHeaderText" />
|
||||
<solid android:color="#d0d0d0" />
|
||||
|
||||
</shape>
|
||||
11
OpenKeychain/src/main/res/drawable/section_header_light.xml
Normal file
11
OpenKeychain/src/main/res/drawable/section_header_light.xml
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle" >
|
||||
|
||||
<size
|
||||
android:height="2dp"
|
||||
android:width="1000dp" />
|
||||
|
||||
<solid android:color="#212121" />
|
||||
|
||||
</shape>
|
||||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue