From 23f15c28e9953cdb97d73b39048c61de7f564cec Mon Sep 17 00:00:00 2001
From: Fahim <fahim.cse11@gmail.com>
Date: Fri, 13 Aug 2021 13:56:44 +0600
Subject: [PATCH] 3649-Q-color_issue_in_light_mode

issue: https://gitlab.e.foundation/e/backlog/-/issues/3649
---
 res/layout/alarm_time_collapsed.xml                    |  2 +-
 src/com/android/deskclock/alarms/AlarmActivity.java    |  5 +++--
 .../deskclock/widget/toast/SnackbarManager.java        | 10 ++++++++++
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/res/layout/alarm_time_collapsed.xml b/res/layout/alarm_time_collapsed.xml
index f91456142..5dde9826e 100644
--- a/res/layout/alarm_time_collapsed.xml
+++ b/res/layout/alarm_time_collapsed.xml
@@ -70,7 +70,7 @@
             android:maxLines="1"
             android:paddingEnd="@dimen/icon_margin"
             android:paddingStart="@dimen/icon_margin"
-            android:textColor="@color/gray1" />
+            android:textColor="@color/color_default_secondary_text" />
 
         <TextView
             android:id="@+id/days_of_week"
diff --git a/src/com/android/deskclock/alarms/AlarmActivity.java b/src/com/android/deskclock/alarms/AlarmActivity.java
index f6148eec4..025c04bea 100644
--- a/src/com/android/deskclock/alarms/AlarmActivity.java
+++ b/src/com/android/deskclock/alarms/AlarmActivity.java
@@ -15,6 +15,7 @@
  */
 package com.android.deskclock.alarms;
 
+import androidx.core.content.ContextCompat;
 import android.accessibilityservice.AccessibilityServiceInfo;
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -221,7 +222,7 @@ public class AlarmActivity extends BaseActivity
         mDismissButton.setOnClickListener(this);
 
         mAlarmAnimator = AnimatorUtils.getScaleAnimator(mAlarmButton, 1.0f, 0.0f);
-        mSnoozeAnimator = getButtonAnimator(mSnoozeButton, Color.WHITE);
+        mSnoozeAnimator = getButtonAnimator(mSnoozeButton, mCurrentHourColor);
         mDismissAnimator = getButtonAnimator(mDismissButton, mCurrentHourColor);
         mPulseAnimator = ObjectAnimator.ofPropertyValuesHolder(pulseView,
                 PropertyValuesHolder.ofFloat(CircleView.RADIUS, 0.0f, pulseView.getRadius()),
@@ -567,7 +568,7 @@ public class AlarmActivity extends BaseActivity
                 PropertyValuesHolder.ofInt(AnimatorUtils.DRAWABLE_ALPHA,
                         BUTTON_DRAWABLE_ALPHA_DEFAULT, 255),
                 PropertyValuesHolder.ofObject(AnimatorUtils.DRAWABLE_TINT,
-                        AnimatorUtils.ARGB_EVALUATOR, Color.WHITE, tintColor));
+                        AnimatorUtils.ARGB_EVALUATOR, ContextCompat.getColor(this, R.color.color_default_primary_text), tintColor));
     }
 
     private ValueAnimator getAlarmBounceAnimator(float translationX, final int hintResId) {
diff --git a/src/com/android/deskclock/widget/toast/SnackbarManager.java b/src/com/android/deskclock/widget/toast/SnackbarManager.java
index 95d91b2f6..0fa071f76 100644
--- a/src/com/android/deskclock/widget/toast/SnackbarManager.java
+++ b/src/com/android/deskclock/widget/toast/SnackbarManager.java
@@ -17,9 +17,14 @@
 package com.android.deskclock.widget.toast;
 
 import com.google.android.material.snackbar.Snackbar;
+import android.view.View;
+import android.widget.TextView;
+import androidx.core.content.ContextCompat;
 
 import java.lang.ref.WeakReference;
 
+import com.android.deskclock.R;
+
 /**
  * Manages visibility of Snackbar and allow preemptive dismiss of current displayed Snackbar.
  */
@@ -31,6 +36,11 @@ public final class SnackbarManager {
 
     public static void show(Snackbar snackbar) {
         sSnackbar = new WeakReference<>(snackbar);
+        View view = snackbar.getView();
+        view.setBackgroundColor(ContextCompat.getColor(snackbar.getContext(), R.color.color_default_primary_dark));
+        TextView tv = (TextView) view.findViewById(com.google.android.material.R.id.snackbar_text);
+        tv.setTextColor(ContextCompat.getColor(snackbar.getContext(), R.color.color_default_primary_text));
+        tv.setBackgroundColor(ContextCompat.getColor(snackbar.getContext(), R.color.color_default_primary_dark));
         snackbar.show();
     }
 
-- 
GitLab