From 9ed40978c3bfc656160595b9663dc9fcc00d368e Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 4 Mar 2026 04:56:28 +0000
Subject: [PATCH] Remove BatteryBox style and reuse ClockBox style for battery
 display

- Remove BaseBatteryBox and BatteryBox style definitions from Base.xaml
- Remove BatteryBox style overrides from all theme files
- Update BatteryBox TextBlock in MainWindow.xaml to use ClockBox style
- Update BatteryBox TextBlock in SettingsPaneTheme.xaml to use ClockBox style

Co-authored-by: Jack251970 <53996452+Jack251970@users.noreply.github.com>
---
 Flow.Launcher/MainWindow.xaml                 |  2 +-
 .../SettingPages/Views/SettingsPaneTheme.xaml |  2 +-
 Flow.Launcher/Themes/Base.xaml                | 20 -------------------
 Flow.Launcher/Themes/BlurBlack Darker.xaml    |  7 -------
 Flow.Launcher/Themes/BlurWhite.xaml           |  7 -------
 Flow.Launcher/Themes/Circle System.xaml       |  6 ------
 Flow.Launcher/Themes/Cyan Dark.xaml           |  6 ------
 Flow.Launcher/Themes/Darker Glass.xaml        |  6 ------
 Flow.Launcher/Themes/Discord Dark.xaml        |  6 ------
 Flow.Launcher/Themes/Dracula.xaml             |  6 ------
 Flow.Launcher/Themes/Gray.xaml                |  6 ------
 Flow.Launcher/Themes/League.xaml              |  6 ------
 Flow.Launcher/Themes/Midnight.xaml            |  6 ------
 Flow.Launcher/Themes/Nord Darker.xaml         |  6 ------
 Flow.Launcher/Themes/Pink.xaml                |  7 -------
 Flow.Launcher/Themes/SlimLight.xaml           | 13 ------------
 Flow.Launcher/Themes/Sublime.xaml             |  6 ------
 Flow.Launcher/Themes/Ubuntu.xaml              |  6 ------
 Flow.Launcher/Themes/Win10System.xaml         |  6 ------
 Flow.Launcher/Themes/Win11Light.xaml          |  6 ------
 20 files changed, 2 insertions(+), 134 deletions(-)

diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml
index 745e8f1ff..829a614d8 100644
--- a/Flow.Launcher/MainWindow.xaml
+++ b/Flow.Launcher/MainWindow.xaml
@@ -313,7 +313,7 @@
                         Visibility="{Binding Settings.UseDate, Converter={StaticResource BoolToVisibilityConverter}}" />
                     <TextBlock
                         x:Name="BatteryBox"
-                        Style="{DynamicResource BatteryBox}"
+                        Style="{DynamicResource ClockBox}"
                         Text="{Binding BatteryText}"
                         Visibility="{Binding Settings.UseBattery, Converter={StaticResource BoolToVisibilityConverter}}" />
                 </StackPanel>
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
index 8eac1abe1..5bcc5f66a 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
@@ -351,7 +351,7 @@
                                             <TextBlock
                                                 x:Name="BatteryBox"
                                                 FontFamily="{Binding ClockPanelFont, Mode=OneTime}"
-                                                Style="{DynamicResource BatteryBox}"
+                                                Style="{DynamicResource ClockBox}"
                                                 Text="{Binding BatteryText}"
                                                 Visibility="{Binding UseBattery, Converter={StaticResource BoolToVisibilityConverter}}" />
                                         </StackPanel>
diff --git a/Flow.Launcher/Themes/Base.xaml b/Flow.Launcher/Themes/Base.xaml
index 44cc39e18..8cb05d260 100644
--- a/Flow.Launcher/Themes/Base.xaml
+++ b/Flow.Launcher/Themes/Base.xaml
@@ -152,20 +152,6 @@
             </DataTrigger>
         </Style.Triggers>
     </Style>
-    <Style x:Key="BaseBatteryBox" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="18" />
-        <Setter Property="Foreground" Value="#8f8f8f" />
-        <Setter Property="HorizontalAlignment" Value="Right" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="Margin" Value="0 0 0 0" />
-        <Style.Triggers>
-            <DataTrigger Binding="{Binding ElementName=ClockBox, Path=Visibility}" Value="Visible">
-                <Setter Property="FontSize" Value="14" />
-                <Setter Property="Margin" Value="0 0 0 3" />
-            </DataTrigger>
-        </Style.Triggers>
-    </Style>
-
     <Style
         x:Key="ClockBox"
         BasedOn="{StaticResource BaseClockBox}"
@@ -178,12 +164,6 @@
         TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="#C6C6C6" />
     </Style>
-    <Style
-        x:Key="BatteryBox"
-        BasedOn="{StaticResource BaseBatteryBox}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#C6C6C6" />
-    </Style>
     <Style
         x:Key="ClockPanel"
         BasedOn="{StaticResource BaseClockPanel}"
diff --git a/Flow.Launcher/Themes/BlurBlack Darker.xaml b/Flow.Launcher/Themes/BlurBlack Darker.xaml
index ebf3489e7..b68641984 100644
--- a/Flow.Launcher/Themes/BlurBlack Darker.xaml	
+++ b/Flow.Launcher/Themes/BlurBlack Darker.xaml	
@@ -174,13 +174,6 @@
         <Setter Property="Foreground" Value="#ffffff" />
         <Setter Property="Opacity" Value="0.2" />
     </Style>
-    <Style
-        x:Key="BatteryBox"
-        BasedOn="{StaticResource BaseBatteryBox}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#ffffff" />
-        <Setter Property="Opacity" Value="0.2" />
-    </Style>
     <Style
         x:Key="PreviewBorderStyle"
         BasedOn="{StaticResource BasePreviewBorderStyle}"
diff --git a/Flow.Launcher/Themes/BlurWhite.xaml b/Flow.Launcher/Themes/BlurWhite.xaml
index 44539f913..43cd8f4b5 100644
--- a/Flow.Launcher/Themes/BlurWhite.xaml
+++ b/Flow.Launcher/Themes/BlurWhite.xaml
@@ -178,13 +178,6 @@
         <Setter Property="Foreground" Value="#000000" />
         <Setter Property="Opacity" Value="0.2" />
     </Style>
-    <Style
-        x:Key="BatteryBox"
-        BasedOn="{StaticResource BaseBatteryBox}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#000000" />
-        <Setter Property="Opacity" Value="0.2" />
-    </Style>
     <Style
         x:Key="PreviewBorderStyle"
         BasedOn="{StaticResource BasePreviewBorderStyle}"
diff --git a/Flow.Launcher/Themes/Circle System.xaml b/Flow.Launcher/Themes/Circle System.xaml
index 1c85c8842..dd18ca954 100644
--- a/Flow.Launcher/Themes/Circle System.xaml	
+++ b/Flow.Launcher/Themes/Circle System.xaml	
@@ -173,12 +173,6 @@
         TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="#999aa3" />
     </Style>
-    <Style
-        x:Key="BatteryBox"
-        BasedOn="{StaticResource BaseBatteryBox}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#999aa3" />
-    </Style>
     <Style
         x:Key="PreviewBorderStyle"
         BasedOn="{StaticResource BasePreviewBorderStyle}"
diff --git a/Flow.Launcher/Themes/Cyan Dark.xaml b/Flow.Launcher/Themes/Cyan Dark.xaml
index 5bd01b292..645236534 100644
--- a/Flow.Launcher/Themes/Cyan Dark.xaml	
+++ b/Flow.Launcher/Themes/Cyan Dark.xaml	
@@ -183,12 +183,6 @@
         TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="#57c0b2" />
     </Style>
-    <Style
-        x:Key="BatteryBox"
-        BasedOn="{StaticResource BaseBatteryBox}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#57c0b2" />
-    </Style>
     <Style
         x:Key="PreviewBorderStyle"
         BasedOn="{StaticResource BasePreviewBorderStyle}"
diff --git a/Flow.Launcher/Themes/Darker Glass.xaml b/Flow.Launcher/Themes/Darker Glass.xaml
index 50084a962..9ffaaf566 100644
--- a/Flow.Launcher/Themes/Darker Glass.xaml	
+++ b/Flow.Launcher/Themes/Darker Glass.xaml	
@@ -168,12 +168,6 @@
         TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="#6f737a" />
     </Style>
-    <Style
-        x:Key="BatteryBox"
-        BasedOn="{StaticResource BaseBatteryBox}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#6f737a" />
-    </Style>
     <Style
         x:Key="PreviewBorderStyle"
         BasedOn="{StaticResource BasePreviewBorderStyle}"
diff --git a/Flow.Launcher/Themes/Discord Dark.xaml b/Flow.Launcher/Themes/Discord Dark.xaml
index f7aa9c7ba..c1336309b 100644
--- a/Flow.Launcher/Themes/Discord Dark.xaml	
+++ b/Flow.Launcher/Themes/Discord Dark.xaml	
@@ -166,12 +166,6 @@
         TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="#72767d" />
     </Style>
-    <Style
-        x:Key="BatteryBox"
-        BasedOn="{StaticResource BaseBatteryBox}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#72767d" />
-    </Style>
     <Style
         x:Key="PreviewBorderStyle"
         BasedOn="{StaticResource BasePreviewBorderStyle}"
diff --git a/Flow.Launcher/Themes/Dracula.xaml b/Flow.Launcher/Themes/Dracula.xaml
index 3d3d4a559..717d0aaeb 100644
--- a/Flow.Launcher/Themes/Dracula.xaml
+++ b/Flow.Launcher/Themes/Dracula.xaml
@@ -166,12 +166,6 @@
         TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="#6272a4" />
     </Style>
-    <Style
-        x:Key="BatteryBox"
-        BasedOn="{StaticResource BaseBatteryBox}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#6272a4" />
-    </Style>
     <Style
         x:Key="PreviewBorderStyle"
         BasedOn="{StaticResource BasePreviewBorderStyle}"
diff --git a/Flow.Launcher/Themes/Gray.xaml b/Flow.Launcher/Themes/Gray.xaml
index aafac06b6..5a928fa72 100644
--- a/Flow.Launcher/Themes/Gray.xaml
+++ b/Flow.Launcher/Themes/Gray.xaml
@@ -163,12 +163,6 @@
         TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="#b7babe" />
     </Style>
-    <Style
-        x:Key="BatteryBox"
-        BasedOn="{StaticResource BaseBatteryBox}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#b7babe" />
-    </Style>
     <Style
         x:Key="PreviewBorderStyle"
         BasedOn="{StaticResource BasePreviewBorderStyle}"
diff --git a/Flow.Launcher/Themes/League.xaml b/Flow.Launcher/Themes/League.xaml
index f8fe73f3d..89c6691f8 100644
--- a/Flow.Launcher/Themes/League.xaml
+++ b/Flow.Launcher/Themes/League.xaml
@@ -140,12 +140,6 @@
         TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="#4bb44b" />
     </Style>
-    <Style
-        x:Key="BatteryBox"
-        BasedOn="{StaticResource BaseBatteryBox}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#4bb44b" />
-    </Style>
     <Style
         x:Key="PreviewBorderStyle"
         BasedOn="{StaticResource BasePreviewBorderStyle}"
diff --git a/Flow.Launcher/Themes/Midnight.xaml b/Flow.Launcher/Themes/Midnight.xaml
index a01f6c663..134b006d9 100644
--- a/Flow.Launcher/Themes/Midnight.xaml
+++ b/Flow.Launcher/Themes/Midnight.xaml
@@ -163,12 +163,6 @@
         TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="#5f6673" />
     </Style>
-    <Style
-        x:Key="BatteryBox"
-        BasedOn="{StaticResource BaseBatteryBox}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#5f6673" />
-    </Style>
     <Style
         x:Key="PreviewBorderStyle"
         BasedOn="{StaticResource BasePreviewBorderStyle}"
diff --git a/Flow.Launcher/Themes/Nord Darker.xaml b/Flow.Launcher/Themes/Nord Darker.xaml
index 3c704bb97..7bbc737d1 100644
--- a/Flow.Launcher/Themes/Nord Darker.xaml	
+++ b/Flow.Launcher/Themes/Nord Darker.xaml	
@@ -140,12 +140,6 @@
         TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="#6F7C95" />
     </Style>
-    <Style
-        x:Key="BatteryBox"
-        BasedOn="{StaticResource BaseBatteryBox}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#6F7C95" />
-    </Style>
     <Style
         x:Key="PreviewBorderStyle"
         BasedOn="{StaticResource BasePreviewBorderStyle}"
diff --git a/Flow.Launcher/Themes/Pink.xaml b/Flow.Launcher/Themes/Pink.xaml
index a78735482..619e10bd2 100644
--- a/Flow.Launcher/Themes/Pink.xaml
+++ b/Flow.Launcher/Themes/Pink.xaml
@@ -137,13 +137,6 @@
         <Setter Property="FontWeight" Value="Bold" />
         <Setter Property="Foreground" Value="#71114b" />
     </Style>
-    <Style
-        x:Key="BatteryBox"
-        BasedOn="{StaticResource BaseBatteryBox}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="FontWeight" Value="Bold" />
-        <Setter Property="Foreground" Value="#71114b" />
-    </Style>
     <Style
         x:Key="PreviewBorderStyle"
         BasedOn="{StaticResource BasePreviewBorderStyle}"
diff --git a/Flow.Launcher/Themes/SlimLight.xaml b/Flow.Launcher/Themes/SlimLight.xaml
index ad070334e..ab7632f12 100644
--- a/Flow.Launcher/Themes/SlimLight.xaml
+++ b/Flow.Launcher/Themes/SlimLight.xaml
@@ -222,19 +222,6 @@
             </DataTrigger>
         </Style.Triggers>
     </Style>
-    <Style
-        x:Key="BatteryBox"
-        BasedOn="{StaticResource BaseBatteryBox}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="14" />
-        <Setter Property="Foreground" Value="#bebebe" />
-        <Style.Triggers>
-            <DataTrigger Binding="{Binding ElementName=ClockBox, Path=Visibility}" Value="Visible">
-                <Setter Property="FontSize" Value="14" />
-                <Setter Property="Margin" Value="0 0 0 3" />
-            </DataTrigger>
-        </Style.Triggers>
-    </Style>
     <Style
         x:Key="PreviewBorderStyle"
         BasedOn="{StaticResource BasePreviewBorderStyle}"
diff --git a/Flow.Launcher/Themes/Sublime.xaml b/Flow.Launcher/Themes/Sublime.xaml
index 6870de22b..02fcb3a05 100644
--- a/Flow.Launcher/Themes/Sublime.xaml
+++ b/Flow.Launcher/Themes/Sublime.xaml
@@ -163,12 +163,6 @@
         TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="#5bafb0" />
     </Style>
-    <Style
-        x:Key="BatteryBox"
-        BasedOn="{StaticResource BaseBatteryBox}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#5bafb0" />
-    </Style>
     <Style
         x:Key="PreviewBorderStyle"
         BasedOn="{StaticResource BasePreviewBorderStyle}"
diff --git a/Flow.Launcher/Themes/Ubuntu.xaml b/Flow.Launcher/Themes/Ubuntu.xaml
index 73e6edfdf..330d57b29 100644
--- a/Flow.Launcher/Themes/Ubuntu.xaml
+++ b/Flow.Launcher/Themes/Ubuntu.xaml
@@ -180,12 +180,6 @@
         TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="#c2c2c2" />
     </Style>
-    <Style
-        x:Key="BatteryBox"
-        BasedOn="{StaticResource BaseBatteryBox}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#c2c2c2" />
-    </Style>
     <Style
         x:Key="PreviewBorderStyle"
         BasedOn="{StaticResource BasePreviewBorderStyle}"
diff --git a/Flow.Launcher/Themes/Win10System.xaml b/Flow.Launcher/Themes/Win10System.xaml
index c5dae13c9..3b066e15a 100644
--- a/Flow.Launcher/Themes/Win10System.xaml
+++ b/Flow.Launcher/Themes/Win10System.xaml
@@ -190,12 +190,6 @@
         TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="{DynamicResource SystemControlBackgroundBaseLowBrush}" />
     </Style>
-    <Style
-        x:Key="BatteryBox"
-        BasedOn="{StaticResource BaseBatteryBox}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="{DynamicResource SystemControlBackgroundBaseLowBrush}" />
-    </Style>
     <Style
         x:Key="PreviewBorderStyle"
         BasedOn="{StaticResource BasePreviewBorderStyle}"
diff --git a/Flow.Launcher/Themes/Win11Light.xaml b/Flow.Launcher/Themes/Win11Light.xaml
index b5991f61d..1dd53916b 100644
--- a/Flow.Launcher/Themes/Win11Light.xaml
+++ b/Flow.Launcher/Themes/Win11Light.xaml
@@ -215,12 +215,6 @@
         TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="{DynamicResource ClockDateForeground}" />
     </Style>
-    <Style
-        x:Key="BatteryBox"
-        BasedOn="{StaticResource BaseBatteryBox}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="{DynamicResource ClockDateForeground}" />
-    </Style>
     <Style
         x:Key="PreviewBorderStyle"
         BasedOn="{StaticResource BasePreviewBorderStyle}"