Make FAB colors themeable

6 files changed, 15 insertions, 10 deletions

diff --git a/OpenKeychain/src/main/res/drawable/fab_label_background.xml b/OpenKeychain/src/main/res/drawable/fab_label_background.xml
index 0d8c05b11..aa5e0a88e 100644
--- a/OpenKeychain/src/main/res/drawable/fab_label_background.xml
+++ b/OpenKeychain/src/main/res/drawable/fab_label_background.xml
@@ -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>
\ No newline at end of file
+</shape>
diff --git a/OpenKeychain/src/main/res/layout/key_list_fragment.xml b/OpenKeychain/src/main/res/layout/key_list_fragment.xml
index 9c41590db..83cf2d260 100644
--- a/OpenKeychain/src/main/res/layout/key_list_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_fragment.xml
@@ -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" />
 
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>