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=acfea2f4519e1baf076a82e2c475a08bf554f0ed;hp=400b073301bb02c3976053c3b4449b51260c5b35;hb=8fd287a2b36f1d28ee1c1ca67687abaab4e95f2f;hpb=b6e102a859413285879cecec286f1381db202314 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 400b0733..acfea2f4 100644 --- a/app/src/main/java/net/ktnx/mobileledger/utils/Colors.java +++ b/app/src/main/java/net/ktnx/mobileledger/utils/Colors.java @@ -1,3 +1,20 @@ +/* + * 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; @@ -35,7 +52,7 @@ public class Colors { tableRowLightBG = tv.data; theme.resolveAttribute(R.attr.colorPrimary, tv, true); primary = tv.data; - theme.resolveAttribute(android.R.color.tab_indicator_text, tv, true); + theme.resolveAttribute(R.attr.textColor, tv, true); defaultTextColor = tv.data; theme.resolveAttribute(R.attr.colorAccent, tv, true); accent = tv.data; @@ -115,8 +132,8 @@ public class Colors { if (h < 6) return tupleToColor(c + m, 0 + m, x + m); throw new IllegalArgumentException(String.format( - "Unexpected value for h (%d) while converting hsl(%1.2f, %1.2f, %1.2f) to rgb", h, - hue, saturation, lightness)); + "Unexpected value for h (%1.3f) while converting hsl(%1.3f, %1.3f, %1.3f) to rgb", + h, hue, saturation, lightness)); } public static @ColorInt @@ -141,85 +158,92 @@ public class 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); - } + 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); + Log.d("profiles", + String.format("Theme hue %d not supported, using the default", themeId)); } - else activity.setTheme(R.style.AppTheme_NoActionBar); refreshColors(activity.getTheme()); }