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=73ad899b97ff4ffa069bfb51c782097a7552642a;hp=400b073301bb02c3976053c3b4449b51260c5b35;hb=be8de3627af4c905e3db9671883eee9eaf38275e;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..73ad899b 100644
--- a/app/src/main/java/net/ktnx/mobileledger/utils/Colors.java
+++ b/app/src/main/java/net/ktnx/mobileledger/utils/Colors.java
@@ -35,7 +35,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 +115,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,8 +141,12 @@ 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:
                     activity.setTheme(R.style.AppTheme_NoActionBar_0);
                     break;
@@ -217,9 +221,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());
     }