From 0416115da580d1fed858a6ba250798dac61700b6 Mon Sep 17 00:00:00 2001 From: Hariharan Mudaliar Date: Tue, 9 Dec 2025 13:21:01 +0530 Subject: [PATCH] Made the Macbook icon available in inline mode too --- DynamicIsland/Localizable.xcstrings | 4 ---- DynamicIsland/components/Settings/SettingsView.swift | 7 ------- DynamicIsland/managers/LockScreenWeatherManager.swift | 2 +- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/DynamicIsland/Localizable.xcstrings b/DynamicIsland/Localizable.xcstrings index 2a1f7c1..2aeef68 100644 --- a/DynamicIsland/Localizable.xcstrings +++ b/DynamicIsland/Localizable.xcstrings @@ -18644,10 +18644,6 @@ }, "Temperature unit" : { - }, - "The MacBook icon is available only in the circular layout." : { - "comment" : "A message displayed below a toggle that lets the user choose whether to show a MacBook icon in the battery gauge of the weather widget. The message explains that the MacBook icon is only available when the weather widget is in a", - "isCommentAutoGenerated" : true }, "TheDynamicIsland" : { diff --git a/DynamicIsland/components/Settings/SettingsView.swift b/DynamicIsland/components/Settings/SettingsView.swift index fa58da5..c193d4c 100644 --- a/DynamicIsland/components/Settings/SettingsView.swift +++ b/DynamicIsland/components/Settings/SettingsView.swift @@ -2696,14 +2696,7 @@ struct LockScreenSettings: View { if lockScreenWeatherShowsBatteryGauge { Defaults.Toggle("Use MacBook icon when on battery", key: .lockScreenWeatherBatteryUsesLaptopSymbol) - .disabled(lockScreenWeatherWidgetStyle != .circular) .settingsHighlight(id: highlightID("Use MacBook icon when on battery")) - - if lockScreenWeatherWidgetStyle != .circular { - Text("The MacBook icon is available only in the circular layout.") - .font(.caption) - .foregroundStyle(.secondary) - } } Defaults.Toggle("Show Bluetooth battery", key: .lockScreenWeatherShowsBluetooth) diff --git a/DynamicIsland/managers/LockScreenWeatherManager.swift b/DynamicIsland/managers/LockScreenWeatherManager.swift index a9f1626..580f677 100644 --- a/DynamicIsland/managers/LockScreenWeatherManager.swift +++ b/DynamicIsland/managers/LockScreenWeatherManager.swift @@ -346,7 +346,7 @@ final class LockScreenWeatherManager: ObservableObject { guard clampedLevel >= 0 else { return nil } - let usesLaptopSymbol = widgetStyle == .circular && Defaults[.lockScreenWeatherBatteryUsesLaptopSymbol] + let usesLaptopSymbol = Defaults[.lockScreenWeatherBatteryUsesLaptopSymbol] return LockScreenWeatherSnapshot.BatteryInfo( batteryLevel: clampedLevel,