bukovinafilip/Atoll
1
0
Fork 0
mirror of https://github.com/FBukovina/Atoll.git synced 2026-10-27 15:14:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Moved settings for the battery widget to dedicated Section

Browse source 
Before they were all within the Weather Widget settings
This commit is contained in:
Federico Imberti 2026-01-06 10:28:27 +01:00
commit cead5d6940
2 changed files with 31 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
DynamicIsland/Localizable.xcstrings
View file

@ -3989,6 +3989,9 @@
} }
} }
} }
},
"Battery Widget" : {
}, },
"Behavior & Style" : { "Behavior & Style" : {
@ -8239,6 +8242,9 @@
}, },
"Enable stats monitoring in Settings to view system performance data." : { "Enable stats monitoring in Settings to view system performance data." : {
},
"Enable the battery capsule and configure its layout" : {
}, },
"Enable the timer feature in Settings to access this tab." : { "Enable the timer feature in Settings to access this tab." : {
"comment" : "A message explaining that the timer feature must be enabled in settings to access this tab.", "comment" : "A message explaining that the timer feature must be enabled in settings to access this tab.",

44
DynamicIsland/components/Settings/SettingsView.swift
View file

@ -3195,29 +3195,10 @@ struct LockScreenSettings: View {
.disabled(lockScreenWeatherWidgetStyle == .circular) .disabled(lockScreenWeatherWidgetStyle == .circular)
.settingsHighlight(id: highlightID("Show location label")) .settingsHighlight(id: highlightID("Show location label"))
Defaults.Toggle("Show charging status", key: .lockScreenWeatherShowsCharging)
.settingsHighlight(id: highlightID("Show charging status"))
if lockScreenWeatherShowsCharging {
Defaults.Toggle("Show charging percentage", key: .lockScreenWeatherShowsChargingPercentage)
.settingsHighlight(id: highlightID("Show charging percentage"))
}
Defaults.Toggle("Show sunrise time", key: .lockScreenWeatherShowsSunrise) Defaults.Toggle("Show sunrise time", key: .lockScreenWeatherShowsSunrise)
.disabled(lockScreenWeatherWidgetStyle != .inline) .disabled(lockScreenWeatherWidgetStyle != .inline)
.settingsHighlight(id: highlightID("Show sunrise time")) .settingsHighlight(id: highlightID("Show sunrise time"))
Defaults.Toggle("Show battery indicator", key: .lockScreenWeatherShowsBatteryGauge)
.settingsHighlight(id: highlightID("Show battery indicator"))
if lockScreenWeatherShowsBatteryGauge {
Defaults.Toggle("Use MacBook icon when on battery", key: .lockScreenWeatherBatteryUsesLaptopSymbol)
.settingsHighlight(id: highlightID("Use MacBook icon when on battery"))
}
Defaults.Toggle("Show Bluetooth battery", key: .lockScreenWeatherShowsBluetooth)
.settingsHighlight(id: highlightID("Show Bluetooth battery"))
Defaults.Toggle("Show AQI widget", key: .lockScreenWeatherShowsAQI) Defaults.Toggle("Show AQI widget", key: .lockScreenWeatherShowsAQI)
.disabled(!lockScreenWeatherProviderSource.supportsAirQuality) .disabled(!lockScreenWeatherProviderSource.supportsAirQuality)
.settingsHighlight(id: highlightID("Show AQI widget")) .settingsHighlight(id: highlightID("Show AQI widget"))
@ -3247,6 +3228,31 @@ struct LockScreenSettings: View {
Text("Enable the weather capsule and configure its layout, provider, units, and optional battery/AQI indicators.") Text("Enable the weather capsule and configure its layout, provider, units, and optional battery/AQI indicators.")
} }
Section {
Defaults.Toggle("Show battery indicator", key: .lockScreenWeatherShowsBatteryGauge)
.settingsHighlight(id: highlightID("Show battery indicator"))
if lockScreenWeatherShowsBatteryGauge {
Defaults.Toggle("Use MacBook icon when on battery", key: .lockScreenWeatherBatteryUsesLaptopSymbol)
.settingsHighlight(id: highlightID("Use MacBook icon when on battery"))
}
Defaults.Toggle("Show charging status", key: .lockScreenWeatherShowsCharging)
.settingsHighlight(id: highlightID("Show charging status"))
if lockScreenWeatherShowsCharging {
Defaults.Toggle("Show charging percentage", key: .lockScreenWeatherShowsChargingPercentage)
.settingsHighlight(id: highlightID("Show charging percentage"))
}
Defaults.Toggle("Show Bluetooth battery", key: .lockScreenWeatherShowsBluetooth)
.settingsHighlight(id: highlightID("Show Bluetooth battery"))
} header: {
Text("Battery Widget")
} footer: {
Text("Enable the battery capsule and configure its layout")
}
Section { Section {
Defaults.Toggle("Show focus widget", key: .enableLockScreenFocusWidget) Defaults.Toggle("Show focus widget", key: .enableLockScreenFocusWidget)
.settingsHighlight(id: highlightID("Show focus widget")) .settingsHighlight(id: highlightID("Show focus widget"))