Fixed tint color

This commit is contained in:
Moez Bhatti
2015-12-06 23:19:26 -05:00
parent 01cf729087
commit 84c3b0b45e
@@ -11,6 +11,7 @@ import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.res.Resources; import android.content.res.Resources;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Build; import android.os.Build;
@@ -269,10 +270,10 @@ public class ThemeManager {
if (mActivity != null && sStatusTintEnabled) { if (mActivity != null && sStatusTintEnabled) {
if (sStatusTintEnabled) { if (sStatusTintEnabled) {
mWindow.setStatusBarColor(sColor); mWindow.setStatusBarColor(darkenColor(sColor));
} }
if (sNavigationTintEnabled) { if (sNavigationTintEnabled) {
mWindow.setNavigationBarColor(sColor); mWindow.setNavigationBarColor(darkenColor(sColor));
} }
} }
@@ -575,7 +576,7 @@ public class ThemeManager {
ValueAnimator colorAnimation = ValueAnimator.ofObject(new ArgbEvaluator(), colorFrom, colorTo); ValueAnimator colorAnimation = ValueAnimator.ofObject(new ArgbEvaluator(), colorFrom, colorTo);
colorAnimation.setDuration(TRANSITION_LENGTH); colorAnimation.setDuration(TRANSITION_LENGTH);
colorAnimation.addUpdateListener(animation -> { colorAnimation.addUpdateListener(animation -> {
mWindow.setStatusBarColor((Integer) animation.getAnimatedValue()); mWindow.setStatusBarColor(darkenColor((Integer) animation.getAnimatedValue()));
}); });
colorAnimation.start(); colorAnimation.start();
} }
@@ -591,7 +592,7 @@ public class ThemeManager {
ValueAnimator colorAnimation = ValueAnimator.ofObject(new ArgbEvaluator(), colorFrom, colorTo); ValueAnimator colorAnimation = ValueAnimator.ofObject(new ArgbEvaluator(), colorFrom, colorTo);
colorAnimation.setDuration(TRANSITION_LENGTH); colorAnimation.setDuration(TRANSITION_LENGTH);
colorAnimation.addUpdateListener(animation -> { colorAnimation.addUpdateListener(animation -> {
mWindow.setNavigationBarColor((Integer) animation.getAnimatedValue()); mWindow.setNavigationBarColor(darkenColor((Integer) animation.getAnimatedValue()));
}); });
colorAnimation.start(); colorAnimation.start();
} }
@@ -643,10 +644,10 @@ public class ThemeManager {
} }
if (sStatusTintEnabled) { if (sStatusTintEnabled) {
mWindow.setStatusBarColor(color1); mWindow.setStatusBarColor(darkenColor(color1));
} }
if (sNavigationTintEnabled) { if (sNavigationTintEnabled) {
mWindow.setNavigationBarColor(color1); mWindow.setNavigationBarColor(darkenColor(color1));
} }
}); });
colorAnimation.addListener(new AnimatorListenerAdapter() { colorAnimation.addListener(new AnimatorListenerAdapter() {
@@ -677,6 +678,14 @@ public class ThemeManager {
} }
} }
private static int darkenColor(int color) {
float[] hsv = new float[3];
Color.colorToHSV(color, hsv);
hsv[2] *= 0.75f;
color = Color.HSVToColor(hsv);
return color;
}
private static boolean isColorDarkEnough(int color) { private static boolean isColorDarkEnough(int color) {
for (int i = 0; i < COLOURS.length; i++) { for (int i = 0; i < COLOURS.length; i++) {
for (int j = 0; j < COLOURS[i].length; j++) { for (int j = 0; j < COLOURS[i].length; j++) {