Merge branch 'release/2022.1'

Author: intitni

AbnormalMouse.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -68,6 +68,7 @@ struct TheApp: Domain {
         var purchaseManager: PurchaseManagerType
         var updater: Updater
         var activatorConflictChecker: ActivatorConflictChecker
+        var launchAtLoginManager: LaunchAtLoginManagerType
 
         let overrideControllers: [OverrideController]
     }
@@ -143,7 +144,8 @@ struct TheApp: Domain {
                         persisted: $0.persisted,
                         activatorConflictChecker: $0.activatorConflictChecker,
                         purchaseManager: $0.purchaseManager,
-                        updater: $0.updater
+                        updater: $0.updater,
+                        launchAtLoginManager: $0.launchAtLoginManager
                     )
                 }
             }
@@ -164,6 +166,7 @@ extension Store where Action == TheApp.Action, State == TheApp.State {
                 purchaseManager: FakePurchaseManager(),
                 updater: FakeUpdater(),
                 activatorConflictChecker: .init(persisted: Readonly(persisted)),
+                launchAtLoginManager: FakeLaunchAtLoginManager(),
                 overrideControllers: []
             ))
         )

AbnormalMouse/AbnormalMouse.xcodeproj/project.pbxproj

@@ -12,6 +12,8 @@ private let userDefaults = MemoryPropertyListStorage()
 private let persisted = Persisted(userDefaults: userDefaults)
 private let eventHook = FakeCGEventHook()
 private let purchaseManager = FakePurchaseManager()
+private let launchAtLoginManager = FakeLaunchAtLoginManager()
+private let updater = FakeUpdater()
 #else
 private let persisted = Persisted(userDefaults: UserDefaults.standard)
 private let eoi: Set<CGEventType> = {
@@ -26,6 +28,8 @@ private let eoi: Set<CGEventType> = {
 
 private let eventHook = CGEventHook(eventsOfInterest: eoi)
 private let purchaseManager = RealPurchaseManager()
+private let launchAtLoginManager = LaunchAtLoginManager()
+private let updater = SparkleUpdater()
 #endif
 
 private let store = TheApp.Store(
@@ -34,8 +38,9 @@ private let store = TheApp.Store(
     environment: .live(environment: .init(
         persisted: persisted,
         purchaseManager: purchaseManager,
-        updater: SparkleUpdater(),
+        updater: updater,
         activatorConflictChecker: .init(persisted: Readonly(persisted)),
+        launchAtLoginManager: launchAtLoginManager,
         overrideControllers: [
             MoveToScrollController(
                 persisted: Readonly(persisted.moveToScroll),
@@ -80,8 +85,6 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         #if !PREVIEW
         defer { persisted.launchCount += 1 }
         purchaseManager.startTrialIfNeeded()
-        killLauncherIfNeeded()
-        setupStartAtLoginIfNeeded()
         startupPurchaseManager()
         observeForSleeps()
         presentWindowIfNeeded()
@@ -107,7 +110,6 @@ extension AppDelegate {
         NSApp.setActivationPolicy(.regular)
         if let window = window {
             window.makeKeyAndOrderFront(self)
-            NSApp.activate(ignoringOtherApps: true)
         } else {
             let window = NSWindow(
                 contentRect: NSRect(x: 0, y: 0, width: 700, height: 400),
@@ -129,6 +131,7 @@ extension AppDelegate {
             window.makeKeyAndOrderFront(self)
             self.window = window
         }
+        NSApp.activate(ignoringOtherApps: true)
     }
 
     @objc private func buildStatusBarMenu() {
@@ -227,31 +230,11 @@ extension AppDelegate: NSMenuDelegate {
 
 extension AppDelegate: NSWindowDelegate {
     func windowWillClose(_: Notification) {
-        NSApp.setActivationPolicy(.prohibited)
+        NSApp.setActivationPolicy(.accessory)
     }
 }
 
 extension AppDelegate {
-    private func killLauncherIfNeeded() {
-        let runningApps = NSWorkspace.shared.runningApplications
-        let isRunning = !runningApps
-            .filter { $0.bundleIdentifier == LaunchAtLoginConstants.launcherIdentifier }
-            .isEmpty
-
-        if isRunning {
-            DistributedNotificationCenter.default().post(
-                name: .killLauncher,
-                object: Bundle.main.bundleIdentifier!
-            )
-        }
-    }
-
-    private func setupStartAtLoginIfNeeded() {
-        let shouldStartAtLogin = persisted.general.startAtLogin
-        let launcherIdentifier = LaunchAtLoginConstants.launcherIdentifier
-        SMLoginItemSetEnabled(launcherIdentifier as CFString, shouldStartAtLogin)
-    }
-
     private func checkAuthorization() {
         let isTrusted = AXIsProcessTrusted()
         ViewStore(store).send(.setAccessabilityAuthorized(isTrusted))
@@ -321,7 +304,7 @@ extension AppDelegate {
         if persisted.launchCount == 0 {
             showSettingsWindow()
         } else {
-            NSApp.setActivationPolicy(.prohibited)
+            NSApp.setActivationPolicy(.accessory)
         }
     }
 }

AbnormalMouse/AbnormalMouse/App.swift

@@ -58,6 +58,7 @@ enum GeneralDomain: Domain {
         let persisted: Persisted.General
         let purchaseManager: PurchaseManagerType
         let updater: Updater?
+        let launchAtLoginManager: LaunchAtLoginManagerType
     }
 
     enum CancellableKeys: Hashable {
@@ -70,14 +71,14 @@ enum GeneralDomain: Domain {
             case .appear:
                 state.automaticallyCheckForUpdate = environment.updater?
                     .automaticallyChecksForUpdates ?? false
+                state.startAtLogin = environment.launchAtLoginManager.launchAtLogin
                 return .none
             case .toggleStartAtLogin:
                 state.startAtLogin.toggle()
                 let shouldStartAtLogin = state.startAtLogin
                 return .fireAndForget {
-                    environment.persisted.startAtLogin = shouldStartAtLogin
-                    let launcherIdentifier = LaunchAtLoginConstants.launcherIdentifier
-                    SMLoginItemSetEnabled(launcherIdentifier as CFString, shouldStartAtLogin)
+                    let manager = environment.launchAtLoginManager
+                    manager.launchAtLogin = shouldStartAtLogin
                 }
             case .observePurchaseState:
                 return environment.purchaseManager.purchaseState
@@ -218,7 +219,8 @@ extension Store where State == GeneralDomain.State, Action == GeneralDomain.Acti
         environment: .live(environment: .init(
             persisted: .init(),
             purchaseManager: FakePurchaseManager(),
-            updater: FakeUpdater()
+            updater: FakeUpdater(),
+            launchAtLoginManager: FakeLaunchAtLoginManager()
         ))
     )
 }

AbnormalMouse/AbnormalMouse/AppDelegate.swift

@@ -12,6 +12,7 @@ struct MainDomain: Domain {
         var activatorConflictChecker: ActivatorConflictChecker
         var purchaseManager: PurchaseManagerType
         var updater: Updater
+        var launchAtLoginManager: LaunchAtLoginManagerType
     }
 
     struct State: Equatable {
@@ -155,7 +156,8 @@ struct MainDomain: Domain {
                     .init(
                         persisted: $0.persisted.general,
                         purchaseManager: $0.purchaseManager,
-                        updater: $0.updater
+                        updater: $0.updater,
+                        launchAtLoginManager: $0.launchAtLoginManager
                     )
                 }
             }
@@ -191,7 +193,8 @@ extension Store where Action == MainDomain.Action, State == MainDomain.State {
                 persisted: persisted,
                 activatorConflictChecker: .init(persisted: Readonly(persisted)),
                 purchaseManager: FakePurchaseManager(),
-                updater: FakeUpdater()
+                updater: FakeUpdater(),
+                launchAtLoginManager: FakeLaunchAtLoginManager()
             ))
         )
     }

AbnormalMouse/AbnormalMouse/Features/General/GeneralDomain.swift

@@ -0,0 +1,16 @@
+protocol LaunchAtLoginManagerType: AnyObject {
+    var launchAtLogin: Bool { get set }
+}
+
+final class FakeLaunchAtLoginManager: LaunchAtLoginManagerType {
+    var launchAtLogin: Bool = false
+}
+
+import LaunchAtLogin
+
+final class LaunchAtLoginManager: LaunchAtLoginManagerType {
+    var launchAtLogin: Bool {
+        get { LaunchAtLogin.isEnabled }
+        set { LaunchAtLogin.isEnabled = newValue }
+    }
+}