From 90d51aca3817e56dbaf7582d67619cde86b90553 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Fri, 26 Jul 2019 11:39:07 -0500
Subject: [PATCH] Remove icon_tint attr

---
 app/src/main/java/org/tasks/dialogs/IconPickerHolder.java  | 7 +++++--
 .../main/java/org/tasks/ui/SingleCheckedArrayAdapter.java  | 2 +-
 app/src/main/res/layout/control_set_clear_button.xml       | 2 +-
 app/src/main/res/layout/control_set_template.xml           | 2 +-
 app/src/main/res/layout/control_set_timers.xml             | 2 +-
 app/src/main/res/layout/filter_adapter_row.xml             | 2 +-
 app/src/main/res/layout/filter_adapter_subheader.xml       | 2 +-
 app/src/main/res/layout/list_settings_icon.xml             | 2 +-
 app/src/main/res/layout/location_row.xml                   | 2 +-
 app/src/main/res/layout/preference_draggable_row.xml       | 2 +-
 app/src/main/res/layout/tag_edit_row.xml                   | 2 +-
 app/src/main/res/layout/task_list_body_empty.xml           | 2 +-
 app/src/main/res/values/attrs.xml                          | 1 -
 app/src/main/res/values/theme.xml                          | 3 ---
 14 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/org/tasks/dialogs/IconPickerHolder.java b/app/src/main/java/org/tasks/dialogs/IconPickerHolder.java
index fbfeaff16..0cd25f27e 100644
--- a/app/src/main/java/org/tasks/dialogs/IconPickerHolder.java
+++ b/app/src/main/java/org/tasks/dialogs/IconPickerHolder.java
@@ -8,6 +8,7 @@ import android.view.View;
 import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.appcompat.widget.AppCompatImageView;
+import androidx.core.content.ContextCompat;
 import androidx.core.graphics.drawable.DrawableCompat;
 import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
@@ -28,7 +29,7 @@ public class IconPickerHolder extends RecyclerView.ViewHolder {
 
   private int index;
 
-  public IconPickerHolder(
+  IconPickerHolder(
       Context context, Inventory inventory, @NonNull View view, Callback<Integer> onClick) {
     super(view);
     this.inventory = inventory;
@@ -58,7 +59,9 @@ public class IconPickerHolder extends RecyclerView.ViewHolder {
     }
     DrawableCompat.setTint(
         imageView.getDrawable(),
-        getData(context, selected ? R.attr.colorAccent : R.attr.icon_tint));
+        selected
+            ? getData(context, R.attr.colorAccent)
+            : ContextCompat.getColor(context, R.color.icon_tint));
   }
 
   private boolean isEnabled() {
diff --git a/app/src/main/java/org/tasks/ui/SingleCheckedArrayAdapter.java b/app/src/main/java/org/tasks/ui/SingleCheckedArrayAdapter.java
index 15b9365a7..bb0be00a4 100644
--- a/app/src/main/java/org/tasks/ui/SingleCheckedArrayAdapter.java
+++ b/app/src/main/java/org/tasks/ui/SingleCheckedArrayAdapter.java
@@ -34,7 +34,7 @@ public class SingleCheckedArrayAdapter extends ArrayAdapter<String> {
     this.context = context;
     this.accent = accent;
     this.alpha = (int) (255 * getDimen(context, R.dimen.alpha_secondary));
-    this.tint = getData(context, R.attr.icon_tint);
+    this.tint = ContextCompat.getColor(context, R.color.icon_tint);
   }
 
   @NonNull
diff --git a/app/src/main/res/layout/control_set_clear_button.xml b/app/src/main/res/layout/control_set_clear_button.xml
index c6c9b90f8..ccc04f9cc 100644
--- a/app/src/main/res/layout/control_set_clear_button.xml
+++ b/app/src/main/res/layout/control_set_clear_button.xml
@@ -11,4 +11,4 @@
   android:background="?attr/selectableItemBackgroundBorderless"
   android:clickable="true"
   android:src="@drawable/ic_outline_clear_24px"
-  android:tint="?attr/icon_tint"/>
\ No newline at end of file
+  android:tint="@color/icon_tint"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/control_set_template.xml b/app/src/main/res/layout/control_set_template.xml
index 2614ea2e2..2d92c6c9b 100644
--- a/app/src/main/res/layout/control_set_template.xml
+++ b/app/src/main/res/layout/control_set_template.xml
@@ -23,7 +23,7 @@
     android:paddingRight="@dimen/keyline_second"
     android:alpha="?attr/alpha_secondary"
     android:scaleType="center"
-    android:tint="?attr/icon_tint"
+    android:tint="@color/icon_tint"
     tools:ignore="ContentDescription"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/control_set_timers.xml b/app/src/main/res/layout/control_set_timers.xml
index d6b8a73dc..96eead29e 100644
--- a/app/src/main/res/layout/control_set_timers.xml
+++ b/app/src/main/res/layout/control_set_timers.xml
@@ -43,7 +43,7 @@
       android:alpha="?attr/alpha_secondary"
       android:gravity="center_vertical|center_horizontal"
       android:scaleType="centerInside"
-      android:tint="?attr/icon_tint"/>
+      android:tint="@color/icon_tint"/>
 
     <Chronometer
       android:id="@+id/timer"
diff --git a/app/src/main/res/layout/filter_adapter_row.xml b/app/src/main/res/layout/filter_adapter_row.xml
index 0426f9e99..ad2774509 100644
--- a/app/src/main/res/layout/filter_adapter_row.xml
+++ b/app/src/main/res/layout/filter_adapter_row.xml
@@ -38,7 +38,7 @@
     android:layout_gravity="center_vertical"
     android:alpha="?attr/alpha_secondary"
     android:scaleType="center"
-    android:tint="?attr/icon_tint"/>
+    android:tint="@color/icon_tint"/>
 
   <CheckedTextView
     android:id="@+id/text"
diff --git a/app/src/main/res/layout/filter_adapter_subheader.xml b/app/src/main/res/layout/filter_adapter_subheader.xml
index 7fdaadabf..932b074d9 100644
--- a/app/src/main/res/layout/filter_adapter_subheader.xml
+++ b/app/src/main/res/layout/filter_adapter_subheader.xml
@@ -29,7 +29,7 @@
     android:focusable="true"
     android:scaleType="center"
     android:src="@drawable/ic_outline_sync_problem_24px"
-    android:tint="?attr/icon_tint"
+    android:tint="@color/icon_tint"
     android:visibility="gone"/>
 
   <CheckedTextView
diff --git a/app/src/main/res/layout/list_settings_icon.xml b/app/src/main/res/layout/list_settings_icon.xml
index 220bfd026..8740f824c 100644
--- a/app/src/main/res/layout/list_settings_icon.xml
+++ b/app/src/main/res/layout/list_settings_icon.xml
@@ -14,7 +14,7 @@
     android:alpha="?attr/alpha_secondary"
     android:contentDescription="@string/icon"
     android:src="@drawable/ic_outline_label_24px"
-    android:tint="?attr/icon_tint"/>
+    android:tint="@color/icon_tint"/>
 
   <TextView
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/location_row.xml b/app/src/main/res/layout/location_row.xml
index 670778f98..1ca2c05ea 100644
--- a/app/src/main/res/layout/location_row.xml
+++ b/app/src/main/res/layout/location_row.xml
@@ -16,7 +16,7 @@
     android:clickable="true"
     android:focusable="true"
     android:src="@drawable/ic_outline_notifications_off_24px"
-    android:tint="?attr/icon_tint"
+    android:tint="@color/icon_tint"
     android:visibility="gone"/>
 
   <TextView
diff --git a/app/src/main/res/layout/preference_draggable_row.xml b/app/src/main/res/layout/preference_draggable_row.xml
index 71ac47b80..7ed997d8a 100644
--- a/app/src/main/res/layout/preference_draggable_row.xml
+++ b/app/src/main/res/layout/preference_draggable_row.xml
@@ -28,5 +28,5 @@
     android:layout_gravity="center_vertical|end"
     android:scaleType="center"
     android:src="@drawable/ic_outline_drag_handle_24px"
-    android:tint="?attr/icon_tint"/>
+    android:tint="@color/icon_tint"/>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/tag_edit_row.xml b/app/src/main/res/layout/tag_edit_row.xml
index 4458c87b5..4ea7d7172 100644
--- a/app/src/main/res/layout/tag_edit_row.xml
+++ b/app/src/main/res/layout/tag_edit_row.xml
@@ -34,5 +34,5 @@
     android:layout_gravity="center"
     android:contentDescription="@string/remove"
     android:src="@drawable/ic_outline_clear_24px"
-    android:tint="?attr/icon_tint"/>
+    android:tint="@color/icon_tint"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/task_list_body_empty.xml b/app/src/main/res/layout/task_list_body_empty.xml
index e7c992e61..9b1c30022 100644
--- a/app/src/main/res/layout/task_list_body_empty.xml
+++ b/app/src/main/res/layout/task_list_body_empty.xml
@@ -25,7 +25,7 @@
         android:layout_gravity="center"
         android:alpha="?attr/alpha_disabled"
         android:src="@drawable/ic_outline_inbox_168px"
-        android:tint="?attr/icon_tint"/>
+        android:tint="@color/icon_tint"/>
 
       <TextView
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index ff2925681..19c6d1f5e 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -8,7 +8,6 @@
   <!-- theme attributes -->
   <attr format="color" name="asWindowBackground"/>
   <attr format="color" name="asContentBackground"/>
-  <attr format="color" name="icon_tint"/>
   <attr format="reference" name="overlay_theme"/>
   <attr format="color" name="actionBarSecondaryText"/>
   <attr format="boolean" name="dark_status_bar"/>
diff --git a/app/src/main/res/values/theme.xml b/app/src/main/res/values/theme.xml
index f85c77e70..19570515e 100644
--- a/app/src/main/res/values/theme.xml
+++ b/app/src/main/res/values/theme.xml
@@ -12,7 +12,6 @@
     <item name="windowActionModeOverlay">true</item>
     <item name="asWindowBackground">@color/window_background</item>
     <item name="asContentBackground">@color/content_background</item>
-    <item name="icon_tint">@color/icon_tint</item>
     <item name="android:spinnerItemStyle">@style/SpinnerNoPadding</item>
     <item name="dialogTheme">@style/TasksDialog</item>
     <item name="android:dialogTheme">@style/TasksDialog</item>
@@ -44,13 +43,11 @@
     <item name="colorOnBackground">@color/text_primary</item>
     <item name="colorOnSurface">@color/text_primary</item>
     <item name="colorAccent">?attr/colorAccentDialog</item>
-    <item name="icon_tint">@color/icon_tint</item>
   </style>
 
   <style name="TasksDialog" parent="DayNightDialog">
     <item name="android:windowBackground">@color/dialog_background</item>
     <item name="colorAccent">?attr/colorAccentDialog</item>
-    <item name="icon_tint">@color/icon_tint</item>
   </style>
 
   <style name="ThemeBlack" parent="Tasks">