Unify whitespace

Author: ApolloZhu

Dynamic/Auxiliary/Notification.swift

@@ -22,8 +22,9 @@ enum UserNotification {
             case "issues.new": self = .reportBug
             default:
                 guard let last = rawValue.split(separator: ".").last
-                    , let id = Int(last) else { return nil }
-                        self = .issue(id: id)
+                    , let id = Int(last)
+                    else { return nil }
+                self = .issue(id: id)
             }
         }
 

Dynamic/Components/Appearance/AppleInterfaceStyle+NSAppearance.swift

@@ -35,7 +35,7 @@ extension AppleInterfaceStyle {
     static var current: AppleInterfaceStyle {
         return isDark ? .darkAqua : .aqua
     }
-
+    
     static var isDark: Bool {
         return NSAppearance.current.isDark
     }

Dynamic/Components/Appearance/AppleScriptHelper.swift

@@ -58,7 +58,7 @@ extension AppleScript {
             showErrorThenRedirect()
         }
     }
-
+    
     public static func showErrorThenRedirect() {
         runModal(ofNSAlert: { alert in
             alert.alertStyle = .critical
@@ -76,11 +76,11 @@ extension AppleScript {
             redirectToSystemPreferences()
         })
     }
-
+    
     public static func redirectToSystemPreferences() {
         openURL("x-apple.systempreferences:com.apple.preference.security?Privacy_Automation")
     }
-
+    
     public static func requestPermission(
         retryOnInternalError: Bool = true,
         then process: @escaping Handler<Bool>

Dynamic/Components/Preferences.swift

@@ -41,13 +41,13 @@ extension Preferences {
 
 extension Preferences {
     private static var handles: [NSKeyValueObservation] = []
-
+    
     public static func stopObserving() {
         StatusBarItem.only.stopObserving()
         handles.lazy.forEach { $0.invalidate() }
         handles = []
     }
-
+    
     public static func startObserving() {
         stopObserving()
         StatusBarItem.only.startObserving()
@@ -164,7 +164,7 @@ extension Preferences {
             setPreferred(to: newValue)
         }
     }
-
+    
     @objc dynamic var scheduleType: Int {
         get {
             return preferences.integer(forKey: #function)
@@ -173,7 +173,7 @@ extension Preferences {
             setPreferred(to: newValue)
         }
     }
-
+    
     var scheduleZenithType: Zenith {
         get {
             return Zenith(rawValue: scheduleType) ?? .official
@@ -243,7 +243,7 @@ extension Preferences {
             })
         }
     }
-
+    
     var placemark: String? {
         get {
             return preferences.string(forKey: #function)
@@ -252,7 +252,7 @@ extension Preferences {
             setPreferred(to: newValue)
         }
     }
-
+    
     @objc dynamic var rawSettingsStyle: Int {
         get {
             return preferences.integer(forKey: #function)
@@ -261,7 +261,7 @@ extension Preferences {
             setPreferred(to: newValue)
         }
     }
-
+    
     var settingsStyle: StatusBarItem.Style {
         get {
             return StatusBarItem.Style(rawValue: rawSettingsStyle) ?? .menu
@@ -270,7 +270,7 @@ extension Preferences {
             rawSettingsStyle = newValue.rawValue
         }
     }
-
+    
     var toggleShortcutKey: String {
         return "toggleShortcut"
     }

Dynamic/Components/Scheduler/Scheduler.swift

@@ -150,9 +150,12 @@ public final class Scheduler: NSObject {
 
     private override init() {
         super.init()
-        for name in [NSWorkspace.didWakeNotification,
-                     NSWorkspace.screensDidWakeNotification,
-                     NSWorkspace.sessionDidBecomeActiveNotification] {
+        let notifications = [
+            NSWorkspace.didWakeNotification,
+            NSWorkspace.screensDidWakeNotification,
+            NSWorkspace.sessionDidBecomeActiveNotification
+        ]
+        for name in notifications {
             NSWorkspace.shared.notificationCenter.addObserver(
                 self, selector: #selector(workspaceDidWake),
                 name: name, object: nil

Dynamic/View Controller/Access Points/StatusBarItem.swift

@@ -11,7 +11,7 @@ import Cocoa
 public final class StatusBarItem {
     public static let only = StatusBarItem()
     private init() { }
-
+    
     enum Style: Int {
         case menu
         case rightClick
@@ -38,7 +38,7 @@ public final class StatusBarItem {
             AppleInterfaceStyle.Coordinator.toggleInterfaceStyle()
         }
     }
-
+    
     private func buildMenu() -> NSMenu {
         let menu = NSMenu()
         let toggleItem = NSMenuItem(

Dynamic/View Controller/Settings/SettingsViewController.swift

@@ -29,11 +29,11 @@ class SettingsViewController: NSViewController {
         NSApp.activate(ignoringOtherApps: true)
         window?.makeKeyAndOrderFront(nil)
     }
-
+    
     @IBAction func close(_ sender: Any) {
         SettingsViewController.window?.close()
     }
-
+    
     override func viewDidAppear() {
         super.viewDidAppear()
         // The following is required to attach touchbar to a view controller.
@@ -42,12 +42,12 @@ class SettingsViewController: NSViewController {
         view.window?.bind(NSBindingName(rawValue: #keyPath(touchBar)), to: self, withKeyPath: #keyPath(touchBar), options: nil)
         NSUserDefaultsController.shared.appliesImmediately = true
     }
-
+    
     override func viewDidDisappear() {
         super.viewDidDisappear()
         UserNotification.removeAll()
     }
-
+    
     @IBAction func reSetup(_ sender: Any) {
         let name = Bundle.main.bundleIdentifier!
         preferences.removePersistentDomain(forName: name)

Dynamic/View Controller/Settings/TouchBarForSettingsVC.swift

@@ -15,7 +15,7 @@ extension SettingsViewController: NSTouchBarDelegate {
         touchBar.defaultItemIdentifiers = [.thresholdPopoverItem, .scheduleTypePopoverItem]
         return touchBar
     }
-
+    
     func touchBar(_ touchBar: NSTouchBar, makeItemForIdentifier identifier: NSTouchBarItem.Identifier) -> NSTouchBarItem? {
         let defaultsController = NSUserDefaultsController.shared
         switch identifier {
@@ -71,7 +71,7 @@ extension SettingsViewController: NSScrubberDataSource, NSScrubberDelegate {
     func numberOfItems(for scrubber: NSScrubber) -> Int {
         return 5
     }
-
+    
     func scrubber(_ scrubber: NSScrubber, viewForItemAt index: Int) -> NSScrubberItemView {
         let view = NSScrubberTextItemView()
         switch index {
@@ -90,7 +90,7 @@ extension SettingsViewController: NSScrubberDataSource, NSScrubberDelegate {
         }
         return view
     }
-
+    
     func scrubber(_ scrubber: NSScrubber, didSelectItemAt selectedIndex: Int) {
         preferences.scheduleType = selectedIndex
     }

Dynamic/View Controller/Welcome/AllowLocationViewController.swift

@@ -10,7 +10,7 @@ import Cocoa
 import CoreLocation
 
 class AllowLocationViewController: NSViewController, LastSetupStep {
-
+    
     @IBOutlet weak var showPreferences: NSButton!
 
     var whenNotAuthorized: Bool {
@@ -21,7 +21,7 @@ class AllowLocationViewController: NSViewController, LastSetupStep {
             return true
         }
     }
-
+    
     override func viewDidAppear() {
         super.viewDidAppear()
         guard whenNotAuthorized else { return }
@@ -38,20 +38,20 @@ class AllowLocationViewController: NSViewController, LastSetupStep {
             }
         }
     }
-
+    
     // MARK: - Navigation
-
+    
     @IBAction func skip(_ sender: Any) {
         showNextOnce()
     }
-
+    
     @IBAction func openPreferences(_ sender: NSButton) {
         guard whenNotAuthorized else { return }
         redirectToSystemPreferences()
     }
-
+    
     private var firstTime = true
-
+    
     func showNextOnce() {
         if firstTime {
             firstTime = false
@@ -94,7 +94,7 @@ extension AllowLocationViewController: CLLocationManagerDelegate {
             }
         })
     }
-
+    
     func locationManager(_ manager: CLLocationManager,
                          didChangeAuthorization status: CLAuthorizationStatus) {
         _ = whenNotAuthorized

Dynamic/View Controller/Welcome/SlideSegue.swift

@@ -14,11 +14,11 @@ class SlideSegue: NSStoryboardSegue, NSViewControllerPresentationAnimator {
         let destination = destinationController as! NSViewController
         source.present(destination, animator: self)
     }
-
+    
     private let animationDuration: TimeInterval = 0.75
     private let frameWidth: CGFloat = 480
     private lazy var origin = CGPoint(x: frameWidth, y: 0)
-
+    
     func animatePresentation(of viewController: NSViewController, from fromViewController: NSViewController) {
         let presented = viewController.view
         presented.wantsLayer = true
@@ -35,7 +35,7 @@ class SlideSegue: NSStoryboardSegue, NSViewControllerPresentationAnimator {
             presented.animator().frame.size.width = frameWidth
         }
     }
-
+    
     func animateDismissal(of viewController: NSViewController, from fromViewController: NSViewController) {
         let presented = viewController.view
         let presentor = fromViewController.view