X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Futils%2FColors.java;h=fc2951f648e18f17e02eedc076a1fadcc7e03dc6;hp=767765b06234cb59e5be0f4599c25f2adf13e817;hb=ea270d6c84f46211d8051d3661a5e8e372c188bf;hpb=236c432fc5b353b306ed4e97d587c844e37bfc79
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 767765b0..fc2951f6 100644
--- a/app/src/main/java/net/ktnx/mobileledger/utils/Colors.java
+++ b/app/src/main/java/net/ktnx/mobileledger/utils/Colors.java
@@ -1,21 +1,43 @@
+/*
+ * Copyright © 2019 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.Resources;
-import android.util.Log;
import android.util.TypedValue;
import net.ktnx.mobileledger.R;
import net.ktnx.mobileledger.model.Data;
import net.ktnx.mobileledger.model.MobileLedgerProfile;
+import java.util.Locale;
+
import androidx.annotation.ColorInt;
import androidx.annotation.ColorLong;
+import androidx.lifecycle.MutableLiveData;
import static java.lang.Math.abs;
+import static net.ktnx.mobileledger.utils.Logger.debug;
public class Colors {
public static final int DEFAULT_HUE_DEG = 261;
+ private static final float blueLightness = 0.665f;
+ private static final float yellowLightness = 0.350f;
public static @ColorInt
int accent;
@ColorInt
@@ -25,8 +47,7 @@ public class Colors {
@ColorInt
public static int primary, defaultTextColor;
public static int profileThemeId = -1;
-
- public static ObservableValue themeWatch = new ObservableValue<>(0);
+ public static MutableLiveData themeWatch = new MutableLiveData<>(0);
public static void refreshColors(Resources.Theme theme) {
TypedValue tv = new TypedValue();
theme.resolveAttribute(R.attr.table_row_dark_bg, tv, true);
@@ -41,7 +62,7 @@ public class Colors {
accent = tv.data;
// trigger theme observers
- themeWatch.notifyObservers();
+ themeWatch.postValue(themeWatch.getValue()+1);
}
public static @ColorLong
long hsvaColor(float hue, float saturation, float value, float alpha) {
@@ -58,8 +79,8 @@ public class Colors {
return 0xff000000 | hsvTriplet(hue, saturation, value);
}
public static @ColorInt
- int hslColor(float hue, float saturation, float lightness) {
- return 0xff000000 | hslTriplet(hue, saturation, lightness);
+ int hslColor(float hueRatio, float saturation, float lightness) {
+ return 0xff000000 | hslTriplet(hueRatio, saturation, lightness);
}
public static @ColorInt
int hsvTriplet(float hue, float saturation, float value) {
@@ -98,9 +119,9 @@ public class Colors {
}
}
public static @ColorInt
- int hslTriplet(float hue, float saturation, float lightness) {
+ int hslTriplet(float hueRatio, float saturation, float lightness) {
@ColorLong long result;
- float h = hue * 6;
+ float h = hueRatio * 6;
float c = (1 - abs(2f * lightness - 1)) * saturation;
float h_mod_2 = h % 2;
float x = c * (1 - Math.abs(h_mod_2 - 1));
@@ -116,7 +137,7 @@ public class Colors {
throw new IllegalArgumentException(String.format(
"Unexpected value for h (%1.3f) while converting hsl(%1.3f, %1.3f, %1.3f) to rgb",
- h, hue, saturation, lightness));
+ h, hueRatio, saturation, lightness));
}
public static @ColorInt
@@ -127,99 +148,105 @@ public class Colors {
return (r_int << 16) | (g_int << 8) | b_int;
}
public static @ColorInt
- int getPrimaryColorForHue(int degrees) {
- // 0/360f becomes -0.000something for some reason
- if (degrees == 0) return getPrimaryColorForHue(0f);
- return getPrimaryColorForHue(degrees / 360f);
- }
- public static @ColorInt
- int getPrimaryColorForHue(float hue) {
-// int result = hsvColor(hue, 0.61f, 0.95f);
- int result = hslColor(hue, 0.60f, 0.60f);
- Log.d("colors", String.format("getPrimaryColorForHue(%1.2f) = %x", hue, result));
+ int getPrimaryColorForHue(int hueDegrees) {
+// int result = hsvColor(hueDegrees, 0.61f, 0.95f);
+ float y = hueDegrees - 60;
+ if (y < 0) y += 360;
+ float l = yellowLightness + (blueLightness - yellowLightness) *
+ (float) Math.cos(Math.toRadians(Math.abs(180 - y) / 2f));
+ int result = hslColor(hueDegrees/360f, 0.845f, l);
+ debug("colors", String.format(Locale.ENGLISH, "getPrimaryColorForHue(%d) = %x", hueDegrees,
+ result));
return result;
}
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);
- }
+ setupTheme(activity, profile);
+ }
+ public static void setupTheme(Activity activity, MobileLedgerProfile profile) {
+ final int themeId = (profile == null) ? -1 : profile.getThemeId();
+ setupTheme(activity, themeId);
+ }
+ public static void setupTheme(Activity activity, int themeId) {
+ switch (themeId) {
+ case 0:
+ case 360:
+ 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);
+ debug("profiles", String.format(Locale.ENGLISH,
+ "Theme hue %d not supported, using the default", themeId));
}
- else activity.setTheme(R.style.AppTheme_NoActionBar);
refreshColors(activity.getTheme());
}