Merge pull request #52 from Ebullioscopic/feature/lock-screen

Feature/lock screen

.gitignore

@@ -17,7 +17,7 @@ podfile.lock
 
 # Carthage
 Carthage/Build/
-
+/temp/
 # Swift Package Manager
 .swiftpm/
 .build/

DynamicIsland.xcodeproj/project.pbxproj

@@ -408,7 +408,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = "1.0.0-beta";
+				MARKETING_VERSION = "1.0.1-beta";
 				PRODUCT_BUNDLE_IDENTIFIER = com.karthikinformationtechnology.DynamicIsland;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -456,7 +456,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = "1.0.0-beta";
+				MARKETING_VERSION = "1.0.1-beta";
 				PRODUCT_BUNDLE_IDENTIFIER = com.karthikinformationtechnology.DynamicIsland;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

DynamicIsland/DynamicIslandApp.swift

@@ -656,6 +656,13 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         }
         
         previousScreens = NSScreen.screens
+
+        if Defaults[.enableLockScreenWeatherWidget] {
+            LockScreenWeatherManager.shared.prepareLocationAccess()
+            Task { @MainActor in
+                await LockScreenWeatherManager.shared.refresh(force: true)
+            }
+        }
     }
     
     func playWelcomeSound() {

DynamicIsland/Info.plist

@@ -11,6 +11,10 @@
 	<true/>
 	<key>NSBluetoothAlwaysUsageDescription</key>
 	<string>Dynamic Island needs Bluetooth access to detect when audio devices connect and display their battery status in the HUD.</string>
+	<key>NSLocationUsageDescription</key>
+	<string>Dynamic Island uses your location to display accurate lock screen weather.</string>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string>Dynamic Island uses your location to display accurate lock screen weather.</string>
 	<key>NSScreenCaptureUsageDescription</key>
 	<string>Dynamic Island needs screen recording permission to capture screenshots for the AI assistant feature.</string>
 	<key>SUEnableDownloaderService</key>

DynamicIsland/Localizable.xcstrings

@@ -6680,10 +6680,6 @@
         }
       }
     },
-    "Enable lock screen media widget" : {
-      "comment" : "A toggle that enables or disables the lock screen media widget.",
-      "isCommentAutoGenerated" : true
-    },
     "Enable music live activity" : {
       "localizations" : {
         "ar" : {
@@ -15199,7 +15195,7 @@
         }
       }
     },
-    "Shows a lock icon in the Dynamic Island when the screen is locked. The lock screen music panel can be toggled separately in Media settings." : {
+    "Shows a lock icon in the Dynamic Island when the screen is locked. Use the toggles above to control the lock screen media panel and weather capsule." : {
 
     },
     "Shows green camera icon and yellow microphone icon when in use. Uses event-driven CoreAudio and CoreMediaIO APIs." : {
@@ -17484,6 +17480,28 @@
     },
     "Volume HUD" : {
 
+    },
+    "Weather: %@ %@" : {
+      "comment" : "Weather description and temperature",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Weather: %1$@ %2$@"
+          }
+        }
+      }
+    },
+    "Weather: %@ %@ in %@" : {
+      "comment" : "Weather description, temperature, and location",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Weather: %1$@ %2$@ in %3$@"
+          }
+        }
+      }
     },
     "Welcome" : {
       "localizations" : {

DynamicIsland/components/LockScreen/LockScreenWeatherWidget.swift

@@ -0,0 +1,47 @@
+import SwiftUI
+
+struct LockScreenWeatherWidget: View {
+    let snapshot: LockScreenWeatherSnapshot
+
+    var body: some View {
+        HStack(spacing: 8) {
+            Image(systemName: snapshot.symbolName)
+                .font(.system(size: 26, weight: .medium))
+                .symbolRenderingMode(.hierarchical)
+            Text(snapshot.temperatureText)
+                .font(.system(size: 24, weight: .semibold, design: .rounded))
+                .kerning(-0.4)
+            if let locationName = snapshot.locationName, !locationName.isEmpty {
+                Text("•")
+                    .font(.system(size: 22, weight: .semibold, design: .rounded))
+                Text(locationName)
+                    .font(.system(size: 20, weight: .medium, design: .rounded))
+                    .foregroundStyle(Color.white.opacity(0.65))
+            }
+        }
+        .foregroundStyle(Color.white.opacity(0.65))
+        .padding(.horizontal, 10)
+        .padding(.vertical, 6)
+        .background(Color.clear)
+        .shadow(color: .black.opacity(0.35), radius: 8, x: 0, y: 3)
+        .accessibilityElement(children: .ignore)
+        .accessibilityLabel(accessibilityLabel)
+    }
+
+    private var accessibilityLabel: String {
+        if let locationName = snapshot.locationName, !locationName.isEmpty {
+            return String(
+                format: NSLocalizedString("Weather: %@ %@ in %@", comment: "Weather description, temperature, and location"),
+                snapshot.description,
+                snapshot.temperatureText,
+                locationName
+            )
+        }
+
+        return String(
+            format: NSLocalizedString("Weather: %@ %@", comment: "Weather description and temperature"),
+            snapshot.description,
+            snapshot.temperatureText
+        )
+    }
+}

DynamicIsland/components/Settings/SettingsView.swift

@@ -322,6 +322,8 @@ struct GeneralSettings: View {
                 Defaults.Toggle("Show media app icon", key: .lockScreenShowAppIcon)
                 Defaults.Toggle("Show panel border", key: .lockScreenPanelShowsBorder)
                 Defaults.Toggle("Enable blur", key: .lockScreenPanelUsesBlur)
+                Defaults.Toggle("Show lock screen media panel", key: .enableLockScreenMediaWidget)
+                Defaults.Toggle("Show lock screen weather", key: .enableLockScreenWeatherWidget)
                 
                 Button("Copy Latest Crash Report") {
                     copyLatestCrashReport()
@@ -329,7 +331,7 @@ struct GeneralSettings: View {
             } header: {
                 Text("Lock Screen")
             } footer: {
-                Text("Shows a lock icon in the Dynamic Island when the screen is locked. The lock screen music panel can be toggled separately in Media settings.")
+                Text("Shows a lock icon in the Dynamic Island when the screen is locked. Use the toggles above to control the lock screen media panel and weather capsule.")
             }
 
             Section {
@@ -782,12 +784,6 @@ struct Media: View {
                         customBadge(text: "Beta")
                     }
                 }
-                // Enable/disable the lock screen media widget
-                Defaults.Toggle(key: .enableLockScreenMediaWidget) {
-                    HStack {
-                        Text("Enable lock screen media widget")
-                    }
-                }
             } header: {
                 Text("Media controls")
             }

DynamicIsland/managers/LockScreenManager.swift

@@ -96,6 +96,7 @@ class LockScreenManager: ObservableObject {
         print("[\(timestamp())] LockScreenManager: 🎵 Showing lock screen panel")
         LockScreenPanelManager.shared.showPanel()
         LockScreenLiveActivityWindowManager.shared.showLocked()
+        LockScreenWeatherManager.shared.showWeatherWidget()
         
         // THEN trigger lock icon in Dynamic Island (only if enabled in settings)
         if Defaults[.enableLockScreenLiveActivity] {
@@ -115,6 +116,7 @@ class LockScreenManager: ObservableObject {
         print("[\(timestamp())] LockScreenManager: 🚪 Hiding panel window")
         LockScreenPanelManager.shared.hidePanel()
         LockScreenLiveActivityWindowManager.shared.showUnlockAndScheduleHide()
+        LockScreenWeatherManager.shared.hideWeatherWidget()
         
         // Update state immediately
         if Defaults[.enableLockScreenLiveActivity] {

DynamicIsland/managers/LockScreenWeatherManager.swift

@@ -0,0 +1,270 @@
+import Foundation
+import Defaults
+import CoreLocation
+
+@MainActor
+final class LockScreenWeatherManager: ObservableObject {
+    static let shared = LockScreenWeatherManager()
+
+    @Published private(set) var snapshot: LockScreenWeatherSnapshot?
+
+    private let provider = LockScreenWeatherProvider()
+    private let locationProvider = LockScreenWeatherLocationProvider()
+    private var lastFetchDate: Date?
+
+    private init() {}
+
+    func prepareLocationAccess() {
+        locationProvider.prepareAuthorization()
+    }
+
+    func showWeatherWidget() {
+        guard Defaults[.enableLockScreenWeatherWidget] else {
+            LockScreenWeatherPanelManager.shared.hide()
+            return
+        }
+
+        locationProvider.prepareAuthorization()
+
+        Task { @MainActor [weak self] in
+            guard let self else { return }
+            await self.refresh(force: self.snapshot == nil)
+            if let snapshot = self.snapshot {
+                LockScreenWeatherPanelManager.shared.show(with: snapshot)
+            } else {
+                LockScreenWeatherPanelManager.shared.hide()
+            }
+        }
+    }
+
+    func hideWeatherWidget() {
+        LockScreenWeatherPanelManager.shared.hide()
+    }
+
+    func refresh(force: Bool = false) async {
+        let interval = Defaults[.lockScreenWeatherRefreshInterval]
+        if !force, let lastFetchDate, Date().timeIntervalSince(lastFetchDate) < interval {
+            if let snapshot = snapshot {
+                LockScreenWeatherPanelManager.shared.update(with: snapshot)
+            }
+            return
+        }
+
+        do {
+            let location = await locationProvider.currentLocation()
+            let snapshot = try await provider.fetchSnapshot(location: location)
+            self.snapshot = snapshot
+            lastFetchDate = Date()
+            LockScreenWeatherPanelManager.shared.update(with: snapshot)
+        } catch {
+            NSLog("LockScreenWeatherManager: failed to fetch weather - \(error.localizedDescription)")
+        }
+    }
+}
+
+struct LockScreenWeatherSnapshot: Equatable {
+    let temperatureText: String
+    let symbolName: String
+    let description: String
+    let locationName: String?
+}
+
+private actor LockScreenWeatherProvider {
+    private let session: URLSession
+    private let decoder: JSONDecoder
+
+    init() {
+        let configuration = URLSessionConfiguration.ephemeral
+        configuration.timeoutIntervalForRequest = 10
+        configuration.timeoutIntervalForResource = 10
+        session = URLSession(configuration: configuration)
+        decoder = JSONDecoder()
+    }
+
+    func fetchSnapshot(location: CLLocation?) async throws -> LockScreenWeatherSnapshot {
+        let locationSuffix: String
+        if let coordinate = location?.coordinate {
+            let lat = String(format: "%.4f", coordinate.latitude)
+            let lon = String(format: "%.4f", coordinate.longitude)
+            locationSuffix = "\(lat),\(lon)"
+        } else {
+            locationSuffix = ""
+        }
+
+        let urlString = locationSuffix.isEmpty ? "https://wttr.in/?format=j1" : "https://wttr.in/\(locationSuffix)?format=j1"
+
+        guard let url = URL(string: urlString) else {
+            throw WeatherProviderError.invalidURL
+        }
+
+        let (data, response) = try await session.data(from: url)
+        guard let httpResponse = response as? HTTPURLResponse, (200..<300).contains(httpResponse.statusCode) else {
+            throw WeatherProviderError.invalidResponse
+        }
+
+        let payload = try decoder.decode(WTTRResponse.self, from: data)
+        guard let condition = payload.currentCondition.first else {
+            throw WeatherProviderError.noData
+        }
+
+        let usesMetric = Locale.current.usesMetricSystem
+        let temperature = usesMetric ? condition.tempC : condition.tempF
+        let temperatureText = "\(temperature)°"
+
+        let code = Int(condition.weatherCode) ?? 113
+        let symbol = WeatherSymbolMapper.symbol(for: code)
+        let description = condition.localizedDescription
+
+        let nearest = payload.nearestArea.first
+        let locationName = nearest?.preferredName
+
+        return LockScreenWeatherSnapshot(
+            temperatureText: temperatureText,
+            symbolName: symbol,
+            description: description,
+            locationName: locationName
+        )
+    }
+}
+
+enum WeatherProviderError: Error {
+    case invalidURL
+    case invalidResponse
+    case noData
+}
+
+private struct WTTRResponse: Decodable {
+    let current_condition: [WTTRCurrentCondition]
+    let nearest_area: [WTTRNearestArea]?
+
+    var currentCondition: [WTTRCurrentCondition] { current_condition }
+    var nearestArea: [WTTRNearestArea] { nearest_area ?? [] }
+}
+
+private struct WTTRCurrentCondition: Decodable {
+    private enum CodingKeys: String, CodingKey {
+        case tempC = "temp_C"
+        case tempF = "temp_F"
+        case weatherCode
+        case weatherDesc
+        case langEn = "lang_en"
+    }
+
+    let tempC: String
+    let tempF: String
+    let weatherCode: String
+    let weatherDesc: [WTTRTextValue]?
+    let langEn: [WTTRTextValue]?
+
+    var localizedDescription: String {
+        if let english = langEn?.first?.value, !english.isEmpty {
+            return english
+        }
+        if let desc = weatherDesc?.first?.value, !desc.isEmpty {
+            return desc
+        }
+        return ""
+    }
+}
+
+private struct WTTRTextValue: Decodable {
+    let value: String
+}
+
+private struct WTTRNearestArea: Decodable {
+    let areaName: [WTTRTextValue]?
+    let region: [WTTRTextValue]?
+    let country: [WTTRTextValue]?
+
+    private enum CodingKeys: String, CodingKey {
+        case areaName = "areaName"
+        case region
+        case country
+    }
+
+    var preferredName: String? {
+        if let name = areaName?.first?.value, !name.isEmpty {
+            return name
+        }
+        if let regionName = region?.first?.value, !regionName.isEmpty {
+            return regionName
+        }
+        if let countryName = country?.first?.value, !countryName.isEmpty {
+            return countryName
+        }
+        return nil
+    }
+}
+
+private enum WeatherSymbolMapper {
+    static func symbol(for code: Int) -> String {
+        switch code {
+        case 113:
+            return "sun.max.fill"
+        case 116:
+            return "cloud.sun.fill"
+        case 119, 122:
+            return "cloud.fill"
+        case 143, 248, 260:
+            return "cloud.fog.fill"
+        case 176, 263, 266, 293, 296, 299, 302, 353, 356, 359:
+            return "cloud.rain.fill"
+        case 179, 182, 185, 311, 314, 317, 320, 362, 365:
+            return "cloud.sleet.fill"
+        case 227, 230, 281, 284, 317, 320, 323, 326, 329, 332, 335, 338, 368, 371, 374, 377:
+            return "cloud.snow.fill"
+        case 200, 386, 389, 392, 395:
+            return "cloud.bolt.rain.fill"
+        default:
+            return "cloud.sun.fill"
+        }
+    }
+}
+
+@MainActor
+private final class LockScreenWeatherLocationProvider: NSObject, CLLocationManagerDelegate {
+    private let manager: CLLocationManager
+    private var continuation: CheckedContinuation<CLLocation?, Never>?
+    private var lastLocation: CLLocation?
+
+    override init() {
+        manager = CLLocationManager()
+        super.init()
+        manager.delegate = self
+        manager.desiredAccuracy = kCLLocationAccuracyHundredMeters
+    }
+
+    func prepareAuthorization() {
+        let status = CLLocationManager.authorizationStatus()
+        if status == .notDetermined {
+            manager.requestWhenInUseAuthorization()
+        }
+    }
+
+    func currentLocation() async -> CLLocation? {
+        let status = CLLocationManager.authorizationStatus()
+        switch status {
+        case .authorizedAlways, .authorizedWhenInUse:
+            if let lastLocation, abs(lastLocation.timestamp.timeIntervalSinceNow) < 1800 {
+                return lastLocation
+            }
+            manager.requestLocation()
+            return await withCheckedContinuation { continuation in
+                self.continuation = continuation
+            }
+        default:
+            return nil
+        }
+    }
+
+    func locationManager(_ manager: CLLocationManager, didUpdateLocations locations: [CLLocation]) {
+        lastLocation = locations.last
+        continuation?.resume(returning: lastLocation)
+        continuation = nil
+    }
+
+    func locationManager(_ manager: CLLocationManager, didFailWithError error: Error) {
+        continuation?.resume(returning: nil)
+        continuation = nil
+    }
+}

DynamicIsland/managers/LockScreenWeatherPanelManager.swift

@@ -0,0 +1,86 @@
+import AppKit
+import SwiftUI
+import SkyLightWindow
+
+@MainActor
+final class LockScreenWeatherPanelManager {
+    static let shared = LockScreenWeatherPanelManager()
+
+    private var window: NSWindow?
+    private var hasDelegated = false
+
+    private init() {}
+
+    func show(with snapshot: LockScreenWeatherSnapshot) {
+        render(snapshot: snapshot, makeVisible: true)
+    }
+
+    func update(with snapshot: LockScreenWeatherSnapshot) {
+        render(snapshot: snapshot, makeVisible: false)
+    }
+
+    func hide() {
+        guard let window else { return }
+        window.orderOut(nil)
+        window.contentView = nil
+    }
+
+    private func render(snapshot: LockScreenWeatherSnapshot, makeVisible: Bool) {
+        guard let screen = NSScreen.main else { return }
+        if !makeVisible, window == nil {
+            return
+        }
+
+        let view = LockScreenWeatherWidget(snapshot: snapshot)
+        let hostingView = NSHostingView(rootView: view)
+        let fittingSize = hostingView.fittingSize
+        hostingView.frame = NSRect(origin: .zero, size: fittingSize)
+
+        let targetFrame = frame(for: fittingSize, on: screen)
+        let window = ensureWindow()
+        window.setFrame(targetFrame, display: true)
+        window.contentView = hostingView
+
+        if makeVisible {
+            window.orderFrontRegardless()
+        }
+    }
+
+    private func ensureWindow() -> NSWindow {
+        if let window {
+            return window
+        }
+
+        let frame = NSRect(origin: .zero, size: CGSize(width: 110, height: 40))
+        let newWindow = NSWindow(
+            contentRect: frame,
+            styleMask: [.borderless, .nonactivatingPanel],
+            backing: .buffered,
+            defer: false
+        )
+
+        newWindow.isReleasedWhenClosed = false
+        newWindow.isOpaque = false
+        newWindow.backgroundColor = .clear
+        newWindow.hasShadow = false
+        newWindow.ignoresMouseEvents = true
+        newWindow.level = NSWindow.Level(rawValue: Int(CGShieldingWindowLevel()))
+        newWindow.collectionBehavior = [.canJoinAllSpaces, .stationary, .fullScreenAuxiliary]
+
+        window = newWindow
+        if !hasDelegated {
+            SkyLightOperator.shared.delegateWindow(newWindow)
+            hasDelegated = true
+        }
+        return newWindow
+    }
+
+    private func frame(for size: CGSize, on screen: NSScreen) -> NSRect {
+        let screenFrame = screen.frame
+        let originX = screenFrame.midX - (size.width / 2)
+        let verticalOffset = screenFrame.height * 0.15
+        let maxY = screenFrame.maxY - size.height - 48
+        let originY = min(maxY, screenFrame.midY + verticalOffset)
+        return NSRect(x: originX, y: originY, width: size.width, height: size.height)
+    }
+}

DynamicIsland/models/Constants.swift

@@ -336,6 +336,8 @@ extension Defaults.Keys {
     static let showShuffleAndRepeat = Key<Bool>("showShuffleAndRepeat", default: false)
     // Enable lock screen media widget (shows the standalone panel when screen is locked)
     static let enableLockScreenMediaWidget = Key<Bool>("enableLockScreenMediaWidget", default: true)
+    static let enableLockScreenWeatherWidget = Key<Bool>("enableLockScreenWeatherWidget", default: true)
+    static let lockScreenWeatherRefreshInterval = Key<TimeInterval>("lockScreenWeatherRefreshInterval", default: 30 * 60)
     static let lockScreenGlassStyle = Key<LockScreenGlassStyle>("lockScreenGlassStyle", default: .liquid)
     static let lockScreenShowAppIcon = Key<Bool>("lockScreenShowAppIcon", default: false)
     static let lockScreenPanelShowsBorder = Key<Bool>("lockScreenPanelShowsBorder", default: true)