mirror of
https://github.com/FBukovina/Atoll.git
synced 2026-10-29 08:04:32 +00:00
Made the Macbook icon available in inline mode too
This commit is contained in:
parent
3e0d0969e7
commit
0416115da5
3 changed files with 1 additions and 12 deletions
|
|
@ -18644,10 +18644,6 @@
|
||||||
},
|
},
|
||||||
"Temperature unit" : {
|
"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" : {
|
"TheDynamicIsland" : {
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2696,14 +2696,7 @@ struct LockScreenSettings: View {
|
||||||
|
|
||||||
if lockScreenWeatherShowsBatteryGauge {
|
if lockScreenWeatherShowsBatteryGauge {
|
||||||
Defaults.Toggle("Use MacBook icon when on battery", key: .lockScreenWeatherBatteryUsesLaptopSymbol)
|
Defaults.Toggle("Use MacBook icon when on battery", key: .lockScreenWeatherBatteryUsesLaptopSymbol)
|
||||||
.disabled(lockScreenWeatherWidgetStyle != .circular)
|
|
||||||
.settingsHighlight(id: highlightID("Use MacBook icon when on battery"))
|
.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)
|
Defaults.Toggle("Show Bluetooth battery", key: .lockScreenWeatherShowsBluetooth)
|
||||||
|
|
|
||||||
|
|
@ -346,7 +346,7 @@ final class LockScreenWeatherManager: ObservableObject {
|
||||||
|
|
||||||
guard clampedLevel >= 0 else { return nil }
|
guard clampedLevel >= 0 else { return nil }
|
||||||
|
|
||||||
let usesLaptopSymbol = widgetStyle == .circular && Defaults[.lockScreenWeatherBatteryUsesLaptopSymbol]
|
let usesLaptopSymbol = Defaults[.lockScreenWeatherBatteryUsesLaptopSymbol]
|
||||||
|
|
||||||
return LockScreenWeatherSnapshot.BatteryInfo(
|
return LockScreenWeatherSnapshot.BatteryInfo(
|
||||||
batteryLevel: clampedLevel,
|
batteryLevel: clampedLevel,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue