public static int profileThemeId = -1;
public static MutableLiveData<Integer> themeWatch = new MutableLiveData<>(0);
public static int errorTextColor;
+ private static int SWIPE_COLOR_COUNT = 6;
private static int[] themeIDs =
{R.style.AppTheme_000, R.style.AppTheme_005,
R.style.AppTheme_010, R.style.AppTheme_015,
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",
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;
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()));
}