Refactoring

Ice/Main/AppDelegate.swift

@@ -22,9 +22,6 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
 
         // Allow the app to set the cursor in the background.
         appState.setsCursorInBackground = true
-
-        // Set up the shared screen state manager.
-        ScreenStateManager.setUpSharedManager()
     }
 
     func applicationDidFinishLaunching(_ notification: Notification) {

Ice/Main/IceApp.swift

@@ -12,7 +12,7 @@ struct IceApp: App {
 
     init() {
         NSSplitViewItem.swizzle()
-        MigrationManager(appState: appState).migrateAll()
+        MigrationManager.migrateAll(appState: appState)
         appDelegate.assignAppState(appState)
     }
 

Ice/Utilities/MigrationManager.swift

@@ -14,18 +14,20 @@ struct MigrationManager {
 
 extension MigrationManager {
     /// Performs all migrations.
-    func migrateAll() {
+    static func migrateAll(appState: AppState) {
+        let manager = MigrationManager(appState: appState)
+
         do {
             try performAll(blocks: [
-                migrate0_8_0,
-                migrate0_10_0,
+                manager.migrate0_8_0,
+                manager.migrate0_10_0,
             ])
         } catch {
             logError(error)
         }
 
         let results = [
-            migrate0_10_1(),
+            manager.migrate0_10_1(),
         ]
 
         for result in results {
@@ -40,7 +42,7 @@ extension MigrationManager {
         }
     }
 
-    private func logError(_ error: any Error) {
+    private static func logError(_ error: any Error) {
         Logger.migration.error("Migration failed with error: \(error)")
     }
 }
@@ -54,7 +56,7 @@ extension MigrationManager {
         guard !Defaults.bool(forKey: .hasMigrated0_8_0) else {
             return
         }
-        try performAll(blocks: [
+        try MigrationManager.performAll(blocks: [
             migrateHotkeys0_8_0,
             migrateControlItems0_8_0,
             migrateSections0_8_0,
@@ -149,7 +151,7 @@ extension MigrationManager {
 
             // migrate the old autosave name to the new autosave name in UserDefaults
             StatusItemDefaults.migrate(key: .preferredPosition, from: autosaveName, to: identifier)
-            StatusItemDefaults.migrate(key: .isVisible, from: autosaveName, to: identifier)
+            StatusItemDefaults.migrate(key: .visible, from: autosaveName, to: identifier)
 
             // replace the old "controlItem" dictionary with the new one
             sectionDict["controlItem"] = controlItemDict
@@ -181,7 +183,7 @@ extension MigrationManager {
         guard !Defaults.bool(forKey: .hasMigrated0_10_0) else {
             return
         }
-        try performAll(blocks: [
+        try MigrationManager.performAll(blocks: [
             migrateControlItems0_10_0,
         ])
         Defaults.set(true, forKey: .hasMigrated0_10_0)
@@ -223,12 +225,12 @@ extension MigrationManager {
 
         for identifier in ControlItem.Identifier.allCases {
             if
-                StatusItemDefaults[.isVisible, identifier.rawValue] == false,
+                StatusItemDefaults[.visible, identifier.rawValue] == false,
                 StatusItemDefaults[.preferredPosition, identifier.rawValue] == nil
             {
                 needsResetPreferredPositions = true
             }
-            StatusItemDefaults[.isVisible, identifier.rawValue] = nil
+            StatusItemDefaults[.visible, identifier.rawValue] = nil
         }
 
         if needsResetPreferredPositions {
@@ -252,7 +254,7 @@ extension MigrationManager {
 extension MigrationManager {
     /// Performs every block in the given array, catching any thrown
     /// errors and rethrowing them as a combined error.
-    private func performAll(blocks: [() throws -> Void]) throws {
+    private static func performAll(blocks: [() throws -> Void]) throws {
         let results = blocks.map { block in
             Result(catching: block)
         }

Ice/Utilities/StatusItemDefaults.swift

@@ -0,0 +1,58 @@
+//
+//  StatusItemDefaults.swift
+//  Ice
+//
+
+import Cocoa
+
+// MARK: - StatusItemDefaults
+
+/// Proxy getters and setters for a status item's user defaults values.
+enum StatusItemDefaults {
+    /// Accesses the value associated with the specified key and autosave name.
+    static subscript<Value>(key: Key<Value>, autosaveName: String) -> Value? {
+        get {
+            let stringKey = key.stringKey(for: autosaveName)
+            return UserDefaults.standard.object(forKey: stringKey) as? Value
+        }
+        set {
+            let stringKey = key.stringKey(for: autosaveName)
+            return UserDefaults.standard.set(newValue, forKey: stringKey)
+        }
+    }
+
+    /// Migrates the given status item defaults key from an old autosave name
+    /// to a new autosave name.
+    static func migrate<Value>(key: Key<Value>, from oldAutosaveName: String, to newAutosaveName: String) {
+        guard newAutosaveName != oldAutosaveName else {
+            return
+        }
+        Self[key, newAutosaveName] = Self[key, oldAutosaveName]
+        Self[key, oldAutosaveName] = nil
+    }
+}
+
+// MARK: - StatusItemDefaults.Key
+
+extension StatusItemDefaults {
+    /// Keys used to look up user defaults values for status items.
+    struct Key<Value> {
+        /// The raw value of the key.
+        let rawValue: String
+
+        /// Returns the full string key for the given autosave name.
+        func stringKey(for autosaveName: String) -> String {
+            return "NSStatusItem \(rawValue) \(autosaveName)"
+        }
+    }
+}
+
+extension StatusItemDefaults.Key<CGFloat> {
+    /// String key: "NSStatusItem Preferred Position autosaveName"
+    static let preferredPosition = Self(rawValue: "Preferred Position")
+}
+
+extension StatusItemDefaults.Key<Bool> {
+    /// String key: "NSStatusItem Visible autosaveName"
+    static let visible = Self(rawValue: "Visible")
+}