Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 823b224c authored by Romain Hunault's avatar Romain Hunault 🚴🏻
Browse files

Merge branch '3649-Q-color_issue_in_light_mode' into 'v1-q' 

3649-Q-color_issue_in_light_mode

See merge request !22
parents 2acf2bd1 23f15c28

res/layout/alarm_time_collapsed.xml

+1 −1
Original line number Diff line number Diff line
@@ -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"

src/com/android/deskclock/alarms/AlarmActivity.java

+3 −2
Original line number Diff line number Diff line
@@ -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) {

src/com/android/deskclock/widget/toast/SnackbarManager.java

+10 −0
Original line number Diff line number Diff line
@@ -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();

    }