Use CIE-LCh interpolator for theme changing

This commit is contained in:
Moez Bhatti
2016-01-04 12:25:28 -05:00
parent 800f894ca9
commit 90b47efcfa
3 changed files with 7 additions and 5 deletions
@@ -31,9 +31,9 @@ public class CIELChEvaluator implements TypeEvaluator<Integer> {
public Integer evaluate(float fraction, Integer ignored, Integer ignored2) {
// CIELCH to CIELAB
double L = mStartColor.L * fraction + mEndColor.L * (1 - fraction);
double C = mStartColor.C * fraction + mEndColor.C * (1 - fraction);
double H = mStartColor.H * fraction + mEndColor.H * (1 - fraction);
double L = mStartColor.L * (1 - fraction) + mEndColor.L * fraction;
double C = mStartColor.C * (1 - fraction) + mEndColor.C * fraction;
double H = mStartColor.H * (1 - fraction) + mEndColor.H * fraction;
double a = Math.cos(Math.toRadians(H)) * C;
double b = Math.sin(Math.toRadians(H)) * C;
@@ -21,6 +21,7 @@ import android.view.animation.DecelerateInterpolator;
import android.widget.LinearLayout;
import com.moez.QKSMS.R;
import com.moez.QKSMS.common.AnalyticsManager;
import com.moez.QKSMS.common.CIELChEvaluator;
import com.moez.QKSMS.common.LiveViewManager;
import com.moez.QKSMS.common.preferences.QKPreference;
import com.moez.QKSMS.common.utils.ColorUtils;
@@ -557,7 +558,7 @@ public class ThemeManager {
mTextOnColorSecondary = mResources.getColor(isColorDarkEnough(mColor) ?
R.color.theme_dark_text_secondary : R.color.theme_light_text_secondary);
ValueAnimator colorAnimation = ValueAnimator.ofObject(new ArgbEvaluator(), colorFrom, color);
ValueAnimator colorAnimation = ValueAnimator.ofObject(new CIELChEvaluator(colorFrom, color), 0);
colorAnimation.setDuration(TRANSITION_LENGTH);
colorAnimation.setInterpolator(new DecelerateInterpolator());
colorAnimation.addUpdateListener(animation -> {
@@ -54,6 +54,7 @@ import com.moez.QKSMS.R;
import com.moez.QKSMS.common.CIELChEvaluator;
import com.moez.QKSMS.common.ConversationPrefsHelper;
import com.moez.QKSMS.common.DialogHelper;
import com.moez.QKSMS.common.LiveViewManager;
import com.moez.QKSMS.common.conversationdetails.ConversationDetailsDialog;
import com.moez.QKSMS.common.preferences.QKPreference;
import com.moez.QKSMS.common.utils.DrmUtils;
@@ -220,7 +221,7 @@ public class MessageListFragment extends QKContentFragment implements ActivityLa
}
mConversationPrefs = new ConversationPrefsHelper(mContext, mThreadId);
mCIELChEvaluator = new CIELChEvaluator(ThemeManager.getColor(), mConversationPrefs.getColor());
mCIELChEvaluator = new CIELChEvaluator(mConversationPrefs.getColor(), ThemeManager.getColor());
mIsSmsEnabled = MmsConfig.isSmsEnabled(mContext);
mConversationDetailsDialog = new ConversationDetailsDialog(mContext, getFragmentManager());
setHasOptionsMenu(true);