Merge weather and resolve conflicts

Author: xand0dev

Sources/VoidBar/Model/NotchViewModel.swift

@@ -4,7 +4,7 @@ import Combine
 @MainActor
 final class NotchViewModel: ObservableObject {
     enum Tab: String, CaseIterable, Identifiable {
-        case media, shelf, clipboard, snippets, calendar, timer, translate, notes, teleprompter, monitor
+        case media, shelf, clipboard, snippets, calendar, timer, translate, notes, teleprompter, monitor, weather
         var id: String { rawValue }
 
         var symbol: String {
@@ -19,6 +19,7 @@ final class NotchViewModel: ObservableObject {
             case .notes: return "note.text"
             case .teleprompter: return "text.line.first.and.arrowtriangle.forward"
             case .monitor: return "cpu"
+            case .weather: return "cloud.sun"
             }
         }
 
@@ -34,6 +35,7 @@ final class NotchViewModel: ObservableObject {
             case .notes: return localized("Notes")
             case .teleprompter: return localized("Teleprompter")
             case .monitor: return localized("Monitor")
+            case .weather: return localized("Weather")
             }
         }
 
@@ -46,7 +48,7 @@ final class NotchViewModel: ObservableObject {
         /// body has — so growth continues in a second column on the right,
         /// which the scratch notes open.
         static let leftRail: [Tab] = [.media, .shelf, .clipboard, .snippets, .calendar, .timer, .translate]
-        static let rightRail: [Tab] = [.notes, .teleprompter, .monitor]
+        static let rightRail: [Tab] = [.notes, .teleprompter, .monitor, .weather]
     }
 
     @Published var isOpen = false {
@@ -96,6 +98,7 @@ final class NotchViewModel: ObservableObject {
     let notes: NoteStore
     let teleprompter: TeleprompterStore
     let monitor: SystemMonitorStore
+    let weather: WeatherStore
 
     private var cancellables = Set<AnyCancellable>()
 
@@ -111,6 +114,7 @@ final class NotchViewModel: ObservableObject {
         self.notes = NoteStore()
         self.teleprompter = TeleprompterStore()
         self.monitor = SystemMonitorStore()
+        self.weather = WeatherStore()
 
         // The panel header reads through to the stores — counters, the source
         // name, the equalizer. Nested ObservableObjects do not propagate on
@@ -137,7 +141,8 @@ final class NotchViewModel: ObservableObject {
             clipboard.objectWillChange,
             calendar.objectWillChange,
             timer.objectWillChange,
-            monitor.objectWillChange
+            monitor.objectWillChange,
+            weather.objectWillChange
         ] {
             child
                 .sink { [weak self] _ in
@@ -180,6 +185,7 @@ final class NotchViewModel: ObservableObject {
         // never prompts on its own.
         calendar.start()
         monitor.start()
+        weather.start()
 
         // Screenshots reach the shelf through here whether they were taken on
         // this Mac or on a phone: a copy made on the phone arrives in the same
@@ -203,6 +209,7 @@ final class NotchViewModel: ObservableObject {
         clipboard.stop()
         calendar.stop()
         monitor.stop()
+        weather.stop()
         // Whatever was typed makes it to disk even when quitting mid-thought.
         notes.flush()
         teleprompter.flush()

Sources/VoidBar/Services/WeatherStore.swift

@@ -0,0 +1,73 @@
+import Foundation
+import Combine
+
+struct WeatherData: Codable {
+    let temperature: Double
+    let condition: Int
+    let locationName: String?
+}
+
+@MainActor
+final class WeatherStore: ObservableObject {
+    @Published var weather: WeatherData?
+    @Published var error: String?
+
+    private var timer: Timer?
+
+    func start() {
+        stop()
+        // Poll every 30 minutes
+        timer = Timer.scheduledTimer(withTimeInterval: 1800, repeats: true) { [weak self] _ in
+            Task { @MainActor in
+                await self?.fetchWeather()
+            }
+        }
+        Task {
+            await fetchWeather()
+        }
+    }
+
+    func stop() {
+        timer?.invalidate()
+        timer = nil
+    }
+
+    private func fetchWeather() async {
+        do {
+            // Get location via IP
+            guard let locationUrl = URL(string: "https://ipapi.co/json/") else { return }
+            let (locationData, _) = try await URLSession.shared.data(from: locationUrl)
+            
+            struct IPResponse: Decodable {
+                let latitude: Double
+                let longitude: Double
+                let city: String
+            }
+            let ipResponse = try JSONDecoder().decode(IPResponse.self, from: locationData)
+            
+            // Get weather from Open-Meteo
+            let weatherUrlString = "https://api.open-meteo.com/v1/forecast?latitude=\(ipResponse.latitude)&longitude=\(ipResponse.longitude)&current_weather=true"
+            guard let weatherUrl = URL(string: weatherUrlString) else { return }
+            
+            let (weatherJsonData, _) = try await URLSession.shared.data(from: weatherUrl)
+            
+            struct MeteoResponse: Decodable {
+                struct CurrentWeather: Decodable {
+                    let temperature: Double
+                    let weathercode: Int
+                }
+                let current_weather: CurrentWeather
+            }
+            let meteoResponse = try JSONDecoder().decode(MeteoResponse.self, from: weatherJsonData)
+            
+            self.weather = WeatherData(
+                temperature: meteoResponse.current_weather.temperature,
+                condition: meteoResponse.current_weather.weathercode,
+                locationName: ipResponse.city
+            )
+            self.error = nil
+        } catch {
+            self.error = error.localizedDescription
+        }
+    }
+}

Sources/VoidBar/UI/DynamicIslandView.swift

@@ -17,10 +17,12 @@ struct DynamicIslandView: View {
                 timerPill
             } else if vm.media.isPlaying {
                 mediaPill
+            } else if let weather = vm.weather.weather {
+                weatherPill(weather)
             }
         }
-        .frame(width: notchWidth, height: notchHeight)
-        .animation(.spring(response: 0.4, dampingFraction: 0.7), value: vm.media.isPlaying || vm.timer.state == .running)
+        .frame(width: notchWidth, height: notchHeight) // Center aligns with notch
+        .animation(.spring(response: 0.4, dampingFraction: 0.7), value: vm.media.isPlaying || vm.timer.state == .running || vm.weather.weather != nil)
     }
 
     @ViewBuilder
@@ -116,4 +118,36 @@ struct DynamicIslandView: View {
         let secs = Int(seconds) % 60
         return String(format: "%d:%02d", mins, secs)
     }
+
+    @ViewBuilder
+    private func weatherPill(_ weather: WeatherData) -> some View {
+        if vm.geometry.isPhysical {
+            // Right Wing (Weather)
+            HStack {
+                Text(String(format: "%.0f°", weather.temperature))
+                    .font(.system(size: 11, weight: .semibold))
+                    .foregroundColor(Color.white)
+                    .padding(.leading, 12)
+                Spacer()
+            }
+            .frame(width: 44, height: notchHeight)
+            .background(Color.black)
+            .clipShape(RoundedRectangle(cornerRadius: notchHeight / 2, style: .continuous))
+            .offset(x: notchWidth / 2 + 22 - 8)
+        } else {
+            // Unified Pill
+            HStack(spacing: 4) {
+                Image(systemName: "cloud.sun.fill")
+                    .font(.system(size: 10, weight: .medium))
+                    .foregroundColor(.white)
+                Text(String(format: "%.0f°", weather.temperature))
+                    .font(.system(size: 11, weight: .semibold))
+                    .foregroundColor(Color.white)
+            }
+            .padding(.horizontal, 12)
+            .frame(height: notchHeight)
+            .background(Color.black)
+            .clipShape(RoundedRectangle(cornerRadius: notchHeight / 2, style: .continuous))
+        }
+    }
 }

Sources/VoidBar/UI/NotchContentView.swift

@@ -112,6 +112,8 @@ struct NotchContentView: View {
             EmptyView()
         case .monitor:
             EmptyView()
+        case .weather:
+            EmptyView()
         }
     }
 
@@ -179,6 +181,8 @@ struct NotchContentView: View {
             TeleprompterPane(store: vm.teleprompter)
         case .monitor:
             MonitorPane(monitor: vm.monitor)
+        case .weather:
+            WeatherPane(weatherStore: vm.weather)
         }
     }
 }

Sources/VoidBar/UI/WeatherPane.swift

@@ -0,0 +1,48 @@
+import SwiftUI
+
+struct WeatherPane: View {
+    @ObservedObject var weatherStore: WeatherStore
+
+    var body: some View {
+        VStack(spacing: 8) {
+            if let error = weatherStore.error {
+                Text(error)
+                    .font(.system(size: 11, weight: .medium))
+                    .foregroundStyle(Color.red)
+                    .multilineTextAlignment(.center)
+            } else if let weather = weatherStore.weather {
+                Image(systemName: icon(for: weather.condition))
+                    .font(.system(size: 36, weight: .light))
+                    .foregroundStyle(.white)
+                
+                Text(String(format: "%.1f°", weather.temperature))
+                    .font(.system(size: 24, weight: .semibold))
+                    .foregroundStyle(.white)
+                
+                if let location = weather.locationName {
+                    Text(location)
+                        .font(.system(size: 11, weight: .medium))
+                        .foregroundStyle(Theme.secondary)
+                }
+            } else {
+                ProgressView()
+                    .controlSize(.small)
+            }
+        }
+        .frame(maxWidth: .infinity, maxHeight: .infinity)
+        .padding(.vertical, 16)
+    }
+    
+    private func icon(for code: Int) -> String {
+        switch code {
+        case 0: return "sun.max.fill"
+        case 1...3: return "cloud.sun.fill"
+        case 45, 48: return "cloud.fog.fill"
+        case 51...67: return "cloud.drizzle.fill"
+        case 71...77: return "cloud.snow.fill"
+        case 80...82: return "cloud.heavyrain.fill"
+        case 95...99: return "cloud.bolt.rain.fill"
+        default: return "cloud.fill"
+        }
+    }
+}