X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Futils%2FColors.java;h=9d0c6aaaf51cf90713c96a4a108064c0495a9d82;hb=ecad510202857eb3115de5e575165e61a9f91481;hp=7b8352efbe6d25329794b8bf69a460c28adac436;hpb=09e26d2279484b4dfe0de218b05f075362fff4b5;p=mobile-ledger-staging.git
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 7b8352ef..9d0c6aaa 100644
--- a/app/src/main/java/net/ktnx/mobileledger/utils/Colors.java
+++ b/app/src/main/java/net/ktnx/mobileledger/utils/Colors.java
@@ -1,195 +1,239 @@
+/*
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your opinion), any later version.
+ *
+ * MoLe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License terms for details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with MoLe. If not, see .
+ */
+
package net.ktnx.mobileledger.utils;
import android.app.Activity;
+import android.content.res.ColorStateList;
import android.content.res.Resources;
-import androidx.annotation.ColorInt;
-import androidx.annotation.ColorLong;
-import android.util.Log;
import android.util.TypedValue;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.lifecycle.MutableLiveData;
+
+import net.ktnx.mobileledger.BuildConfig;
import net.ktnx.mobileledger.R;
-import net.ktnx.mobileledger.model.Data;
import net.ktnx.mobileledger.model.MobileLedgerProfile;
+import net.ktnx.mobileledger.ui.HueRing;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Objects;
+
+import static net.ktnx.mobileledger.utils.Logger.debug;
public class Colors {
public static final int DEFAULT_HUE_DEG = 261;
+ public static final MutableLiveData themeWatch = new MutableLiveData<>(0);
+ private static final int[][] EMPTY_STATES = new int[][]{new int[0]};
+ private static final int SWIPE_COLOR_COUNT = 6;
+ private static final int[] themeIDs =
+ {R.style.AppTheme_default, 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,
+ };
+ private static final HashMap themePrimaryColor = new HashMap<>();
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 ObservableValue themeWatch = new ObservableValue<>(0);
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(android.R.color.tab_indicator_text, tv, true);
- defaultTextColor = tv.data;
- theme.resolveAttribute(R.attr.colorAccent, tv, true);
- accent = tv.data;
-
- // trigger theme observers
- themeWatch.notifyObservers();
- }
- public static @ColorLong
- long hsvaColor(float hue, float saturation, float value, float alpha) {
- if (alpha < 0 || alpha > 1)
- throw new IllegalArgumentException("alpha must be between 0 and 1");
+ theme.resolveAttribute(R.attr.colorSecondary, tv, true);
+ secondary = tv.data;
- @ColorLong long rgb = hsvTriplet(hue, saturation, value);
+ if (themePrimaryColor.size() == 0) {
+ for (int themeId : themeIDs) {
+ Resources.Theme tmpTheme = theme.getResources()
+ .newTheme();
+ tmpTheme.applyStyle(themeId, true);
+ tmpTheme.resolveAttribute(R.attr.colorPrimary, tv, false);
+ themePrimaryColor.put(themeId, tv.data);
+ }
+ }
- long a_bits = Math.round(255 * alpha);
- return (a_bits << 24) | rgb;
+ // trigger theme observers
+ themeWatch.postValue(themeWatch.getValue() + 1);
}
public static @ColorInt
- int hsvColor(float hue, float saturation, float value) {
- return 0xff000000 | hsvTriplet(hue, saturation, value);
+ int getPrimaryColorForHue(int hueDegrees) {
+ if (hueDegrees == DEFAULT_HUE_DEG)
+ return Objects.requireNonNull(themePrimaryColor.get(R.style.AppTheme_default));
+ int mod = hueDegrees % HueRing.hueStepDegrees;
+ if (mod == 0) {
+ int themeId = getThemeIdForHue(hueDegrees);
+ Integer result = Objects.requireNonNull(themePrimaryColor.get(themeId));
+ debug("colors",
+ String.format(Locale.US, "getPrimaryColorForHue(%d) = %x", hueDegrees, result));
+ return result;
+ }
+ else {
+ int x0 = hueDegrees - mod;
+ int x1 = (x0 + HueRing.hueStepDegrees) % 360;
+ float y0 = Objects.requireNonNull(themePrimaryColor.get(getThemeIdForHue(x0)));
+ float y1 = Objects.requireNonNull(themePrimaryColor.get(getThemeIdForHue(x1)));
+ return Math.round(y0 + hueDegrees * (y1 - y0) / (x1 - x0));
+ }
}
- public static @ColorInt
- int hsvTriplet(float hue, float saturation, float value) {
- @ColorLong long result;
- int r, g, b;
-
- if ((hue < 0) || (hue > 1) || (saturation < 0) || (saturation > 1) || (value < 0) ||
- (value > 1)) throw new IllegalArgumentException(
- "hue, saturation, value and alpha must all be between 0 and 1");
-
- int h = (int) (hue * 6);
- float f = hue * 6 - h;
- float p = value * (1 - saturation);
- float q = value * (1 - f * saturation);
- float t = value * (1 - (1 - f) * saturation);
-
- switch (h) {
- case 0:
- case 6:
- return tupleToColor(value, t, p);
- case 1:
- return tupleToColor(q, value, p);
- case 2:
- return tupleToColor(p, value, t);
- case 3:
- return tupleToColor(p, q, value);
- case 4:
- return tupleToColor(t, p, value);
- case 5:
- return tupleToColor(value, p, q);
- default:
- throw new RuntimeException(String.format("Unexpected value for h (%d) while " +
- "converting hsv(%1.2f, %1.2f, %1.2f) to " +
- "rgb", h, hue, saturation, value));
+ public static int getThemeIdForHue(int themeHue) {
+ int themeIndex = -1;
+ if (themeHue == 360)
+ themeHue = 0;
+ if ((themeHue >= 0) && (themeHue < 360) && (themeHue != DEFAULT_HUE_DEG)) {
+ if ((themeHue % HueRing.hueStepDegrees) != 0) {
+ Logger.warn("profiles",
+ String.format(Locale.US, "Adjusting unexpected hue %d", themeHue));
+ themeIndex = Math.round(1f * themeHue / HueRing.hueStepDegrees);
+ }
+ else
+ themeIndex = themeHue / HueRing.hueStepDegrees;
}
+
+ return themeIDs[themeIndex + 1]; // 0 is the default theme
}
+ public static void setupTheme(Activity activity, int themeHue) {
+ int themeId = getThemeIdForHue(themeHue);
+ activity.setTheme(themeId);
- public static @ColorInt
- int tupleToColor(float r, float g, float b) {
- int r_int = Math.round(255 * r);
- int g_int = Math.round(255 * g);
- int b_int = Math.round(255 * b);
- return (r_int << 16) | (g_int << 8) | b_int;
+ refreshColors(activity.getTheme());
}
- public static @ColorInt
- int getPrimaryColorForHue(int degrees) {
- return getPrimaryColorForHue(degrees / 360f);
+ public static @NonNull
+ ColorStateList getColorStateList() {
+ return getColorStateList(profileThemeId);
}
- public static @ColorInt
- int getPrimaryColorForHue(float hue) {
- int result = hsvColor(hue, 0.61f, 0.95f);
- Log.d("colors", String.format("getPrimaryColorForHue(%1.2f) = %x", hue, result));
- return result;
+ public static @NonNull
+ ColorStateList getColorStateList(int hue) {
+ return new ColorStateList(EMPTY_STATES, getSwipeCircleColors(hue));
+ }
+ public static int[] getSwipeCircleColors() {
+ return getSwipeCircleColors(profileThemeId);
+ }
+ 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;
}
- public static void setupTheme(Activity activity) {
- MobileLedgerProfile profile = Data.profile.get();
- if (profile != null) {
- switch (Data.profile.get().getThemeId()) {
- case 0:
- activity.setTheme(R.style.AppTheme_NoActionBar_0);
- break;
- case 15:
- activity.setTheme(R.style.AppTheme_NoActionBar_15);
- break;
- case 30:
- activity.setTheme(R.style.AppTheme_NoActionBar_30);
- break;
- case 45:
- activity.setTheme(R.style.AppTheme_NoActionBar_45);
- break;
- case 60:
- activity.setTheme(R.style.AppTheme_NoActionBar_60);
- break;
- case 75:
- activity.setTheme(R.style.AppTheme_NoActionBar_75);
- break;
- case 90:
- activity.setTheme(R.style.AppTheme_NoActionBar_90);
- break;
- case 105:
- activity.setTheme(R.style.AppTheme_NoActionBar_105);
- break;
- case 120:
- activity.setTheme(R.style.AppTheme_NoActionBar_120);
- break;
- case 135:
- activity.setTheme(R.style.AppTheme_NoActionBar_135);
- break;
- case 150:
- activity.setTheme(R.style.AppTheme_NoActionBar_150);
- break;
- case 165:
- activity.setTheme(R.style.AppTheme_NoActionBar_165);
- break;
- case 180:
- activity.setTheme(R.style.AppTheme_NoActionBar_180);
- break;
- case 195:
- activity.setTheme(R.style.AppTheme_NoActionBar_195);
- break;
- case 210:
- activity.setTheme(R.style.AppTheme_NoActionBar_210);
- break;
- case 225:
- activity.setTheme(R.style.AppTheme_NoActionBar_225);
- break;
- case 240:
- activity.setTheme(R.style.AppTheme_NoActionBar_240);
- break;
- case 255:
- activity.setTheme(R.style.AppTheme_NoActionBar_255);
- break;
- case 270:
- activity.setTheme(R.style.AppTheme_NoActionBar_270);
- break;
- case 285:
- activity.setTheme(R.style.AppTheme_NoActionBar_285);
- break;
- case 300:
- activity.setTheme(R.style.AppTheme_NoActionBar_300);
- break;
- case 315:
- activity.setTheme(R.style.AppTheme_NoActionBar_315);
- break;
- case 330:
- activity.setTheme(R.style.AppTheme_NoActionBar_330);
- break;
- case 345:
- activity.setTheme(R.style.AppTheme_NoActionBar_345);
- break;
- default:
- activity.setTheme(R.style.AppTheme_NoActionBar);
+ public static int getNewProfileThemeHue(ArrayList profiles) {
+ if ((profiles == null) || (profiles.size() == 0))
+ return DEFAULT_HUE_DEG;
+
+ int chosenHue;
+
+ if (profiles.size() == 1) {
+ int opposite = profiles.get(0)
+ .getThemeHue() + 180;
+ opposite %= 360;
+ chosenHue = opposite;
+ }
+ else {
+ ArrayList hues = new ArrayList<>();
+ for (MobileLedgerProfile p : profiles) {
+ int hue = p.getThemeHue();
+ if (hue == -1)
+ hue = DEFAULT_HUE_DEG;
+ hues.add(hue);
+ }
+ Collections.sort(hues);
+ if (BuildConfig.DEBUG) {
+ StringBuilder huesSB = new StringBuilder();
+ for (int h : hues) {
+ if (huesSB.length() > 0)
+ huesSB.append(", ");
+ huesSB.append(h);
+ }
+ debug("profiles", String.format("used hues: %s", huesSB.toString()));
}
+ hues.add(hues.get(0));
+
+ int lastHue = -1;
+ int largestInterval = 0;
+ ArrayList largestIntervalStarts = new ArrayList<>();
+
+ for (int h : hues) {
+ if (lastHue == -1) {
+ lastHue = h;
+ continue;
+ }
+
+ int interval;
+ if (h > lastHue)
+ interval = h - lastHue; // 10 -> 20 is a step of 10
+ else
+ interval = h + (360 - lastHue); // 350 -> 20 is a step of 30
+
+ if (interval > largestInterval) {
+ largestInterval = interval;
+ largestIntervalStarts.clear();
+ largestIntervalStarts.add(lastHue);
+ }
+ else if (interval == largestInterval) {
+ largestIntervalStarts.add(lastHue);
+ }
+
+ lastHue = h;
+ }
+
+ final int chosenIndex = (int) (Math.random() * largestIntervalStarts.size());
+ int chosenIntervalStart = largestIntervalStarts.get(chosenIndex);
+
+ debug("profiles",
+ String.format(Locale.US, "Choosing the middle colour between %d and %d",
+ chosenIntervalStart, chosenIntervalStart + largestInterval));
+
+ if (largestInterval % 2 != 0)
+ largestInterval++; // round up the middle point
+
+ chosenHue = (chosenIntervalStart + (largestInterval / 2)) % 360;
}
- else activity.setTheme(R.style.AppTheme_NoActionBar);
- refreshColors(activity.getTheme());
- }
+ final int mod = chosenHue % HueRing.hueStepDegrees;
+ if (mod != 0) {
+ if (mod > HueRing.hueStepDegrees / 2)
+ chosenHue += (HueRing.hueStepDegrees - mod); // 13 += (5-3) = 15
+ else
+ chosenHue -= mod; // 12 -= 2 = 10
+ }
+ debug("profiles", String.format(Locale.US, "New profile hue: %d", chosenHue));
+
+ return chosenHue;
+ }
}