From 2804d45e8685eb5f74d2499717c96c818f11e755 Mon Sep 17 00:00:00 2001
From: Matt Bruce <mbrucedogs@gmail.com>
Date: Mon, 8 Sep 2025 13:45:51 -0500
Subject: [PATCH] Signed-off-by: Matt Bruce <mbrucedogs@gmail.com>

---
 .../Clock/Components/BatteryOverlayView.swift | 96 +++++++++++++++----
 .../Clock/Components/TopOverlayView.swift     |  7 +-
 2 files changed, 85 insertions(+), 18 deletions(-)

diff --git a/TheNoiseClock/Views/Clock/Components/BatteryOverlayView.swift b/TheNoiseClock/Views/Clock/Components/BatteryOverlayView.swift
index 4ea1eaf..7dd49fa 100644
--- a/TheNoiseClock/Views/Clock/Components/BatteryOverlayView.swift
+++ b/TheNoiseClock/Views/Clock/Components/BatteryOverlayView.swift
@@ -15,6 +15,7 @@ struct BatteryOverlayView: View {
     let color: Color
     let opacity: Double
     let batteryLevel: Int
+    let isCharging: Bool
     
     // MARK: - Body
     var body: some View {
@@ -34,6 +35,11 @@ struct BatteryOverlayView: View {
     
     // MARK: - Private Methods
     private func getBatteryIcon() -> String {
+        // Show charging icon when charging
+        if isCharging {
+            return "bolt.circle.fill"
+        }
+        
         // Return battery icon based on level
         switch batteryLevel {
         case 75...100:
@@ -50,6 +56,11 @@ struct BatteryOverlayView: View {
     }
     
     private func getBatteryColor() -> Color {
+        // Green when charging
+        if isCharging {
+            return .green
+        }
+        
         // Color based on battery level
         switch batteryLevel {
         case 50...100:
@@ -69,7 +80,8 @@ struct BatteryOverlayView: View {
     BatteryOverlayView(
         color: .white,
         opacity: 1.0,
-        batteryLevel: 100
+        batteryLevel: 100,
+        isCharging: false
     )
 }
 
@@ -77,7 +89,8 @@ struct BatteryOverlayView: View {
     BatteryOverlayView(
         color: .white,
         opacity: 1.0,
-        batteryLevel: 75
+        batteryLevel: 75,
+        isCharging: false
     )
 }
 
@@ -85,7 +98,8 @@ struct BatteryOverlayView: View {
     BatteryOverlayView(
         color: .white,
         opacity: 1.0,
-        batteryLevel: 50
+        batteryLevel: 50,
+        isCharging: false
     )
 }
 
@@ -93,7 +107,8 @@ struct BatteryOverlayView: View {
     BatteryOverlayView(
         color: .white,
         opacity: 1.0,
-        batteryLevel: 25
+        batteryLevel: 25,
+        isCharging: false
     )
 }
 
@@ -101,7 +116,8 @@ struct BatteryOverlayView: View {
     BatteryOverlayView(
         color: .white,
         opacity: 1.0,
-        batteryLevel: 10
+        batteryLevel: 10,
+        isCharging: false
     )
 }
 
@@ -109,34 +125,73 @@ struct BatteryOverlayView: View {
     BatteryOverlayView(
         color: .white,
         opacity: 1.0,
-        batteryLevel: 85
+        batteryLevel: 85,
+        isCharging: true
     )
 }
 
+#Preview("Battery Overlay - Charging States") {
+    VStack(spacing: 20) {
+        BatteryOverlayView(
+            color: .white,
+            opacity: 1.0,
+            batteryLevel: 75,
+            isCharging: false
+        )
+        
+        BatteryOverlayView(
+            color: .white,
+            opacity: 1.0,
+            batteryLevel: 75,
+            isCharging: true
+        )
+        
+        BatteryOverlayView(
+            color: .white,
+            opacity: 1.0,
+            batteryLevel: 25,
+            isCharging: false
+        )
+        
+        BatteryOverlayView(
+            color: .white,
+            opacity: 1.0,
+            batteryLevel: 25,
+            isCharging: true
+        )
+    }
+    .padding()
+    .background(Color.black)
+}
+
 #Preview("Battery Overlay - Different Colors") {
     VStack(spacing: 20) {
         BatteryOverlayView(
             color: .white,
             opacity: 1.0,
-            batteryLevel: 75
+            batteryLevel: 75,
+            isCharging: false
         )
         
         BatteryOverlayView(
             color: .blue,
             opacity: 1.0,
-            batteryLevel: 50
+            batteryLevel: 50,
+            isCharging: false
         )
         
         BatteryOverlayView(
             color: .green,
             opacity: 1.0,
-            batteryLevel: 25
+            batteryLevel: 25,
+            isCharging: false
         )
         
         BatteryOverlayView(
             color: .red,
             opacity: 1.0,
-            batteryLevel: 10
+            batteryLevel: 10,
+            isCharging: false
         )
     }
     .padding()
@@ -148,25 +203,29 @@ struct BatteryOverlayView: View {
         BatteryOverlayView(
             color: .white,
             opacity: 1.0,
-            batteryLevel: 75
+            batteryLevel: 75,
+            isCharging: false
         )
         
         BatteryOverlayView(
             color: .white,
             opacity: 0.7,
-            batteryLevel: 50
+            batteryLevel: 50,
+            isCharging: false
         )
         
         BatteryOverlayView(
             color: .white,
             opacity: 0.5,
-            batteryLevel: 25
+            batteryLevel: 25,
+            isCharging: false
         )
         
         BatteryOverlayView(
             color: .white,
             opacity: 0.3,
-            batteryLevel: 10
+            batteryLevel: 10,
+            isCharging: false
         )
     }
     .padding()
@@ -177,7 +236,8 @@ struct BatteryOverlayView: View {
     BatteryOverlayView(
         color: .white,
         opacity: 1.0,
-        batteryLevel: 75
+        batteryLevel: 75,
+        isCharging: false
     )
     .padding()
     .background(Color.black)
@@ -187,7 +247,8 @@ struct BatteryOverlayView: View {
     BatteryOverlayView(
         color: .black,
         opacity: 1.0,
-        batteryLevel: 50
+        batteryLevel: 50,
+        isCharging: false
     )
     .padding()
     .background(Color.white)
@@ -215,7 +276,8 @@ struct BatteryOverlayView: View {
                 BatteryOverlayView(
                     color: .white,
                     opacity: 0.8,
-                    batteryLevel: 75
+                    batteryLevel: 75,
+                    isCharging: false
                 )
                 Spacer()
             }
diff --git a/TheNoiseClock/Views/Clock/Components/TopOverlayView.swift b/TheNoiseClock/Views/Clock/Components/TopOverlayView.swift
index 14691c1..a9a8634 100644
--- a/TheNoiseClock/Views/Clock/Components/TopOverlayView.swift
+++ b/TheNoiseClock/Views/Clock/Components/TopOverlayView.swift
@@ -29,7 +29,12 @@ struct TopOverlayView: View {
             Spacer()
             
             if showBattery {
-                BatteryOverlayView(color: color, opacity: opacity, batteryLevel: batteryService.batteryLevel)
+                BatteryOverlayView(
+                    color: color, 
+                    opacity: opacity, 
+                    batteryLevel: batteryService.batteryLevel,
+                    isCharging: batteryService.isCharging
+                )
             }
         }
         .padding(.horizontal, UIConstants.Spacing.medium)