From 7e701af4c7446cb0fe734978ec1c7b07f89b1e3e Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Thu, 7 Jul 2016 17:46:58 -0400 Subject: [PATCH] Optimize CIECLhEvaluator and ThemeManager.setActiveColor --- .../main/java/com/moez/QKSMS/common/CIELChEvaluator.java | 9 +++++++++ QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java | 6 ++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/CIELChEvaluator.java b/QKSMS/src/main/java/com/moez/QKSMS/common/CIELChEvaluator.java index 746dab1a..b487db1d 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/CIELChEvaluator.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/CIELChEvaluator.java @@ -18,7 +18,13 @@ public class CIELChEvaluator implements TypeEvaluator { private final ColorCIELCh mStartColor; private final ColorCIELCh mEndColor; + private final int mStartInt; + private final int mEndInt; + public CIELChEvaluator(int startColor, int endColor) { + mStartInt = startColor; + mEndInt = endColor; + mStartColor = convertRgbToCIELCH(startColor); mEndColor = convertRgbToCIELCH(endColor); } @@ -29,6 +35,9 @@ public class CIELChEvaluator implements TypeEvaluator { @Override public Integer evaluate(float fraction, Integer ignored, Integer ignored2) { + if (mStartInt == mEndInt) { + return mStartInt; + } // CIELCH to CIELAB double L = mStartColor.L * (1 - fraction) + mEndColor.L * fraction; diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java index b57ffb49..731d611c 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java @@ -621,8 +621,10 @@ public class ThemeManager { } public static void setActiveColor(int color) { - mActiveColor = color; - LiveViewManager.refreshViews(QKPreference.THEME); + if (mActiveColor != color) { + mActiveColor = color; + LiveViewManager.refreshViews(QKPreference.THEME); + } } private static boolean isColorDarkEnough(int color) {