From d15f3f85a43e26841270919fe5af5337c31e3039 Mon Sep 17 00:00:00 2001
From: Phillip Hsu <philliphsu@outlook.com>
Date: Mon, 5 Sep 2016 03:39:58 -0700
Subject: [PATCH] Apply correct tint to dismiss button icon

---
 .../com/philliphsu/clock2/alarms/BaseAlarmViewHolder.java  | 7 ++++---
 .../com/philliphsu/clock2/aospdatetimepicker/Utils.java    | 5 +++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/philliphsu/clock2/alarms/BaseAlarmViewHolder.java b/app/src/main/java/com/philliphsu/clock2/alarms/BaseAlarmViewHolder.java
index b7ba078..2245f61 100644
--- a/app/src/main/java/com/philliphsu/clock2/alarms/BaseAlarmViewHolder.java
+++ b/app/src/main/java/com/philliphsu/clock2/alarms/BaseAlarmViewHolder.java
@@ -21,6 +21,7 @@ import com.philliphsu.clock2.Alarm;
 import com.philliphsu.clock2.BaseViewHolder;
 import com.philliphsu.clock2.OnListItemInteractionListener;
 import com.philliphsu.clock2.R;
+import com.philliphsu.clock2.aospdatetimepicker.Utils;
 import com.philliphsu.clock2.editalarm.BaseTimePickerDialog;
 import com.philliphsu.clock2.editalarm.BaseTimePickerDialog.OnTimeSetListener;
 import com.philliphsu.clock2.editalarm.TimePickerHelper;
@@ -263,9 +264,9 @@ public abstract class BaseAlarmViewHolder extends BaseViewHolder<Alarm> {
         setVisibility(mDismissButton, visible);
         mDismissButton.setText(buttonText);
         // Set drawable start
-        mDismissButton.setCompoundDrawablesRelativeWithIntrinsicBounds(
-                upcoming ? mDismissNowDrawable : mCancelSnoozeDrawable,
-                null, null, null);
+        Drawable icon = upcoming ? mDismissNowDrawable : mCancelSnoozeDrawable;
+        Utils.setTint(icon, mDismissButton.getCurrentTextColor());
+        mDismissButton.setCompoundDrawablesRelativeWithIntrinsicBounds(icon, null, null, null);
     }
 
     private void bindLabel(String label) {
diff --git a/app/src/main/java/com/philliphsu/clock2/aospdatetimepicker/Utils.java b/app/src/main/java/com/philliphsu/clock2/aospdatetimepicker/Utils.java
index ed80840..00211b7 100644
--- a/app/src/main/java/com/philliphsu/clock2/aospdatetimepicker/Utils.java
+++ b/app/src/main/java/com/philliphsu/clock2/aospdatetimepicker/Utils.java
@@ -223,6 +223,11 @@ public class Utils {
         target.setImageDrawable(drawable);
     }
 
+    public static void setTint(Drawable drawable, @ColorInt int color) {
+        drawable = DrawableCompat.wrap(drawable.mutate());
+        DrawableCompat.setTint(drawable, color);
+    }
+
     /**
      * Returns a tinted drawable from the given drawable resource, if {@code tintList != null}.
      * Otherwise, no tint will be applied.