Swiftui 6 related changes

DatWeatherDoe.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,5 +1,5 @@
 {
-  "originHash" : "2ecd2da1a055fe68770a610bd4a2ebb61dd5863b1916b7c029bc31d4b431fb0f",
+  "originHash" : "63091535703c641c976bb81ec8c72ec90356d9cf63775f9adf7d66d3261479dc",
   "pins" : [
     {
       "identity" : "collectionconcurrencykit",
@@ -19,6 +19,15 @@
         "version" : "1.8.2"
       }
     },
+    {
+      "identity" : "menubarextraaccess",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/orchetect/MenuBarExtraAccess",
+      "state" : {
+        "revision" : "f5896b47e15e114975897354c7e1082c51a2bffd",
+        "version" : "1.0.5"
+      }
+    },
     {
       "identity" : "reachability.swift",
       "kind" : "remoteSourceControl",

DatWeatherDoe/API/NetworkClient.swift

@@ -12,7 +12,7 @@ protocol NetworkClientType {
     func performRequest(url: URL) async throws -> Data
 }
 
-final class NetworkClient: NetworkClientType {
+final actor NetworkClient: NetworkClientType {
     func performRequest(url: URL) async throws -> Data {
         try await URLSession.shared.data(from: url).0
     }

DatWeatherDoe/API/Response/SunriseSunsetData.swift

@@ -9,16 +9,10 @@
 import Foundation
 
 struct SunriseSunsetData: Decodable {
-    let isDay: Int
     let sunrise: String
     let sunset: String
 
     private enum CodingKeys: String, CodingKey {
-        case isDay = "is_sun_up"
         case sunrise, sunset
     }
-
-    var isDayBool: Bool {
-        isDay > 0
-    }
 }

DatWeatherDoe/API/Response/WeatherAPIResponse.swift

@@ -11,6 +11,7 @@ import Foundation
 struct WeatherAPIResponse: Decodable {
     let locationName: String
     let temperatureData: TemperatureData
+    let isDay: Int
     let weatherConditionCode: Int
     let humidity: Int
     let windData: WindData
@@ -25,6 +26,7 @@ struct WeatherAPIResponse: Decodable {
     }
 
     private enum CurrentKeys: String, CodingKey {
+        case isDay = "is_day"
         case condition, humidity
     }
 
@@ -48,6 +50,8 @@ struct WeatherAPIResponse: Decodable {
         temperatureData = try container.decode(TemperatureData.self, forKey: .current)
 
         let currentContainer = try container.nestedContainer(keyedBy: CurrentKeys.self, forKey: .current)
+        isDay = try currentContainer.decode(Int.self, forKey: .isDay)
+
         let weatherConditionContainer = try currentContainer.nestedContainer(
             keyedBy: WeatherConditionKeys.self,
             forKey: .condition
@@ -69,4 +73,8 @@ struct WeatherAPIResponse: Decodable {
             )
         }
     }
+
+    var isDayBool: Bool {
+        isDay > 0
+    }
 }

DatWeatherDoe/Config/ConfigManager.swift

@@ -12,7 +12,7 @@ import SwiftUI
 protocol ConfigManagerType: AnyObject {
     var measurementUnit: String { get set }
     var weatherSource: String { get set }
-    var weatherSourceText: String? { get set }
+    var weatherSourceText: String { get set }
     var refreshInterval: TimeInterval { get set }
     var isShowingWeatherIcon: Bool { get set }
     var isShowingHumidity: Bool { get set }
@@ -32,10 +32,10 @@ final class ConfigManager: ConfigManagerType {
     public var measurementUnit = MeasurementUnit.imperial.rawValue
 
     @AppStorage("weatherSource")
-    public var weatherSource = WeatherSource.location.rawValue
+    public var weatherSource = WeatherSource.latLong.rawValue
 
     @AppStorage("weatherSourceText")
-    public var weatherSourceText: String?
+    public var weatherSourceText = ""
 
     @AppStorage("refreshInterval")
     public var refreshInterval = RefreshInterval.fifteenMinutes.rawValue
@@ -66,7 +66,7 @@ final class ConfigManager: ConfigManagerType {
 
     func updateWeatherSource(_ source: WeatherSource, sourceText: String) {
         weatherSource = source.rawValue
-        weatherSourceText = source == .location ? nil : sourceText
+        weatherSourceText = source == .location ? "" : sourceText
     }
 
     func setConfigOptions(_ options: ConfigOptions) {

DatWeatherDoe/DatWeatherDoeApp.swift

@@ -0,0 +1,72 @@
+//
+//  DatWeatherDoeApp.swift
+//  DatWeatherDoe
+//
+//  Created by Inder Dhir on 6/17/24.
+//  Copyright © 2024 Inder Dhir. All rights reserved.
+//
+
+import MenuBarExtraAccess
+import OSLog
+import SwiftUI
+
+@main
+struct DatWeatherDoeApp: App {
+    @State private var configManager: ConfigManager
+    @ObservedObject private var viewModel: WeatherViewModel
+    @State private var isMenuPresented: Bool = false
+    @State private var statusItem: NSStatusItem?
+
+    init() {
+        configManager = ConfigManager()
+
+        let logger = Logger(subsystem: Bundle.main.bundleIdentifier ?? "bundleID", category: "main")
+        viewModel = WeatherViewModel(
+            locationFetcher: SystemLocationFetcher(logger: logger),
+            weatherFactory: WeatherRepositoryFactory(
+                appId: APIKeyParser().parse(),
+                networkClient: NetworkClient(),
+                logger: logger
+            ),
+            configManager: ConfigManager(),
+            logger: logger
+        )
+    }
+
+    var body: some Scene {
+        MenuBarExtra(
+            content: {
+                MenuView(
+                    viewModel: viewModel,
+                    onSeeWeather: {
+                        viewModel.seeForecastForCurrentCity()
+                        closePopover()
+                    },
+                    onRefresh: {
+                        viewModel.getUpdatedWeatherAfterRefresh()
+                        closePopover()
+                    },
+                    onSave: {
+                        viewModel.getUpdatedWeatherAfterRefresh()
+                        closePopover()
+                    }
+                )
+            },
+            label: {
+                StatusBarView(weatherResult: viewModel.weatherResult)
+                    .onAppear {
+                        viewModel.getUpdatedWeatherAfterRefresh()
+                    }
+            }
+        )
+        .menuBarExtraAccess(isPresented: $isMenuPresented) { statusItem in
+            self.statusItem = statusItem
+        }
+        .windowStyle(.hiddenTitleBar)
+        .menuBarExtraStyle(.window)
+    }
+
+    private func closePopover() {
+        statusItem?.togglePresented()
+    }
+}