multi-color progress indicators

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/MobileLedgerListFragment.java b/app/src/main/java/net/ktnx/mobileledger/ui/MobileLedgerListFragment.java
index 654bd4dbc49ea527fab66783bcb51b6dccbb4294..d53cc6f0a98684df0b65df71d31282e7a0b80f3b 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/ui/MobileLedgerListFragment.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/MobileLedgerListFragment.java
@@ -35,7 +35,7 @@ public class MobileLedgerListFragment extends Fragment {
     protected MainActivity mActivity;
     protected RecyclerView root;
     protected void themeChanged(Integer counter) {
-        swiper.setColorSchemeColors(Colors.primary);
+        swiper.setColorSchemeColors(Colors.getColors());
     }
     public void onBackgroundTaskRunningChanged(Boolean isRunning) {
         if (mActivity == null) return;

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java b/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java
index be2702fb8fa45c379bbf882fe7463b7ba8bf2ea8..afa9c71e2916c3df0e8c2ed163db4663f7a56053 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java
@@ -577,8 +577,9 @@ public class MainActivity extends ProfileThemedActivity {
     public void onRetrieveStart() {
         ProgressBar progressBar = findViewById(R.id.transaction_list_progress_bar);
         bTransactionListCancelDownload.setEnabled(true);
-        progressBar.setIndeterminateTintList(ColorStateList.valueOf(Colors.primary));
-        progressBar.setProgressTintList(ColorStateList.valueOf(Colors.primary));
+        ColorStateList csl = Colors.getColorStateList();
+        progressBar.setIndeterminateTintList(csl);
+        progressBar.setProgressTintList(csl);
         progressBar.setIndeterminate(true);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) progressBar.setProgress(0, false);
         else progressBar.setProgress(0);

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 fb4298b25d93772f3826f2065cbc73dd74b4ba21..f0db19ebdc4cf3b27fb65481dfaeadf6450d74d7 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/utils/Colors.java
+++ b/app/src/main/java/net/ktnx/mobileledger/utils/Colors.java
@@ -18,6 +18,7 @@
 package net.ktnx.mobileledger.utils;
 
 import android.app.Activity;
+import android.content.res.ColorStateList;
 import android.content.res.Resources;
 import android.util.TypedValue;
 
@@ -30,6 +31,7 @@ import java.util.Locale;
 
 import androidx.annotation.ColorInt;
 import androidx.annotation.ColorLong;
+import androidx.annotation.NonNull;
 import androidx.lifecycle.MutableLiveData;
 
 import static java.lang.Math.abs;
@@ -39,6 +41,7 @@ public class Colors {
     public static final int DEFAULT_HUE_DEG = 261;
     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]};
     public static @ColorInt
     int accent;
     @ColorInt
@@ -189,4 +192,22 @@ public class Colors {
         refreshColors(activity.getTheme());
     }
 
+    public static @NonNull
+    ColorStateList getColorStateList() {
+        return getColorStateList(profileThemeId);
+    }
+    public static @NonNull
+    ColorStateList getColorStateList(int hue) {
+        return new ColorStateList(EMPTY_STATES, getColors(hue));
+    }
+    public static int[] getColors() {
+        return getColors(profileThemeId);
+    }
+    public static int[] getColors(int hue) {
+        int[] colors = new int[]{0, 0, 0, 0, 0, 0};
+        for (int i = 0; i < 6; i++, hue = (hue + 60) % 360) {
+            colors[i] = getPrimaryColorForHue(hue);
+        }
+        return colors;
+    }
 }