From 33e0dbb53a02b59c6c82a8ca3b865e4e0609651d Mon Sep 17 00:00:00 2001
From: Alex Baker <baker.alex@gmail.com>
Date: Fri, 22 Jul 2016 16:43:35 -0500
Subject: [PATCH] Set FAB tint based on accent

---
 src/main/res/layout/fragment_task_list.xml | 2 +-
 src/main/res/values/attrs.xml              | 1 +
 src/main/res/values/styles.xml             | 8 ++++++++
 src/main/res/values/theme_amber.xml        | 2 +-
 src/main/res/values/theme_blue.xml         | 2 +-
 src/main/res/values/theme_blue_grey.xml    | 2 +-
 src/main/res/values/theme_cyan.xml         | 2 +-
 src/main/res/values/theme_deep_orange.xml  | 2 +-
 src/main/res/values/theme_deep_purple.xml  | 2 +-
 src/main/res/values/theme_green.xml        | 2 +-
 src/main/res/values/theme_indigo.xml       | 2 +-
 src/main/res/values/theme_light_blue.xml   | 2 +-
 src/main/res/values/theme_light_green.xml  | 2 +-
 src/main/res/values/theme_lime.xml         | 2 +-
 src/main/res/values/theme_orange.xml       | 2 +-
 src/main/res/values/theme_pink.xml         | 2 +-
 src/main/res/values/theme_purple.xml       | 2 +-
 src/main/res/values/theme_red.xml          | 2 +-
 src/main/res/values/theme_teal.xml         | 2 +-
 src/main/res/values/theme_yellow.xml       | 2 +-
 20 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/src/main/res/layout/fragment_task_list.xml b/src/main/res/layout/fragment_task_list.xml
index d97c7bf11..9827492e5 100644
--- a/src/main/res/layout/fragment_task_list.xml
+++ b/src/main/res/layout/fragment_task_list.xml
@@ -46,7 +46,7 @@
     <android.support.design.widget.FloatingActionButton
         android:id="@+id/fab"
         android:src="@drawable/ic_add_24dp"
-        android:tint="@android:color/white"
+        android:tint="?attr/fab_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="end|bottom"
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index 5e0c21409..641eb7d4b 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -16,6 +16,7 @@
     <attr name="dark_status_bar" format="boolean" />
     <attr name="alpha_secondary" format="dimension" />
     <attr name="alpha_disabled" format="dimension" />
+    <attr name="fab_text" format="color" />
 
     <declare-styleable name="TimePreference">
         <attr name="summary" format="string" />
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index 10ab939ed..f9fbeeecc 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -50,6 +50,14 @@
         <item name="actionBarSecondaryText">@color/black_54</item>
     </style>
 
+    <style name="WhiteTint">
+        <item name="fab_text">@color/white_100</item>
+    </style>
+
+    <style name="BlackTint">
+        <item name="fab_text">@color/black_87</item>
+    </style>
+
     <style name="WhiteToolbarOverlay" parent="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
         <!--<item name="android:textColorPrimary">@color/white_100</item>-->
         <item name="colorControlNormal">@color/white_100</item>
diff --git a/src/main/res/values/theme_amber.xml b/src/main/res/values/theme_amber.xml
index 06c8ae69e..99dbd322e 100644
--- a/src/main/res/values/theme_amber.xml
+++ b/src/main/res/values/theme_amber.xml
@@ -6,7 +6,7 @@
         <item name="colorPrimaryDark">@color/amber_700</item>
     </style>
 
-    <style name="AmberAccent">
+    <style name="AmberAccent" parent="BlackTint">
         <item name="colorAccent">@color/amber_a400</item>
     </style>
 
diff --git a/src/main/res/values/theme_blue.xml b/src/main/res/values/theme_blue.xml
index e7125f8fa..1c0d79dbf 100644
--- a/src/main/res/values/theme_blue.xml
+++ b/src/main/res/values/theme_blue.xml
@@ -6,7 +6,7 @@
         <item name="colorPrimaryDark">@color/blue_700</item>
     </style>
 
-    <style name="BlueAccent">
+    <style name="BlueAccent" parent="WhiteTint">
         <item name="colorAccent">@color/blue_a400</item>
     </style>
 
diff --git a/src/main/res/values/theme_blue_grey.xml b/src/main/res/values/theme_blue_grey.xml
index 60f627517..282e03065 100644
--- a/src/main/res/values/theme_blue_grey.xml
+++ b/src/main/res/values/theme_blue_grey.xml
@@ -6,7 +6,7 @@
         <item name="colorPrimaryDark">@color/blue_grey_700</item>
     </style>
 
-    <style name="BlueGreyAccent">
+    <style name="BlueGreyAccent" parent="WhiteTint">
         <item name="colorAccent">@color/blue_grey_400</item>
     </style>
 
diff --git a/src/main/res/values/theme_cyan.xml b/src/main/res/values/theme_cyan.xml
index 0c1a86059..c15099dc6 100644
--- a/src/main/res/values/theme_cyan.xml
+++ b/src/main/res/values/theme_cyan.xml
@@ -6,7 +6,7 @@
         <item name="colorPrimaryDark">@color/cyan_700</item>
     </style>
 
-    <style name="CyanAccent">
+    <style name="CyanAccent" parent="BlackTint">
         <item name="colorAccent">@color/cyan_a400</item>
     </style>
 
diff --git a/src/main/res/values/theme_deep_orange.xml b/src/main/res/values/theme_deep_orange.xml
index 07d3ed15c..cc31de489 100644
--- a/src/main/res/values/theme_deep_orange.xml
+++ b/src/main/res/values/theme_deep_orange.xml
@@ -6,7 +6,7 @@
         <item name="colorPrimaryDark">@color/deep_orange_700</item>
     </style>
 
-    <style name="DeepOrangeAccent">
+    <style name="DeepOrangeAccent" parent="WhiteTint">
         <item name="colorAccent">@color/deep_orange_a400</item>
     </style>
 
diff --git a/src/main/res/values/theme_deep_purple.xml b/src/main/res/values/theme_deep_purple.xml
index 74d62e344..ef7bc5b5c 100644
--- a/src/main/res/values/theme_deep_purple.xml
+++ b/src/main/res/values/theme_deep_purple.xml
@@ -6,7 +6,7 @@
         <item name="colorPrimaryDark">@color/deep_purple_700</item>
     </style>
 
-    <style name="DeepPurpleAccent">
+    <style name="DeepPurpleAccent" parent="WhiteTint">
         <item name="colorAccent">@color/deep_purple_a400</item>
     </style>
 
diff --git a/src/main/res/values/theme_green.xml b/src/main/res/values/theme_green.xml
index 9e4f43c92..0edc7720a 100644
--- a/src/main/res/values/theme_green.xml
+++ b/src/main/res/values/theme_green.xml
@@ -6,7 +6,7 @@
         <item name="colorPrimaryDark">@color/green_700</item>
     </style>
 
-    <style name="GreenAccent">
+    <style name="GreenAccent" parent="BlackTint">
         <item name="colorAccent">@color/green_a400</item>
     </style>
 
diff --git a/src/main/res/values/theme_indigo.xml b/src/main/res/values/theme_indigo.xml
index 58d6be59b..393459011 100644
--- a/src/main/res/values/theme_indigo.xml
+++ b/src/main/res/values/theme_indigo.xml
@@ -6,7 +6,7 @@
         <item name="colorPrimaryDark">@color/indigo_700</item>
     </style>
 
-    <style name="IndigoAccent">
+    <style name="IndigoAccent" parent="WhiteTint">
         <item name="colorAccent">@color/indigo_a400</item>
     </style>
 
diff --git a/src/main/res/values/theme_light_blue.xml b/src/main/res/values/theme_light_blue.xml
index f50f41d73..25e8d4b82 100644
--- a/src/main/res/values/theme_light_blue.xml
+++ b/src/main/res/values/theme_light_blue.xml
@@ -6,7 +6,7 @@
         <item name="colorPrimaryDark">@color/light_blue_700</item>
     </style>
 
-    <style name="LightBlueAccent">
+    <style name="LightBlueAccent" parent="BlackTint">
         <item name="colorAccent">@color/light_blue_a400</item>
     </style>
 
diff --git a/src/main/res/values/theme_light_green.xml b/src/main/res/values/theme_light_green.xml
index 33237c988..91ae44484 100644
--- a/src/main/res/values/theme_light_green.xml
+++ b/src/main/res/values/theme_light_green.xml
@@ -6,7 +6,7 @@
         <item name="colorPrimaryDark">@color/light_green_700</item>
     </style>
 
-    <style name="LightGreenAccent">
+    <style name="LightGreenAccent" parent="BlackTint">
         <item name="colorAccent">@color/light_green_a400</item>
     </style>
 
diff --git a/src/main/res/values/theme_lime.xml b/src/main/res/values/theme_lime.xml
index 36c16cc2f..4da95ad7a 100644
--- a/src/main/res/values/theme_lime.xml
+++ b/src/main/res/values/theme_lime.xml
@@ -6,7 +6,7 @@
         <item name="colorPrimaryDark">@color/lime_700</item>
     </style>
 
-    <style name="LimeAccent">
+    <style name="LimeAccent" parent="BlackTint">
         <item name="colorAccent">@color/lime_a400</item>
     </style>
 
diff --git a/src/main/res/values/theme_orange.xml b/src/main/res/values/theme_orange.xml
index cd5f54c97..8653f328c 100644
--- a/src/main/res/values/theme_orange.xml
+++ b/src/main/res/values/theme_orange.xml
@@ -6,7 +6,7 @@
         <item name="colorPrimaryDark">@color/orange_700</item>
     </style>
 
-    <style name="OrangeAccent">
+    <style name="OrangeAccent" parent="BlackTint">
         <item name="colorAccent">@color/orange_a400</item>
     </style>
 
diff --git a/src/main/res/values/theme_pink.xml b/src/main/res/values/theme_pink.xml
index 233708bfb..5c66527a7 100644
--- a/src/main/res/values/theme_pink.xml
+++ b/src/main/res/values/theme_pink.xml
@@ -6,7 +6,7 @@
         <item name="colorPrimaryDark">@color/pink_700</item>
     </style>
 
-    <style name="PinkAccent">
+    <style name="PinkAccent" parent="WhiteTint">
         <item name="colorAccent">@color/pink_a400</item>
     </style>
 
diff --git a/src/main/res/values/theme_purple.xml b/src/main/res/values/theme_purple.xml
index 7e2987c74..bef244246 100644
--- a/src/main/res/values/theme_purple.xml
+++ b/src/main/res/values/theme_purple.xml
@@ -6,7 +6,7 @@
         <item name="colorPrimaryDark">@color/purple_700</item>
     </style>
 
-    <style name="PurpleAccent">
+    <style name="PurpleAccent" parent="WhiteTint">
         <item name="colorAccent">@color/purple_a400</item>
     </style>
 
diff --git a/src/main/res/values/theme_red.xml b/src/main/res/values/theme_red.xml
index 9490e46a4..93703b7b4 100644
--- a/src/main/res/values/theme_red.xml
+++ b/src/main/res/values/theme_red.xml
@@ -6,7 +6,7 @@
         <item name="colorPrimaryDark">@color/red_700</item>
     </style>
 
-    <style name="RedAccent">
+    <style name="RedAccent" parent="WhiteTint">
         <item name="colorAccent">@color/red_a400</item>
     </style>
 
diff --git a/src/main/res/values/theme_teal.xml b/src/main/res/values/theme_teal.xml
index 950c87123..6b2250e9a 100644
--- a/src/main/res/values/theme_teal.xml
+++ b/src/main/res/values/theme_teal.xml
@@ -6,7 +6,7 @@
         <item name="colorPrimaryDark">@color/teal_700</item>
     </style>
 
-    <style name="TealAccent">
+    <style name="TealAccent" parent="BlackTint">
         <item name="colorAccent">@color/teal_a400</item>
     </style>
 
diff --git a/src/main/res/values/theme_yellow.xml b/src/main/res/values/theme_yellow.xml
index bf455bb6e..400dfb8a7 100644
--- a/src/main/res/values/theme_yellow.xml
+++ b/src/main/res/values/theme_yellow.xml
@@ -6,7 +6,7 @@
         <item name="colorPrimaryDark">@color/yellow_700</item>
     </style>
 
-    <style name="YellowAccent">
+    <style name="YellowAccent" parent="BlackTint">
         <item name="colorAccent">@color/yellow_a400</item>
     </style>