Merge pull request #11 from Kyome22/fix-sonoma-issue

Kyome22 · web-flow · commit 5045eedd0e19 · 2025-02-05T22:34:16.000+09:00
Fix Sonoma issue
diff --git a/ShiftWindow.xcodeproj/xcshareddata/xcschemes/ShiftWindow.xcscheme b/ShiftWindow.xcodeproj/xcshareddata/xcschemes/ShiftWindow.xcscheme
@@ -28,6 +28,16 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "DomainTests"
+               BuildableName = "DomainTests"
+               BlueprintName = "DomainTests"
+               ReferencedContainer = "container:ShiftWindowPackages">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction
diff --git a/ShiftWindowPackages/Sources/Domain/AppDelegate.swift b/ShiftWindowPackages/Sources/Domain/AppDelegate.swift
@@ -41,11 +41,8 @@ public final class AppDelegate: NSObject, NSApplicationDelegate {
     }
 
     public func applicationWillTerminate(_ notification: Notification) {
-        let executeClient = appDependencies.executeClient
-        Task.detached(priority: .background) {
-            if try executeClient.checkIconsVisible() {
-                try executeClient.toggleIconsVisible(false)
-            }
+        if (try? appDependencies.executeClient.checkIconsVisible()) == true {
+            try? appDependencies.executeClient.toggleIconsVisible(false)
         }
     }
 }
diff --git a/ShiftWindowPackages/Sources/Domain/ViewModel/GeneralSettingsViewModel.swift b/ShiftWindowPackages/Sources/Domain/ViewModel/GeneralSettingsViewModel.swift
@@ -28,10 +28,8 @@ import Observation
     private let launchAtLoginRepository: LaunchAtLoginRepository
     private let logService: LogService
 
-    public var launchAtLoginIsEnabled: Bool
-    public var checkForUpdatesIsEnabled: Bool {
-        didSet { checkForUpdatesRepository.switchStatus(checkForUpdatesIsEnabled) }
-    }
+    public var launchAtLogin: Bool
+    public var checkForUpdates: Bool
 
     public init(
         _ nsWorkspaceClient: NSWorkspaceClient,
@@ -43,8 +41,8 @@ import Observation
         self.checkForUpdatesRepository = .init(spuUpdaterClient)
         self.launchAtLoginRepository = .init(smAppServiceClient)
         self.logService = logService
-        launchAtLoginIsEnabled = launchAtLoginRepository.isEnabled
-        checkForUpdatesIsEnabled = checkForUpdatesRepository.isEnabled
+        launchAtLogin = launchAtLoginRepository.isEnabled
+        checkForUpdates = checkForUpdatesRepository.isEnabled
     }
 
     public func onAppear(screenName: String) {
@@ -56,12 +54,17 @@ import Observation
         _ = nsWorkspaceClient.open(URL(string: path)!)
     }
 
-    public func launchAtLoginSwitched(_ isEnabled: Bool) {
-        switch launchAtLoginRepository.switchStatus(isEnabled) {
+    public func toggleLaunchAtLogin(_ isOn: Bool) {
+        switch launchAtLoginRepository.switchStatus(isOn) {
         case .success:
-            launchAtLoginIsEnabled = isEnabled
+            launchAtLogin = isOn
         case let .failure(.switchFailed(value)):
-            launchAtLoginIsEnabled = value
+            launchAtLogin = value
         }
     }
+
+    public func toggleCheckForUpdates(_ isOn: Bool) {
+        checkForUpdates = isOn
+        checkForUpdatesRepository.switchStatus(isOn)
+    }
 }
diff --git a/ShiftWindowPackages/Sources/Domain/ViewModel/MenuViewModel.swift b/ShiftWindowPackages/Sources/Domain/ViewModel/MenuViewModel.swift
@@ -33,9 +33,7 @@ import Observation
     @ObservationIgnored private var task: Task<Void, Never>?
 
     public var patterns = [ShiftPattern]()
-    public var hideIcons: Bool {
-        didSet { toggleIconsVisible(hideIcons) }
-    }
+    public var hideIcons: Bool
     public var canChecksForUpdates = false
 
     public init(
@@ -53,32 +51,28 @@ import Observation
         self.shortcutService = shortcutService
         self.updateService = updateService
         hideIcons = (try? executeClient.checkIconsVisible()) ?? false
-    }
-
-    public func onAppear(screenName: String) {
-        logService.notice(.screenView(name: screenName))
-        task = Task {
+        task = Task { [shortcutService, updateService] in
             await withTaskGroup(of: Void.self) { group in
-                group.addTask {
-                    for await value in await self.shortcutService.patternsStream() {
-                        await MainActor.run {
-                            self.patterns = value
-                        }
+                group.addTask { [weak self] in
+                    for await value in await shortcutService.patternsStream() {
+                        await self?.updatePatterns(value)
                     }
                 }
-                group.addTask {
-                    for await value in await self.updateService.canChecksForUpdatesStream() {
-                        await MainActor.run {
-                            self.canChecksForUpdates = value
-                        }
+                group.addTask { [weak self] in
+                    for await value in await updateService.canChecksForUpdatesStream() {
+                        await self?.updateCanChecksForUpdates(value)
                     }
                 }
             }
         }
     }
 
-    public func onDisappear() {
-        task?.cancel()
+    private func updatePatterns(_ patterns: [ShiftPattern]) {
+        self.patterns = patterns
+    }
+
+    private func updateCanChecksForUpdates(_ canChecksForUpdates: Bool) {
+        self.canChecksForUpdates = canChecksForUpdates
     }
 
     public func shiftWindow(shiftType: ShiftType) async {
@@ -102,13 +96,12 @@ import Observation
         nsAppClient.terminate(nil)
     }
 
-    func toggleIconsVisible(_ value: Bool) {
-        Task.detached(priority: .background) {
-            do {
-                try self.executeClient.toggleIconsVisible(value)
-            } catch {
-                self.logService.critical(.failedExecuteScript(error))
-            }
+    public func toggleIconsVisible(_ value: Bool) {
+        do {
+            try executeClient.toggleIconsVisible(value)
+            hideIcons = value
+        } catch {
+            logService.critical(.failedExecuteScript(error))
         }
     }
 }
diff --git a/ShiftWindowPackages/Sources/Domain/ViewModel/ShortcutSettingsViewModel.swift b/ShiftWindowPackages/Sources/Domain/ViewModel/ShortcutSettingsViewModel.swift
@@ -31,9 +31,7 @@ import SpiceKey
     @ObservationIgnored private var task: Task<Void, Never>?
 
     public var patterns: [ShiftPattern]
-    public var showShortcutPanel: Bool {
-        didSet { userDefaultsRepository.showShortcutPanel = showShortcutPanel }
-    }
+    public var showShortcutPanel: Bool
 
     public init(
         _ userDefaultsClient: UserDefaultsClient,
@@ -49,9 +47,9 @@ import SpiceKey
 
     public func onAppear(screenName: String) {
         logService.notice(.screenView(name: screenName))
-        task = Task {
+        task = Task { [weak self, shortcutService] in
             for await patterns in await shortcutService.patternsStream() {
-                self.patterns = patterns
+                self?.patterns = patterns
             }
         }
     }
@@ -68,4 +66,9 @@ import SpiceKey
             await shortcutService.removeShortcut(id: id)
         }
     }
+
+    public func toggleShowShortcutPanel(_ isOn: Bool) {
+        showShortcutPanel = isOn
+        userDefaultsRepository.showShortcutPanel = isOn
+    }
 }
diff --git a/ShiftWindowPackages/Sources/Presentation/View/GeneralSettingsView.swift b/ShiftWindowPackages/Sources/Presentation/View/GeneralSettingsView.swift
@@ -38,16 +38,19 @@ struct GeneralSettingsView: View {
         Form {
             LabeledContent {
                 Toggle(isOn: Binding<Bool>(
-                    get: { viewModel.launchAtLoginIsEnabled },
-                    set: { viewModel.launchAtLoginSwitched($0) }
+                    get: { viewModel.launchAtLogin },
+                    set: { viewModel.toggleLaunchAtLogin($0) }
                 )) {
                     Text("AutomaticallyLaunchAtLogin", bundle: .module)
                 }
             } label: {
                 Text("launch", bundle: .module)
             }
             LabeledContent {
-                Toggle(isOn: $viewModel.checkForUpdatesIsEnabled) {
+                Toggle(isOn: Binding<Bool>(
+                    get: { viewModel.checkForUpdates },
+                    set: { viewModel.toggleCheckForUpdates($0) }
+                )) {
                     Text("AutomaticallyCheckForUpdates", bundle: .module)
                 }
             } label: {
diff --git a/ShiftWindowPackages/Sources/Presentation/View/MenuView.swift b/ShiftWindowPackages/Sources/Presentation/View/MenuView.swift
@@ -58,7 +58,10 @@ struct MenuView: View {
                 }
             }
             Divider()
-            Toggle(isOn: $viewModel.hideIcons) {
+            Toggle(isOn: Binding<Bool>(
+                get: { viewModel.hideIcons },
+                set: { viewModel.toggleIconsVisible($0) }
+            )) {
                 Text("hideDesktopIcons", bundle: .module)
             }
             Divider()
@@ -88,12 +91,6 @@ struct MenuView: View {
                 Text("terminateApp", bundle: .module)
             }
         }
-        .onAppear {
-            viewModel.onAppear(screenName: String(describing: Self.self))
-        }
-        .onDisappear {
-            viewModel.onDisappear()
-        }
     }
 }
 
diff --git a/ShiftWindowPackages/Sources/Presentation/View/ShortcutSettingsView.swift b/ShiftWindowPackages/Sources/Presentation/View/ShortcutSettingsView.swift
@@ -61,7 +61,10 @@ struct ShortcutSettingsView: View {
             }
             Divider()
             LabeledContent {
-                Toggle(isOn: $viewModel.showShortcutPanel) {
+                Toggle(isOn: Binding<Bool>(
+                    get: { viewModel.showShortcutPanel },
+                    set: { viewModel.toggleShowShortcutPanel($0) }
+                )) {
                     Text("enable", bundle: .module)
                 }
             } label: {
diff --git a/ShiftWindowPackages/Tests/DomainTests/ViewModelTests/GeneralSettingsViewModelTests.swift b/ShiftWindowPackages/Tests/DomainTests/ViewModelTests/GeneralSettingsViewModelTests.swift
@@ -23,48 +23,48 @@ final class GeneralSettingsViewModelTests: XCTestCase {
     }
 
     @MainActor
-    func test_launchAtLoginSwitched_有効の要求_成功した_有効に変更される() async {
+    func test_toggleLaunchAtLogin_有効の要求_成功した_有効に変更される() async {
         let currentStatus = OSAllocatedUnfairLock(initialState: SMAppService.Status.notRegistered)
         let smAppServiceClient = testDependency(of: SMAppServiceClient.self) {
             $0.status = { currentStatus.withLock(\.self) }
             $0.register = { currentStatus.withLock { $0 = .enabled } }
         }
         let sut = GeneralSettingsViewModel(.testValue, .testValue, smAppServiceClient, .init(.testValue))
-        sut.launchAtLoginSwitched(true)
-        XCTAssertTrue(sut.launchAtLoginIsEnabled)
+        sut.toggleLaunchAtLogin(true)
+        XCTAssertTrue(sut.launchAtLogin)
     }
 
     @MainActor
-    func test_launchAtLoginSwitched_有効の要求_失敗した_無効に戻される() async {
+    func test_toggleLaunchAtLogin_有効の要求_失敗した_無効に戻される() async {
         let smAppServiceClient = testDependency(of: SMAppServiceClient.self) {
             $0.status = { .notRegistered }
             $0.register = { throw NSError(domain: "", code: kSMErrorInternalFailure) }
         }
         let sut = GeneralSettingsViewModel(.testValue, .testValue, smAppServiceClient, .init(.testValue))
-        sut.launchAtLoginSwitched(true)
-        XCTAssertFalse(sut.launchAtLoginIsEnabled)
+        sut.toggleLaunchAtLogin(true)
+        XCTAssertFalse(sut.launchAtLogin)
     }
 
     @MainActor
-    func test_launchAtLoginSwitched_無効の要求_成功した_無効に変更される() async {
+    func test_toggleLaunchAtLogin_無効の要求_成功した_無効に変更される() async {
         let currentStatus = OSAllocatedUnfairLock(initialState: SMAppService.Status.enabled)
         let smAppServiceClient = testDependency(of: SMAppServiceClient.self) {
             $0.status = { currentStatus.withLock(\.self) }
             $0.unregister = { currentStatus.withLock { $0 = .notRegistered } }
         }
         let sut = GeneralSettingsViewModel(.testValue, .testValue, smAppServiceClient, .init(.testValue))
-        sut.launchAtLoginSwitched(false)
-        XCTAssertFalse(sut.launchAtLoginIsEnabled)
+        sut.toggleLaunchAtLogin(false)
+        XCTAssertFalse(sut.launchAtLogin)
     }
 
     @MainActor
-    func test_launchAtLoginSwitched_無効の要求_失敗した_有効に戻される() async {
+    func test_toggleLaunchAtLogin_無効の要求_失敗した_有効に戻される() async {
         let smAppServiceClient = testDependency(of: SMAppServiceClient.self) {
             $0.status = { .enabled }
             $0.unregister = { throw NSError(domain: "", code: kSMErrorInternalFailure) }
         }
         let sut = GeneralSettingsViewModel(.testValue, .testValue, smAppServiceClient, .init(.testValue))
-        sut.launchAtLoginSwitched(false)
-        XCTAssertTrue(sut.launchAtLoginIsEnabled)
+        sut.toggleLaunchAtLogin(false)
+        XCTAssertTrue(sut.launchAtLogin)
     }
 }
diff --git a/ShiftWindowPackages/Tests/DomainTests/ViewModelTests/MenuViewModelTests.swift b/ShiftWindowPackages/Tests/DomainTests/ViewModelTests/MenuViewModelTests.swift
@@ -83,4 +83,38 @@ final class MenuViewModelTests: XCTestCase {
         sut.terminateApp()
         XCTAssertEqual(count.withLock(\.self), 1)
     }
+
+    @MainActor
+    func test_toggleIconsVisible_変更の要求_成功した_変更される() {
+        let executeClient = testDependency(of: ExecuteClient.self) {
+            $0.toggleIconsVisible = { _ in }
+        }
+        let sut = MenuViewModel(
+            executeClient,
+            .testValue,
+            .init(.testValue),
+            .init(.testValue, .testValue, .testValue, .testValue, .testValue),
+            .init(.testValue, .testValue, .testValue),
+            .init(.testValue)
+        )
+        sut.toggleIconsVisible(true)
+        XCTAssertTrue(sut.hideIcons)
+    }
+
+    @MainActor
+    func test_toggleIconsVisible_変更の要求_失敗した_変更されない() {
+        let executeClient = testDependency(of: ExecuteClient.self) {
+            $0.toggleIconsVisible = { _ in throw CocoaError(.fileNoSuchFile) }
+        }
+        let sut = MenuViewModel(
+            executeClient,
+            .testValue,
+            .init(.testValue),
+            .init(.testValue, .testValue, .testValue, .testValue, .testValue),
+            .init(.testValue, .testValue, .testValue),
+            .init(.testValue)
+        )
+        sut.toggleIconsVisible(true)
+        XCTAssertFalse(sut.hideIcons)
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -41,11 +41,8 @@ public final class AppDelegate: NSObject, NSApplicationDelegate {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`public func applicationWillTerminate(_ notification: Notification) {`
`44`		`- let executeClient = appDependencies.executeClient`
`45`		`- Task.detached(priority: .background) {`
`46`		`- if try executeClient.checkIconsVisible() {`
`47`		`- try executeClient.toggleIconsVisible(false)`
`48`		`- }`
	`44`	`+ if (try? appDependencies.executeClient.checkIconsVisible()) == true {`
	`45`	`+ try? appDependencies.executeClient.toggleIconsVisible(false)`
`49`	`46`	`}`
`50`	`47`	`}`
`51`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,9 +31,7 @@ import SpiceKey`
`31`	`31`	`@ObservationIgnored private var task: Task<Void, Never>?`
`32`	`32`
`33`	`33`	`public var patterns: [ShiftPattern]`
`34`		`- public var showShortcutPanel: Bool {`
`35`		`- didSet { userDefaultsRepository.showShortcutPanel = showShortcutPanel }`
`36`		`- }`
	`34`	`+ public var showShortcutPanel: Bool`
`37`	`35`
`38`	`36`	`public init(`
`39`	`37`	`_ userDefaultsClient: UserDefaultsClient,`
`@@ -49,9 +47,9 @@ import SpiceKey`
`49`	`47`
`50`	`48`	`public func onAppear(screenName: String) {`
`51`	`49`	`logService.notice(.screenView(name: screenName))`
`52`		`- task = Task {`
	`50`	`+ task = Task { [weak self, shortcutService] in`
`53`	`51`	`for await patterns in await shortcutService.patternsStream() {`
`54`		`- self.patterns = patterns`
	`52`	`+ self?.patterns = patterns`
`55`	`53`	`}`
`56`	`54`	`}`
`57`	`55`	`}`
`@@ -68,4 +66,9 @@ import SpiceKey`
`68`	`66`	`await shortcutService.removeShortcut(id: id)`
`69`	`67`	`}`
`70`	`68`	`}`
	`69`	`+`
	`70`	`+ public func toggleShowShortcutPanel(_ isOn: Bool) {`
	`71`	`+ showShortcutPanel = isOn`
	`72`	`+ userDefaultsRepository.showShortcutPanel = isOn`
	`73`	`+ }`
`71`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,10 @@ struct MenuView: View {`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`	`Divider()`
`61`		`- Toggle(isOn: $viewModel.hideIcons) {`
	`61`	`+ Toggle(isOn: Binding<Bool>(`
	`62`	`+ get: { viewModel.hideIcons },`
	`63`	`+ set: { viewModel.toggleIconsVisible($0) }`
	`64`	`+ )) {`
`62`	`65`	`Text("hideDesktopIcons", bundle: .module)`
`63`	`66`	`}`
`64`	`67`	`Divider()`
`@@ -88,12 +91,6 @@ struct MenuView: View {`
`88`	`91`	`Text("terminateApp", bundle: .module)`
`89`	`92`	`}`
`90`	`93`	`}`
`91`		`- .onAppear {`
`92`		`- viewModel.onAppear(screenName: String(describing: Self.self))`
`93`		`- }`
`94`		`- .onDisappear {`
`95`		`- viewModel.onDisappear()`
`96`		`- }`
`97`	`94`	`}`
`98`	`95`	`}`
`99`	`96`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,10 @@ struct ShortcutSettingsView: View {`
`61`	`61`	`}`
`62`	`62`	`Divider()`
`63`	`63`	`LabeledContent {`
`64`		`- Toggle(isOn: $viewModel.showShortcutPanel) {`
	`64`	`+ Toggle(isOn: Binding<Bool>(`
	`65`	`+ get: { viewModel.showShortcutPanel },`
	`66`	`+ set: { viewModel.toggleShowShortcutPanel($0) }`
	`67`	`+ )) {`
`65`	`68`	`Text("enable", bundle: .module)`
`66`	`69`	`}`
`67`	`70`	`} label: {`