bukovinafilip/Atoll
1
0
Fork 0
mirror of https://github.com/FBukovina/Atoll.git synced 2026-10-28 23:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Working lock screen stuff

Browse source
This commit is contained in:
Hariharan Mudaliar 2025-10-27 00:40:03 +05:30
commit 5a722373ce
5 changed files with 171 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

27
DynamicIsland/managers/LockScreenWeatherManager.swift
View file

@ -85,7 +85,20 @@ final class LockScreenWeatherManager: ObservableObject {
return snapshot
} catch {
NSLog("LockScreenWeatherManager: failed to fetch weather - \(error.localizedDescription)")
return snapshot
let fallback = LockScreenWeatherSnapshot(
temperatureText: snapshot?.temperatureText ?? "--",
symbolName: snapshot?.symbolName ?? "cloud.fill",
description: snapshot?.description ?? "",
locationName: snapshot?.locationName,
charging: Defaults[.lockScreenWeatherShowsCharging] ? makeChargingInfo() : nil,
bluetooth: Defaults[.lockScreenWeatherShowsBluetooth] ? makeBluetoothInfo() : nil,
showsLocation: snapshot?.showsLocation ?? false
)
self.snapshot = fallback
deliver(fallback, forceShow: false)
return fallback
}
}
@ -177,15 +190,17 @@ final class LockScreenWeatherManager: ObservableObject {
private func makeChargingInfo() -> LockScreenWeatherSnapshot.ChargingInfo? {
let battery = BatteryStatusViewModel.shared
let isPluggedIn = battery.isPluggedIn
let isCharging = battery.isCharging
let macStatus = MacBatteryManager.shared.currentStatus()
let isPluggedIn = battery.isPluggedIn || battery.isCharging
let isCharging = macStatus.isCharging || battery.isCharging
guard isPluggedIn || isCharging else {
return nil
}
let minutes = battery.timeToFullCharge
let remaining = minutes > 0 ? minutes : nil
let rawMinutes = macStatus.timeRemainingMinutes ?? (battery.timeToFullCharge > 0 ? battery.timeToFullCharge : nil)
let remaining = (rawMinutes ?? 0) > 0 ? rawMinutes : nil
return LockScreenWeatherSnapshot.ChargingInfo(
minutesRemaining: remaining,
@ -234,7 +249,7 @@ struct LockScreenWeatherSnapshot: Equatable {
return "bolt.fill"
}
if isPluggedIn {
return "powerplug.fill"
return "powerplug.portrait.fill"
}
return ""
}