X-Git-Url: https://git.ktnx.net/?p=mobile-ledger-staging.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Futils%2FColors.java;h=fdaacd5c3f61fac25548fc95da13956a52bd18c6;hp=c61d0144fa251b9de618a53c46e063a8857985cf;hb=20c03b7a5eb152d42fbbe9ecbaae27530563b398;hpb=6680ab3aec4c8bfb5662e0d2a251f05cb026e035 diff --git a/app/src/main/java/net/ktnx/mobileledger/utils/Colors.java b/app/src/main/java/net/ktnx/mobileledger/utils/Colors.java index c61d0144..fdaacd5c 100644 --- a/app/src/main/java/net/ktnx/mobileledger/utils/Colors.java +++ b/app/src/main/java/net/ktnx/mobileledger/utils/Colors.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019 Damyan Ivanov. + * Copyright © 2020 Damyan Ivanov. * This file is part of MoLe. * MoLe is free software: you can distribute it and/or modify it * under the term of the GNU General Public License as published by @@ -25,6 +25,7 @@ import android.util.TypedValue; import androidx.annotation.ColorInt; import androidx.annotation.ColorLong; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.lifecycle.MutableLiveData; import net.ktnx.mobileledger.BuildConfig; @@ -44,69 +45,42 @@ public class Colors { public static final int DEFAULT_HUE_DEG = 261; public static final int THEME_HUE_STEP_DEG = 5; public static final int baseHueStep = 60; + public static final MutableLiveData themeWatch = new MutableLiveData<>(0); private static final float blueLightness = 0.665f; private static final float yellowLightness = 0.350f; private static final int[][] EMPTY_STATES = new int[][]{new int[0]}; + private static final int SWIPE_COLOR_COUNT = 6; public static @ColorInt - int accent; - @ColorInt - public static int tableRowLightBG; + int secondary; @ColorInt public static int tableRowDarkBG; - @ColorInt - public static int primary, defaultTextColor; public static int profileThemeId = -1; - public static MutableLiveData themeWatch = new MutableLiveData<>(0); - private static int[] themeIDs = - {R.style.AppTheme_NoActionBar_000, R.style.AppTheme_NoActionBar_005, - R.style.AppTheme_NoActionBar_010, R.style.AppTheme_NoActionBar_015, - R.style.AppTheme_NoActionBar_020, R.style.AppTheme_NoActionBar_025, - R.style.AppTheme_NoActionBar_030, R.style.AppTheme_NoActionBar_035, - R.style.AppTheme_NoActionBar_040, R.style.AppTheme_NoActionBar_045, - R.style.AppTheme_NoActionBar_050, R.style.AppTheme_NoActionBar_055, - R.style.AppTheme_NoActionBar_060, R.style.AppTheme_NoActionBar_065, - R.style.AppTheme_NoActionBar_070, R.style.AppTheme_NoActionBar_075, - R.style.AppTheme_NoActionBar_080, R.style.AppTheme_NoActionBar_085, - R.style.AppTheme_NoActionBar_090, R.style.AppTheme_NoActionBar_095, - R.style.AppTheme_NoActionBar_100, R.style.AppTheme_NoActionBar_105, - R.style.AppTheme_NoActionBar_110, R.style.AppTheme_NoActionBar_115, - R.style.AppTheme_NoActionBar_120, R.style.AppTheme_NoActionBar_125, - R.style.AppTheme_NoActionBar_130, R.style.AppTheme_NoActionBar_135, - R.style.AppTheme_NoActionBar_140, R.style.AppTheme_NoActionBar_145, - R.style.AppTheme_NoActionBar_150, R.style.AppTheme_NoActionBar_155, - R.style.AppTheme_NoActionBar_160, R.style.AppTheme_NoActionBar_165, - R.style.AppTheme_NoActionBar_170, R.style.AppTheme_NoActionBar_175, - R.style.AppTheme_NoActionBar_180, R.style.AppTheme_NoActionBar_185, - R.style.AppTheme_NoActionBar_190, R.style.AppTheme_NoActionBar_195, - R.style.AppTheme_NoActionBar_200, R.style.AppTheme_NoActionBar_205, - R.style.AppTheme_NoActionBar_210, R.style.AppTheme_NoActionBar_215, - R.style.AppTheme_NoActionBar_220, R.style.AppTheme_NoActionBar_225, - R.style.AppTheme_NoActionBar_230, R.style.AppTheme_NoActionBar_235, - R.style.AppTheme_NoActionBar_240, R.style.AppTheme_NoActionBar_245, - R.style.AppTheme_NoActionBar_250, R.style.AppTheme_NoActionBar_255, - R.style.AppTheme_NoActionBar_260, R.style.AppTheme_NoActionBar_265, - R.style.AppTheme_NoActionBar_270, R.style.AppTheme_NoActionBar_275, - R.style.AppTheme_NoActionBar_280, R.style.AppTheme_NoActionBar_285, - R.style.AppTheme_NoActionBar_290, R.style.AppTheme_NoActionBar_295, - R.style.AppTheme_NoActionBar_300, R.style.AppTheme_NoActionBar_305, - R.style.AppTheme_NoActionBar_310, R.style.AppTheme_NoActionBar_315, - R.style.AppTheme_NoActionBar_320, R.style.AppTheme_NoActionBar_325, - R.style.AppTheme_NoActionBar_330, R.style.AppTheme_NoActionBar_335, - R.style.AppTheme_NoActionBar_340, R.style.AppTheme_NoActionBar_345, - R.style.AppTheme_NoActionBar_350, R.style.AppTheme_NoActionBar_355, + private static final int[] themeIDs = + {R.style.AppTheme_000, R.style.AppTheme_005, R.style.AppTheme_010, R.style.AppTheme_015, + R.style.AppTheme_020, R.style.AppTheme_025, R.style.AppTheme_030, R.style.AppTheme_035, + R.style.AppTheme_040, R.style.AppTheme_045, R.style.AppTheme_050, R.style.AppTheme_055, + R.style.AppTheme_060, R.style.AppTheme_065, R.style.AppTheme_070, R.style.AppTheme_075, + R.style.AppTheme_080, R.style.AppTheme_085, R.style.AppTheme_090, R.style.AppTheme_095, + R.style.AppTheme_100, R.style.AppTheme_105, R.style.AppTheme_110, R.style.AppTheme_115, + R.style.AppTheme_120, R.style.AppTheme_125, R.style.AppTheme_130, R.style.AppTheme_135, + R.style.AppTheme_140, R.style.AppTheme_145, R.style.AppTheme_150, R.style.AppTheme_155, + R.style.AppTheme_160, R.style.AppTheme_165, R.style.AppTheme_170, R.style.AppTheme_175, + R.style.AppTheme_180, R.style.AppTheme_185, R.style.AppTheme_190, R.style.AppTheme_195, + R.style.AppTheme_200, R.style.AppTheme_205, R.style.AppTheme_210, R.style.AppTheme_215, + R.style.AppTheme_220, R.style.AppTheme_225, R.style.AppTheme_230, R.style.AppTheme_235, + R.style.AppTheme_240, R.style.AppTheme_245, R.style.AppTheme_250, R.style.AppTheme_255, + R.style.AppTheme_260, R.style.AppTheme_265, R.style.AppTheme_270, R.style.AppTheme_275, + R.style.AppTheme_280, R.style.AppTheme_285, R.style.AppTheme_290, R.style.AppTheme_295, + R.style.AppTheme_300, R.style.AppTheme_305, R.style.AppTheme_310, R.style.AppTheme_315, + R.style.AppTheme_320, R.style.AppTheme_325, R.style.AppTheme_330, R.style.AppTheme_335, + R.style.AppTheme_340, R.style.AppTheme_345, R.style.AppTheme_350, R.style.AppTheme_355, }; public static void refreshColors(Resources.Theme theme) { TypedValue tv = new TypedValue(); theme.resolveAttribute(R.attr.table_row_dark_bg, tv, true); tableRowDarkBG = tv.data; - theme.resolveAttribute(R.attr.table_row_light_bg, tv, true); - tableRowLightBG = tv.data; - theme.resolveAttribute(R.attr.colorPrimary, tv, true); - primary = tv.data; - theme.resolveAttribute(R.attr.textColor, tv, true); - defaultTextColor = tv.data; - theme.resolveAttribute(R.attr.colorAccent, tv, true); - accent = tv.data; + theme.resolveAttribute(R.attr.colorSecondary, tv, true); + secondary = tv.data; // trigger theme observers themeWatch.postValue(themeWatch.getValue() + 1); @@ -152,17 +126,17 @@ public class Colors { public static float baseHueLightness(int baseHueDegrees) { switch (baseHueDegrees % 360) { case 0: - return 0.450f; // red + return 0.550f; // red case 60: - return 0.400f; // yellow + return 0.250f; // yellow case 120: - return 0.400f; // green + return 0.290f; // green case 180: - return 0.400f; // cyan + return 0.300f; // cyan case 240: - return 0.750f; // blue + return 0.710f; // blue case 300: - return 0.500f; // magenta + return 0.450f; // magenta default: throw new IllegalStateException( String.format(Locale.US, "baseHueLightness called with invalid value %d", @@ -182,15 +156,16 @@ public class Colors { public static @ColorInt int getPrimaryColorForHue(int hueDegrees) { int result = hslColor(hueDegrees / 360f, 0.845f, hueLightness(hueDegrees)); - debug("colors", String.format(Locale.ENGLISH, "getPrimaryColorForHue(%d) = %x", hueDegrees, - result)); +// debug("colors", String.format(Locale.ENGLISH, "getPrimaryColorForHue(%d) = %x", +// hueDegrees, +// result)); return result; } public static void setupTheme(Activity activity) { - MobileLedgerProfile profile = Data.profile.getValue(); + MobileLedgerProfile profile = Data.getProfile(); setupTheme(activity, profile); } - public static void setupTheme(Activity activity, MobileLedgerProfile profile) { + public static void setupTheme(Activity activity, @Nullable MobileLedgerProfile profile) { final int themeHue = (profile == null) ? -1 : profile.getThemeHue(); setupTheme(activity, themeHue); } @@ -198,7 +173,7 @@ public class Colors { int themeId = -1; if (themeHue == 360) themeHue = 0; - if ((themeHue >= 0) && (themeHue < 360)) { + if ((themeHue >= 0) && (themeHue < 360) && (themeHue != DEFAULT_HUE_DEG)) { int index; if ((themeHue % HueRing.hueStepDegrees) != 0) { Logger.warn("profiles", @@ -212,7 +187,7 @@ public class Colors { } if (themeId < 0) { - themeId = R.style.AppTheme_NoActionBar; + themeId = R.style.AppTheme_default; debug("profiles", String.format(Locale.ENGLISH, "Theme hue %d not supported, using the default", themeHue)); @@ -226,21 +201,20 @@ public class Colors { refreshColors(activity.getTheme()); } - public static @NonNull ColorStateList getColorStateList() { return getColorStateList(profileThemeId); } public static @NonNull ColorStateList getColorStateList(int hue) { - return new ColorStateList(EMPTY_STATES, getColors(hue)); + return new ColorStateList(EMPTY_STATES, getSwipeCircleColors(hue)); } - public static int[] getColors() { - return getColors(profileThemeId); + public static int[] getSwipeCircleColors() { + return getSwipeCircleColors(profileThemeId); } - public static int[] getColors(int hue) { - int[] colors = new int[]{0, 0, 0, 0, 0, 0}; - for (int i = 0; i < 6; i++, hue = (hue + 60) % 360) { + public static int[] getSwipeCircleColors(int hue) { + int[] colors = new int[SWIPE_COLOR_COUNT]; + for (int i = 0; i < SWIPE_COLOR_COUNT; i++, hue = (hue + 360 / SWIPE_COLOR_COUNT) % 360) { colors[i] = getPrimaryColorForHue(hue); } return colors; @@ -271,7 +245,7 @@ public class Colors { for (int h : hues) { if (huesSB.length() > 0) huesSB.append(", "); - huesSB.append(String.valueOf(h)); + huesSB.append(h); } debug("profiles", String.format("used hues: %s", huesSB.toString())); }