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;fp=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Futils%2FColors.java;h=348a5598a324073ea2415f353cd32a1019b72542;hp=7cf710ac0067b3b90319190c4f5524679beb38b6;hb=b52e18a21ea6f200b9969878eb765717eb90eab8;hpb=20b1574421ee368ca690d1e4de0f666ebfec6520 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 7cf710ac..348a5598 100644 --- a/app/src/main/java/net/ktnx/mobileledger/utils/Colors.java +++ b/app/src/main/java/net/ktnx/mobileledger/utils/Colors.java @@ -1,5 +1,5 @@ /* - * Copyright © 2021 Damyan Ivanov. + * Copyright © 2024 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 @@ -17,6 +17,8 @@ package net.ktnx.mobileledger.utils; +import static net.ktnx.mobileledger.utils.Logger.debug; + import android.app.Activity; import android.content.res.ColorStateList; import android.content.res.Resources; @@ -38,8 +40,6 @@ import java.util.List; import java.util.Locale; import java.util.Objects; -import static net.ktnx.mobileledger.utils.Logger.debug; - public class Colors { public static final int DEFAULT_HUE_DEG = 261; public static final MutableLiveData themeWatch = new MutableLiveData<>(0); @@ -76,7 +76,7 @@ public class Colors { TypedValue tv = new TypedValue(); theme.resolveAttribute(R.attr.table_row_dark_bg, tv, true); tableRowDarkBG = tv.data; - theme.resolveAttribute(R.attr.colorPrimary, tv, true); + theme.resolveAttribute(androidx.appcompat.R.attr.colorPrimary, tv, true); primary = tv.data; if (themePrimaryColor.size() == 0) { @@ -84,7 +84,7 @@ public class Colors { Resources.Theme tmpTheme = theme.getResources() .newTheme(); tmpTheme.applyStyle(themeId, true); - tmpTheme.resolveAttribute(R.attr.colorPrimary, tv, false); + tmpTheme.resolveAttribute(androidx.appcompat.R.attr.colorPrimary, tv, false); themePrimaryColor.put(themeId, tv.data); } } @@ -180,7 +180,7 @@ public class Colors { huesSB.append(", "); huesSB.append(h); } - debug("profiles", String.format("used hues: %s", huesSB.toString())); + debug("profiles", String.format("used hues: %s", huesSB)); } hues.add(hues.get(0));