X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Futils%2FColors.java;h=131efb9d1349db9d30bddc8196676839eb9fa2d8;hb=3f7d564f6aa9c6fba886979b8a520796f9b15fa4;hp=d13496fe813b8a3b158acffd7442ad6434c85a23;hpb=2d21e0f704ee35b3772a9b4810f85c122e6ad49c;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 d13496fe..131efb9d 100644 --- a/app/src/main/java/net/ktnx/mobileledger/utils/Colors.java +++ b/app/src/main/java/net/ktnx/mobileledger/utils/Colors.java @@ -47,13 +47,13 @@ public class Colors { 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 secondary; @ColorInt public static int tableRowDarkBG; public static int profileThemeId = -1; public static MutableLiveData themeWatch = new MutableLiveData<>(0); - 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, R.style.AppTheme_020, R.style.AppTheme_025, R.style.AppTheme_030, R.style.AppTheme_035, @@ -160,10 +160,10 @@ public class Colors { 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); }