From 3bfcb14079516fa54f35ec94f7e775e59b174330 Mon Sep 17 00:00:00 2001
From: ajp_anton <ajp_anton@git.ajpanton.se>
Date: Mon, 22 Jun 2026 00:22:12 +0000
Subject: [PATCH] Preview default threshold battery colours

---
 .../shell/ui/BatteryBarFragment.java          | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/se/ajpanton/statusbartweak/shell/ui/BatteryBarFragment.java b/app/src/main/java/se/ajpanton/statusbartweak/shell/ui/BatteryBarFragment.java
index fe946fe..be64d06 100644
--- a/app/src/main/java/se/ajpanton/statusbartweak/shell/ui/BatteryBarFragment.java
+++ b/app/src/main/java/se/ajpanton/statusbartweak/shell/ui/BatteryBarFragment.java
@@ -278,6 +278,14 @@ public final class BatteryBarFragment extends Fragment {
                                          int labelRes,
                                          String colour,
                                          int emptyLabelRes) {
+        updateColourButtonLabel(button, labelRes, colour, emptyLabelRes, "");
+    }
+
+    private void updateColourButtonLabel(MaterialButton button,
+                                         int labelRes,
+                                         String colour,
+                                         int emptyLabelRes,
+                                         String defaultPreviewColour) {
         if (button == null) {
             return;
         }
@@ -287,6 +295,11 @@ public final class BatteryBarFragment extends Fragment {
         boolean hasBackground = false;
         if (BatteryBarStyle.isThresholdChargeDefault(colour)) {
             value = getString(R.string.battery_bar_colour_same_as_default);
+            String defaultPreview = BatteryBarStyle.normalizeColor(defaultPreviewColour);
+            if (!defaultPreview.isEmpty()) {
+                backgroundColor = resolvePreviewColour(defaultPreview);
+                hasBackground = true;
+            }
         } else if (normalised.isEmpty()) {
             value = getString(emptyLabelRes);
         } else {
@@ -962,11 +975,19 @@ public final class BatteryBarFragment extends Fragment {
             row.addView(dischargeButton);
 
             MaterialButton chargeButton = createRowButton(context);
+            String defaultChargeColour = prefs.getString(
+                    SbtSettings.KEY_BATTERY_BAR_DEFAULT_CHARGE_COLOR,
+                    SbtDefaults.BATTERY_BAR_DEFAULT_CHARGE_COLOR_DEFAULT);
+            String thresholdDefaultPreview = BatteryBarStyle.normalizeColor(defaultChargeColour);
+            if (thresholdDefaultPreview.isEmpty()) {
+                thresholdDefaultPreview = threshold.dischargeColor;
+            }
             updateColourButtonLabel(
                     chargeButton,
                     R.string.battery_bar_threshold_charge_colour,
                     threshold.chargeColor,
-                    R.string.battery_bar_colour_same_as_default);
+                    R.string.battery_bar_colour_same_as_default,
+                    thresholdDefaultPreview);
             chargeButton.setOnClickListener(v -> showThresholdColourDialog(
                     threshold,
                     false,