Adjust host app to use store

Author: intitni

Core/Sources/HostApp/CustomCommandSettings/CustomCommand.swift

@@ -9,7 +9,6 @@ struct CustomCommandFeature: ReducerProtocol {
     }
 
     let settings: CustomCommandView.Settings
-    let toast: (Text, ToastType) -> Void
 
     enum Action: Equatable {
         case createNewCommand
@@ -18,6 +17,8 @@ struct CustomCommandFeature: ReducerProtocol {
         case deleteCommand(CustomCommand)
     }
 
+    @Dependency(\.toastController) var toastController
+    
     var body: some ReducerProtocol<State, Action> {
         Reduce { state, action in
             switch action {
@@ -43,7 +44,7 @@ struct CustomCommandFeature: ReducerProtocol {
 
             }
         }.ifLet(\.editCustomCommand, action: /Action.editCustomCommand) {
-            EditCustomCommand(settings: settings, toast: toast)
+            EditCustomCommand(settings: settings)
         }
     }
 }

Core/Sources/HostApp/CustomCommandSettings/CustomCommandView.swift

@@ -17,12 +17,7 @@ extension List {
 let customCommandStore = StoreOf<CustomCommandFeature>(
     initialState: .init(),
     reducer: CustomCommandFeature(
-        settings: .init(),
-        toast: { content, type in
-            Task { @MainActor in
-                globalToastController.toast(content: content, type: type)
-            }
-        }
+        settings: .init()
     )
 )
 
@@ -247,10 +242,7 @@ struct CustomCommandView_Preview: PreviewProvider {
                         )
                     )))
                 ),
-                reducer: CustomCommandFeature(
-                    settings: settings,
-                    toast: { _, _ in }
-                )
+                reducer: CustomCommandFeature(settings: settings)
             ),
             settings: settings
         )
@@ -286,10 +278,7 @@ struct CustomCommandView_NoEditing_Preview: PreviewProvider {
                 initialState: .init(
                     editCustomCommand: nil
                 ),
-                reducer: CustomCommandFeature(
-                    settings: settings,
-                    toast: { _, _ in }
-                )
+                reducer: CustomCommandFeature(settings: settings)
             ),
             settings: settings
         )

Core/Sources/HostApp/CustomCommandSettings/EditCustomCommand.swift

@@ -84,7 +84,8 @@ struct EditCustomCommand: ReducerProtocol {
     }
 
     let settings: CustomCommandView.Settings
-    let toast: (Text, ToastType) -> Void
+
+    @Dependency(\.toastController) var toastController
 
     var body: some ReducerProtocol<State, Action> {
         Scope(state: \.sendMessage, action: /Action.sendMessage) {
@@ -109,7 +110,10 @@ struct EditCustomCommand: ReducerProtocol {
             switch action {
             case .saveCommand:
                 guard !state.name.isEmpty else {
-                    toast(Text("Command name cannot be empty."), .error)
+                    toastController.toast(
+                        content: Text("Command name cannot be empty."),
+                        type: .error
+                    )
                     return .none
                 }
 
@@ -154,7 +158,7 @@ struct EditCustomCommand: ReducerProtocol {
                 if state.isNewCommand {
                     settings.customCommands.append(newCommand)
                     state.isNewCommand = false
-                    toast(Text("The command is created."), .info)
+                    toastController.toast(content: Text("The command is created."), type: .info)
                 } else {
                     if let index = settings.customCommands.firstIndex(where: {
                         $0.id == newCommand.id
@@ -163,7 +167,7 @@ struct EditCustomCommand: ReducerProtocol {
                     } else {
                         settings.customCommands.append(newCommand)
                     }
-                    toast(Text("The command is updated."), .info)
+                    toastController.toast(content: Text("The command is updated."), type: .info)
                 }
 
                 return .none

Core/Sources/HostApp/CustomCommandSettings/EditCustomCommandView.swift

@@ -243,8 +243,7 @@ struct EditCustomCommandView_Preview: PreviewProvider {
                     settings: .init(customCommands: .init(
                         wrappedValue: [],
                         "CustomCommandView_Preview"
-                    )),
-                    toast: { _, _ in }
+                    ))
                 )
             )
         )

Core/Sources/HostApp/General.swift

@@ -0,0 +1,84 @@
+import Client
+import ComposableArchitecture
+import Foundation
+import LaunchAgentManager
+import SwiftUI
+
+struct General: ReducerProtocol {
+    struct State: Equatable {
+        var xpcServiceVersion: String?
+        var isAccessibilityPermissionGranted: Bool?
+        var isReloading = false
+    }
+
+    enum Action: Equatable {
+        case appear
+        case setupLaunchAgentIfNeeded
+        case reloadStatus
+        case finishReloading(xpcServiceVersion: String, permissionGranted: Bool)
+        case failedReloading
+    }
+
+    @Dependency(\.toastController) var toastController
+
+    var body: some ReducerProtocol<State, Action> {
+        Reduce { state, action in
+            switch action {
+            case .appear:
+                return .run { send in
+                    await send(.setupLaunchAgentIfNeeded)
+                }
+            case .setupLaunchAgentIfNeeded:
+                return .run { send in
+                    #if DEBUG
+                    // do not auto install on debug build
+                    #else
+                    Task {
+                        do {
+                            try await LaunchAgentManager()
+                                .setupLaunchAgentForTheFirstTimeIfNeeded()
+                        } catch {
+                            toastController.toast(
+                                content: Text(error.localizedDescription),
+                                type: .error
+                            )
+                        }
+                    }
+                    #endif
+                    await send(.reloadStatus)
+                }
+            case .reloadStatus:
+                state.isReloading = true
+                return .run { send in
+                    let service = try getService()
+                    do {
+                        let xpcServiceVersion = try await service.getXPCServiceVersion().version
+                        let isAccessibilityPermissionGranted = try await service
+                            .getXPCServiceAccessibilityPermission()
+                        await send(.finishReloading(
+                            xpcServiceVersion: xpcServiceVersion,
+                            permissionGranted: isAccessibilityPermissionGranted
+                        ))
+                    } catch {
+                        toastController.toast(
+                            content: Text(error.localizedDescription),
+                            type: .error
+                        )
+                        await send(.failedReloading)
+                    }
+                }
+
+            case let .finishReloading(version, granted):
+                state.xpcServiceVersion = version
+                state.isAccessibilityPermissionGranted = granted
+                state.isReloading = false
+                return .none
+                
+            case .failedReloading:
+                state.isReloading = false
+                return .none
+            }
+        }
+    }
+}
+

Core/Sources/HostApp/GeneralView.swift

@@ -1,21 +1,27 @@
 import Client
+import ComposableArchitecture
 import LaunchAgentManager
 import Preferences
 import SwiftUI
 
 struct GeneralView: View {
+    let store: StoreOf<General>
+    
     var body: some View {
         ScrollView {
             VStack(alignment: .leading, spacing: 0) {
                 AppInfoView()
                 Divider()
-                ExtensionServiceView()
+                ExtensionServiceView(store: store)
                 Divider()
                 LaunchAgentView()
                 Divider()
                 GeneralSettingsView()
             }
         }
+        .onAppear {
+            store.send(.appear)
+        }
     }
 }
 
@@ -74,24 +80,28 @@ struct AppInfoView: View {
 }
 
 struct ExtensionServiceView: View {
-    @Environment(\.toast) var toast
-    @State var xpcServiceVersion: String?
-    @State var isAccessibilityPermissionGranted: Bool?
-    @State var isRunningAction = false
+    let store: StoreOf<General>
 
     var body: some View {
         VStack(alignment: .leading) {
-            Text("Extension Service Version: \(xpcServiceVersion ?? "Loading..")")
-            let grantedStatus: String = {
-                guard let isAccessibilityPermissionGranted else { return "Loading.." }
-                return isAccessibilityPermissionGranted ? "Granted" : "Not Granted"
-            }()
-            Text("Accessibility Permission: \(grantedStatus)")
+            WithViewStore(store, observe: { $0.xpcServiceVersion }) { viewStore in
+                Text("Extension Service Version: \(viewStore.state ?? "Loading..")")
+            }
+            
+            WithViewStore(store, observe: { $0.isAccessibilityPermissionGranted }) { viewStore in
+                let grantedStatus: String = {
+                    guard let granted = viewStore.state else { return "Loading.." }
+                    return granted ? "Granted" : "Not Granted"
+                }()
+                Text("Accessibility Permission: \(grantedStatus)")
+            }
 
             HStack {
-                Button(action: { checkStatus() }) {
-                    Text("Refresh")
-                }.disabled(isRunningAction)
+                WithViewStore(store, observe: { $0.isReloading }) { viewStore in
+                    Button(action: { viewStore.send(.reloadStatus) }) {
+                        Text("Refresh")
+                    }.disabled(viewStore.state)
+                }
 
                 Button(action: {
                     Task {
@@ -126,25 +136,6 @@ struct ExtensionServiceView: View {
             }
         }
         .padding()
-        .onAppear {
-            checkStatus()
-        }
-    }
-
-    func checkStatus() {
-        Task {
-            try await Task.sleep(nanoseconds: 2_000_000_000)
-            isRunningAction = true
-            defer { isRunningAction = false }
-            do {
-                let service = try getService()
-                xpcServiceVersion = try await service.getXPCServiceVersion().version
-                isAccessibilityPermissionGranted = try await service
-                    .getXPCServiceAccessibilityPermission()
-            } catch {
-                toast(Text(error.localizedDescription), .error)
-            }
-        }
     }
 }
 
@@ -298,7 +289,7 @@ struct GeneralSettingsView: View {
 
 struct GeneralView_Previews: PreviewProvider {
     static var previews: some View {
-        GeneralView()
+        GeneralView(store: .init(initialState: .init(), reducer: General()))
     }
 }
 

Core/Sources/HostApp/HostApp.swift

@@ -0,0 +1,28 @@
+import Foundation
+import ComposableArchitecture
+
+struct HostApp: ReducerProtocol {
+    struct State: Equatable {
+        var general = General.State()
+    }
+    
+    enum Action: Equatable {
+        case appear
+        case general(General.Action)
+    }
+    
+    var body: some ReducerProtocol<State, Action> {
+        Scope(state: \.general, action: /Action.general) {
+            General()
+        }
+        
+        Reduce { _, action in
+            switch action {
+            case .appear:
+                return .none
+            case .general:
+                return .none
+            }
+        }
+    }
+}