Using the new observation framework

mikaelacaron · Oct 9, 2023 · 06263f3 · 06263f3
1 parent ff08495
commit 06263f3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/Basic-Car-Maintenance/Shared/BasicCarMaintenanceApp.swift b/Basic-Car-Maintenance/Shared/BasicCarMaintenanceApp.swift
@@ -10,13 +10,13 @@ import SwiftUI
 
 @main
 struct BasicCarMaintenanceApp: App {
-    private let actionService = ActionService.shared
+    @State private var actionService = ActionService.shared
     @UIApplicationDelegateAdaptor(AppDelegate.self) var delegate
 
     var body: some Scene {
         WindowGroup {
             MainTabView()
-                .environmentObject(actionService)
+                .environment(actionService)
         }
     }
 }
@@ -25,7 +25,8 @@ class AppDelegate: NSObject, UIApplicationDelegate {
     private let actionService = ActionService.shared
 
     func application(
-        _ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil
+        _ application: UIApplication,
+        didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil
     ) -> Bool {
         FirebaseApp.configure()
         return true

diff --git a/Basic-Car-Maintenance/Shared/Dashboard/Views/DashboardView.swift b/Basic-Car-Maintenance/Shared/Dashboard/Views/DashboardView.swift
@@ -8,7 +8,7 @@
 import SwiftUI
 
 struct DashboardView: View {
-    @EnvironmentObject var actionService: ActionService
+    @Environment(ActionService.self) var actionService
     @Environment(\.scenePhase) var scenePhase
     @State private var isShowingAddView = false
     @Bindable private var viewModel: DashboardViewModel

diff --git a/Basic-Car-Maintenance/Shared/MainTabView.swift b/Basic-Car-Maintenance/Shared/MainTabView.swift
@@ -12,8 +12,9 @@ enum TabSelection: Int {
     case settings = 1
 }
 
+@MainActor
 struct MainTabView: View {
-    @EnvironmentObject var actionService: ActionService
+    @Environment(ActionService.self) var actionService
     @Environment(\.scenePhase) var scenePhase
     @State var authenticationViewModel = AuthenticationViewModel()
     @State var selectedTab: TabSelection = .dashboard

diff --git a/Basic-Car-Maintenance/Shared/Settings/Views/SettingsView.swift b/Basic-Car-Maintenance/Shared/Settings/Views/SettingsView.swift
@@ -11,9 +11,9 @@ struct SettingsView: View {
     @State private var viewModel: SettingsViewModel
     @State private var isShowingAddVehicle = false
     @State private var showDeleteVehicleError = false
-    @EnvironmentObject var actionService: ActionService
+    @Environment(ActionService.self) var actionService
     @Environment(\.scenePhase) var scenePhase
-    @State var errorDetails: Error?
+    @State private var errorDetails: Error?
 
     init(authenticationViewModel: AuthenticationViewModel) {
         let settingsViewModel = SettingsViewModel(authenticationViewModel: authenticationViewModel)