X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Futils%2FColors.java;h=80bc9951778ffb22b5cc86188b33f9ef85969224;hb=294362e52db84e8db8a165c3f79f0367427ba9ff;hp=588a498298054c620895d8194e2c01eb91718757;hpb=d45a715886c1139da8e8bea91d374abbcffa7af2;p=mobile-ledger.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 588a4982..80bc9951 100644 --- a/app/src/main/java/net/ktnx/mobileledger/utils/Colors.java +++ b/app/src/main/java/net/ktnx/mobileledger/utils/Colors.java @@ -19,18 +19,20 @@ 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; @@ -60,7 +62,7 @@ public class Colors { accent = tv.data; // trigger theme observers - themeWatch.postValue(themeWatch.getValue()+1); + themeWatch.postValue(themeWatch.getValue() + 1); } public static @ColorLong long hsvaColor(float hue, float saturation, float value, float alpha) { @@ -152,12 +154,13 @@ public class Colors { 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); - Log.d("colors", String.format("getPrimaryColorForHue(%d) = %x", hueDegrees, result)); + 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(); + MobileLedgerProfile profile = Data.profile.getValue(); setupTheme(activity, profile); } public static void setupTheme(Activity activity, MobileLedgerProfile profile) { @@ -241,8 +244,8 @@ public class Colors { break; default: activity.setTheme(R.style.AppTheme_NoActionBar); - Log.d("profiles", - String.format("Theme hue %d not supported, using the default", themeId)); + debug("profiles", String.format(Locale.ENGLISH, + "Theme hue %d not supported, using the default", themeId)); } refreshColors(activity.getTheme());