From 7bab3b87d08754d7510468ac1739eaf3182f56b0 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Tue, 23 Jul 2019 15:51:18 -0500
Subject: [PATCH] Replace fab_text with colorOnSecondary

---
 .../main/java/org/tasks/repeats/CustomRecurrenceDialog.java   | 2 +-
 app/src/main/res/layout/activity_location_picker.xml          | 1 -
 app/src/main/res/layout/control_set_repeat.xml                | 2 +-
 app/src/main/res/layout/fragment_task_list.xml                | 1 -
 app/src/main/res/layout/frequency_item.xml                    | 2 +-
 app/src/main/res/values/attrs.xml                             | 1 -
 app/src/main/res/values/styles.xml                            | 4 ++--
 7 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/tasks/repeats/CustomRecurrenceDialog.java b/app/src/main/java/org/tasks/repeats/CustomRecurrenceDialog.java
index 82bdf24ca..975f8f10a 100644
--- a/app/src/main/java/org/tasks/repeats/CustomRecurrenceDialog.java
+++ b/app/src/main/java/org/tasks/repeats/CustomRecurrenceDialog.java
@@ -303,7 +303,7 @@ public class CustomRecurrenceDialog extends InjectingDialogFragment {
               new int[] {android.R.attr.state_checked}, new int[] {-android.R.attr.state_checked}
             },
             new int[] {
-              ResourceResolver.getData(context, R.attr.fab_text),
+              ResourceResolver.getData(context, R.attr.colorOnSecondary),
               getColor(context, R.color.text_primary)
             });
     int inset = (int) context.getResources().getDimension(R.dimen.week_button_inset);
diff --git a/app/src/main/res/layout/activity_location_picker.xml b/app/src/main/res/layout/activity_location_picker.xml
index 44d6d4cf6..f093d7387 100644
--- a/app/src/main/res/layout/activity_location_picker.xml
+++ b/app/src/main/res/layout/activity_location_picker.xml
@@ -77,7 +77,6 @@
           android:layout_gravity="end|bottom"
           android:padding="0dp"
           android:src="@drawable/ic_outline_gps_fixed_24px"
-          app:tint="?attr/fab_text"
           app:backgroundTint="?attr/colorAccent"
           app:borderWidth="0dp"
           app:layout_constraintBottom_toBottomOf="@id/map"
diff --git a/app/src/main/res/layout/control_set_repeat.xml b/app/src/main/res/layout/control_set_repeat.xml
index b65b348b3..43ff81aff 100644
--- a/app/src/main/res/layout/control_set_repeat.xml
+++ b/app/src/main/res/layout/control_set_repeat.xml
@@ -31,7 +31,7 @@
         android:paddingEnd="@dimen/keyline_first"
         android:paddingLeft="@dimen/keyline_first"
         android:paddingRight="@dimen/keyline_first"
-        app:backgroundTint="?fab_text"/>
+        app:backgroundTint="?attr/colorOnSecondary"/>
 
     </FrameLayout>
 
diff --git a/app/src/main/res/layout/fragment_task_list.xml b/app/src/main/res/layout/fragment_task_list.xml
index e20991621..1ef802082 100644
--- a/app/src/main/res/layout/fragment_task_list.xml
+++ b/app/src/main/res/layout/fragment_task_list.xml
@@ -52,7 +52,6 @@
     android:layout_gravity="end|bottom"
     android:padding="0dp"
     android:src="@drawable/ic_outline_add_24px"
-    app:tint="?attr/fab_text"
     app:backgroundTint="?attr/colorAccent"
     app:borderWidth="0dp"/>
 
diff --git a/app/src/main/res/layout/frequency_item.xml b/app/src/main/res/layout/frequency_item.xml
index 9ac9680a8..3b4022b29 100644
--- a/app/src/main/res/layout/frequency_item.xml
+++ b/app/src/main/res/layout/frequency_item.xml
@@ -13,4 +13,4 @@
   android:ellipsize="end"
   android:singleLine="true"
   android:textAlignment="viewStart"
-  android:textColor="?fab_text"/>
+  android:textColor="?attr/colorOnSecondary"/>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 113238e2a..04a4aeed0 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -17,7 +17,6 @@
   <attr format="boolean" name="dark_status_bar"/>
   <attr format="dimension" name="alpha_secondary"/>
   <attr format="dimension" name="alpha_disabled"/>
-  <attr format="color" name="fab_text"/>
   <attr format="color" name="colorAccentDialog"/>
   <attr format="dimension" name="card_elevation"/>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 37d392640..fcfc65315 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -43,11 +43,11 @@
   </style>
 
   <style name="WhiteTint">
-    <item name="fab_text">@color/white_100</item>
+    <item name="colorOnSecondary">@color/white_100</item>
   </style>
 
   <style name="BlackTint">
-    <item name="fab_text">@color/black_87</item>
+    <item name="colorOnSecondary">@color/black_87</item>
   </style>
 
   <style name="WhiteToolbarOverlay" parent="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar">