Updated Battery Icon to Macbook Icon

DynamicIsland/Localizable.xcstrings

@@ -10888,6 +10888,9 @@
     },
     "Mac battery at %d percent" : {
       "comment" : "Mac battery gauge accessibility label"
+    },
+    "MacBook icon is available in the circular layout." : {
+
     },
     "Made ❤️ by Ebullioscopic" : {
 

DynamicIsland/components/LockScreen/LockScreenWeatherWidget.swift

@@ -158,12 +158,13 @@ struct LockScreenWeatherWidget: View {
 
 	private func circularBatterySegment(for info: LockScreenWeatherSnapshot.BatteryInfo) -> some View {
 		let level = clampedBatteryLevel(info.batteryLevel)
+		let symbolName = info.usesLaptopSymbol ? "laptopcomputer" : batteryIconName(for: level)
 
 		return VStack(spacing: 6) {
 			Gauge(value: Double(level), in: 0...100) {
 				EmptyView()
 			} currentValueLabel: {
-				Image(systemName: batteryIconName(for: level))
+				Image(systemName: symbolName)
 					.font(.system(size: 20, weight: .semibold))
 					.foregroundStyle(Color.white)
 			} minimumValueLabel: {

DynamicIsland/components/Settings/SettingsView.swift

@@ -191,6 +191,7 @@ struct GeneralSettings: View {
     @Default(.lockScreenWeatherAQIScale) var lockScreenWeatherAQIScale
     @Default(.lockScreenWeatherUsesGaugeTint) var lockScreenWeatherUsesGaugeTint
     @Default(.lockScreenWeatherProviderSource) var lockScreenWeatherProviderSource
+    @Default(.lockScreenWeatherBatteryUsesLaptopSymbol) var lockScreenWeatherBatteryUsesLaptopSymbol
 
     var body: some View {
         Form {
@@ -403,6 +404,15 @@ struct GeneralSettings: View {
                         Defaults.Toggle("Show charging percentage", key: .lockScreenWeatherShowsChargingPercentage)
                     }
                     Defaults.Toggle("Show battery indicator", key: .lockScreenWeatherShowsBatteryGauge)
+                    if lockScreenWeatherShowsBatteryGauge {
+                        Defaults.Toggle("Use MacBook icon when on battery", key: .lockScreenWeatherBatteryUsesLaptopSymbol)
+                            .disabled(lockScreenWeatherWidgetStyle != .circular)
+                        if lockScreenWeatherWidgetStyle != .circular {
+                            Text("MacBook icon is available in the circular layout.")
+                                .font(.caption)
+                                .foregroundStyle(.secondary)
+                        }
+                    }
                     Defaults.Toggle("Show Bluetooth battery", key: .lockScreenWeatherShowsBluetooth)
                     Defaults.Toggle("Show AQI widget", key: .lockScreenWeatherShowsAQI)
                         .disabled(!lockScreenWeatherProviderSource.supportsAirQuality)

DynamicIsland/managers/LockScreenWeatherManager.swift

@@ -105,7 +105,8 @@ final class LockScreenWeatherManager: ObservableObject {
             let showsCharging = Defaults[.lockScreenWeatherShowsCharging]
             let chargingInfo = showsCharging ? makeChargingInfo() : nil
             let showsBatteryGauge = Defaults[.lockScreenWeatherShowsBatteryGauge]
-            let batteryInfo = showsBatteryGauge ? makeBatteryGaugeInfo(isCharging: chargingInfo != nil) : nil
+            let widgetStyle = Defaults[.lockScreenWeatherWidgetStyle]
+            let batteryInfo = showsBatteryGauge ? makeBatteryGaugeInfo(isCharging: chargingInfo != nil, widgetStyle: widgetStyle) : nil
             let fallback = LockScreenWeatherSnapshot(
                 temperatureText: snapshot?.temperatureText ?? "--",
                 symbolName: snapshot?.symbolName ?? "cloud.fill",
@@ -116,7 +117,7 @@ final class LockScreenWeatherManager: ObservableObject {
                 battery: batteryInfo,
                 showsLocation: snapshot?.showsLocation ?? false,
                 airQuality: (providerSource.supportsAirQuality && Defaults[.lockScreenWeatherShowsAQI]) ? snapshot?.airQuality : nil,
-                widgetStyle: Defaults[.lockScreenWeatherWidgetStyle],
+                widgetStyle: widgetStyle,
                 showsChargingPercentage: Defaults[.lockScreenWeatherShowsChargingPercentage],
                 temperatureInfo: snapshot?.temperatureInfo,
                 usesGaugeTint: Defaults[.lockScreenWeatherUsesGaugeTint]
@@ -189,6 +190,8 @@ final class LockScreenWeatherManager: ObservableObject {
                 .map { _ in () }.eraseToAnyPublisher(),
             Defaults.publisher(.lockScreenWeatherShowsBatteryGauge, options: [])
                 .map { _ in () }.eraseToAnyPublisher(),
+            Defaults.publisher(.lockScreenWeatherBatteryUsesLaptopSymbol, options: [])
+                .map { _ in () }.eraseToAnyPublisher(),
             Defaults.publisher(.lockScreenWeatherWidgetStyle, options: [])
                 .map { _ in () }.eraseToAnyPublisher(),
             Defaults.publisher(.lockScreenWeatherTemperatureUnit, options: [])
@@ -289,7 +292,7 @@ final class LockScreenWeatherManager: ObservableObject {
         let showsChargingPercentage = Defaults[.lockScreenWeatherShowsChargingPercentage]
         let providerSource = Defaults[.lockScreenWeatherProviderSource]
         let airQualityInfo = (Defaults[.lockScreenWeatherShowsAQI] && providerSource.supportsAirQuality) ? payload.airQuality : nil
-        let batteryInfo = Defaults[.lockScreenWeatherShowsBatteryGauge] ? makeBatteryGaugeInfo(isCharging: chargingInfo != nil) : nil
+        let batteryInfo = Defaults[.lockScreenWeatherShowsBatteryGauge] ? makeBatteryGaugeInfo(isCharging: chargingInfo != nil, widgetStyle: widgetStyle) : nil
         let usesGaugeTint = Defaults[.lockScreenWeatherUsesGaugeTint]
 
         return LockScreenWeatherSnapshot(
@@ -334,7 +337,7 @@ final class LockScreenWeatherManager: ObservableObject {
         )
     }
 
-    private func makeBatteryGaugeInfo(isCharging: Bool) -> LockScreenWeatherSnapshot.BatteryInfo? {
+    private func makeBatteryGaugeInfo(isCharging: Bool, widgetStyle: LockScreenWeatherWidgetStyle) -> LockScreenWeatherSnapshot.BatteryInfo? {
         guard !isCharging else { return nil }
 
         let battery = BatteryStatusViewModel.shared
@@ -343,7 +346,12 @@ final class LockScreenWeatherManager: ObservableObject {
 
         guard clampedLevel >= 0 else { return nil }
 
-        return LockScreenWeatherSnapshot.BatteryInfo(batteryLevel: clampedLevel)
+        let usesLaptopSymbol = widgetStyle == .circular && Defaults[.lockScreenWeatherBatteryUsesLaptopSymbol]
+
+        return LockScreenWeatherSnapshot.BatteryInfo(
+            batteryLevel: clampedLevel,
+            usesLaptopSymbol: usesLaptopSymbol
+        )
     }
 
     private func makeBluetoothInfo() -> LockScreenWeatherSnapshot.BluetoothInfo? {
@@ -427,6 +435,7 @@ struct LockScreenWeatherSnapshot: Equatable {
 
     struct BatteryInfo: Equatable {
         let batteryLevel: Int
+        let usesLaptopSymbol: Bool
     }
 
     struct AirQualityInfo: Equatable {

DynamicIsland/models/Constants.swift

@@ -382,6 +382,7 @@ extension Defaults.Keys {
     static let lockScreenWeatherShowsChargingPercentage = Key<Bool>("lockScreenWeatherShowsChargingPercentage", default: true)
     static let lockScreenWeatherShowsBluetooth = Key<Bool>("lockScreenWeatherShowsBluetooth", default: true)
     static let lockScreenWeatherShowsBatteryGauge = Key<Bool>("lockScreenWeatherShowsBatteryGauge", default: true)
+    static let lockScreenWeatherBatteryUsesLaptopSymbol = Key<Bool>("lockScreenWeatherBatteryUsesLaptopSymbol", default: false)
     static let lockScreenWeatherWidgetStyle = Key<LockScreenWeatherWidgetStyle>("lockScreenWeatherWidgetStyle", default: .circular)
     static let lockScreenWeatherTemperatureUnit = Key<LockScreenWeatherTemperatureUnit>("lockScreenWeatherTemperatureUnit", default: .celsius)
     static let lockScreenWeatherShowsAQI = Key<Bool>("lockScreenWeatherShowsAQI", default: false)