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=8e526c1fb6879f59fb565404639313d6b7e3d2b2;hp=400b073301bb02c3976053c3b4449b51260c5b35;hb=7af4595e73742f8a3f07af1daa8402d3c408200b;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..8e526c1f 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 <https://www.gnu.org/licenses/>.
+ */
+
 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,9 +158,14 @@ public class Colors {
     }
     public static void setupTheme(Activity activity) {
         MobileLedgerProfile profile = Data.profile.get();
+        setupTheme(activity, profile);
+    }
+    public static void setupTheme(Activity activity, MobileLedgerProfile profile) {
         if (profile != null) {
-            switch (Data.profile.get().getThemeId()) {
+            final int themeId = profile.getThemeId();
+            switch (themeId) {
                 case 0:
+                case 360:
                     activity.setTheme(R.style.AppTheme_NoActionBar_0);
                     break;
                 case 15:
@@ -217,9 +239,14 @@ 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));
             }
         }
-        else activity.setTheme(R.style.AppTheme_NoActionBar);
+        else {
+            Log.d("profiles", "No profile given, using default theme");
+            activity.setTheme(R.style.AppTheme_NoActionBar);
+        }
 
         refreshColors(activity.getTheme());
     }