PeterCxy/open-keychain
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

Make FAB colors themeable

Browse source
This commit is contained in:
Thialfihar 2015-06-26 11:33:53 +02:00
parent fe9c802bbb
commit 0f6acbd030
6 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OpenKeychain/src/main/res/drawable/fab_label_background.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/black_semi_transparent"/>
<solid android:color="?attr/colorFabBackground"/>
<padding
android:left="16dp"
android:top="4dp"
@ -8,4 +8,4 @@
android:bottom="4dp"/>
<corners
android:radius="2dp"/>
</shape>
</shape>

12
OpenKeychain/src/main/res/layout/key_list_fragment.xml
View file

@ -61,8 +61,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
fab:fab_icon="@drawable/ic_qrcode_white_24dp"
fab:fab_colorNormal="?attr/colorPrimary"
fab:fab_colorPressed="?attr/colorPrimaryDark"
fab:fab_colorNormal="?attr/colorFab"
fab:fab_colorPressed="?attr/colorFabPressed"
fab:fab_title="Scan QR Code"
fab:fab_size="mini" />
@ -71,8 +71,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
fab:fab_icon="@drawable/ic_cloud_search_24dp"
fab:fab_colorNormal="?attr/colorPrimary"
fab:fab_colorPressed="?attr/colorPrimaryDark"
fab:fab_colorNormal="?attr/colorFab"
fab:fab_colorPressed="?attr/colorFabPressed"
fab:fab_title="Search Cloud"
fab:fab_size="mini" />
@ -81,8 +81,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
fab:fab_icon="@drawable/ic_folder_white_24dp"
fab:fab_colorNormal="?attr/colorPrimary"
fab:fab_colorPressed="?attr/colorPrimaryDark"
fab:fab_colorNormal="?attr/colorFab"
fab:fab_colorPressed="?attr/colorFabPressed"
fab:fab_title="Import from File"
fab:fab_size="mini" />

2
OpenKeychain/src/main/res/values/attrs.xml
View file

@ -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" />

1
OpenKeychain/src/main/res/values/colors.xml
View file

@ -13,7 +13,6 @@
<!-- floating action buttons -->
<color name="black_semi_transparent">#B2000000</color>
<color name="black">#000000</color>
<color name="white">#fafafa</color>

2
OpenKeychain/src/main/res/values/styles.xml
View file

@ -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

4
OpenKeychain/src/main/res/values/themes.xml
View file

@ -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>