From abedc48f23c1f8328fbedddf476f5eb883372bc5 Mon Sep 17 00:00:00 2001 From: Karim Abou Zeid Date: Sat, 11 Jul 2015 15:53:23 +0200 Subject: [PATCH] Moved a method to the ColorUtil class --- .../gramophone/helper/PlayingNotificationHelper.java | 3 ++- .../main/java/com/kabouzeid/gramophone/util/ColorUtil.java | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/kabouzeid/gramophone/helper/PlayingNotificationHelper.java b/app/src/main/java/com/kabouzeid/gramophone/helper/PlayingNotificationHelper.java index 63e5b602..24999c75 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/helper/PlayingNotificationHelper.java +++ b/app/src/main/java/com/kabouzeid/gramophone/helper/PlayingNotificationHelper.java @@ -26,6 +26,7 @@ import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.model.Song; import com.kabouzeid.gramophone.service.MusicService; import com.kabouzeid.gramophone.ui.activities.MainActivity; +import com.kabouzeid.gramophone.util.ColorUtil; import com.kabouzeid.gramophone.util.MusicUtil; import com.kabouzeid.gramophone.util.PreferenceUtil; import com.nostra13.universalimageloader.core.DisplayImageOptions; @@ -253,7 +254,7 @@ public class PlayingNotificationHelper { if (vibrantSwatch != null) { int bgColor = vibrantSwatch.getRgb(); setBackgroundColor(bgColor); - setNotificationTextDark((Color.red(bgColor) * 0.299 + Color.green(bgColor) * 0.587 + Color.blue(bgColor) * 0.114) > 186); + setNotificationTextDark(ColorUtil.useDarkTextColorOnBackground(bgColor)); backgroundColorSet = true; } } diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/ColorUtil.java b/app/src/main/java/com/kabouzeid/gramophone/util/ColorUtil.java index 302d4e32..7ad8918d 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/util/ColorUtil.java +++ b/app/src/main/java/com/kabouzeid/gramophone/util/ColorUtil.java @@ -48,4 +48,8 @@ public class ColorUtil { new int[]{color} ); } + + public static boolean useDarkTextColorOnBackground(int backgroundColor) { + return (Color.red(backgroundColor) * 0.299 + Color.green(backgroundColor) * 0.587 + Color.blue(backgroundColor) * 0.114) > 186; + } }