🚨 Resolve all SwiftLint warnings

MrKai77 · Dec 1, 2023 · 95f88da · 95f88da
1 parent 5749167
commit 95f88da
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 39 deletions.
diff --git a/Loop.xcodeproj/project.pbxproj b/Loop.xcodeproj/project.pbxproj
@@ -356,7 +356,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = 1;
 				LastSwiftUpdateCheck = 1420;
-				LastUpgradeCheck = 1500;
+				LastUpgradeCheck = 1510;
 				TargetAttributes = {
 					A8E59C34297F5E9A0064D4BA = {
 						CreatedOnToolsVersion = 14.2;

diff --git a/Loop.xcodeproj/xcshareddata/xcschemes/Loop.xcscheme b/Loop.xcodeproj/xcshareddata/xcschemes/Loop.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1510"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Loop/Extensions/Defaults+Extensions.swift b/Loop/Extensions/Defaults+Extensions.swift
@@ -50,6 +50,6 @@ extension Defaults.Keys {
         Keybind(.topLeftQuarter, keycode: [.kVK_UpArrow, .kVK_LeftArrow]),
         Keybind(.topRightQuarter, keycode: [.kVK_UpArrow, .kVK_RightArrow]),
         Keybind(.bottomRightQuarter, keycode: [.kVK_DownArrow, .kVK_RightArrow]),
-        Keybind(.bottomLeftQuarter, keycode: [.kVK_DownArrow, .kVK_LeftArrow]),
+        Keybind(.bottomLeftQuarter, keycode: [.kVK_DownArrow, .kVK_LeftArrow])
     ])
 }
diff --git a/Loop/Managers/KeybindMonitor.swift b/Loop/Managers/KeybindMonitor.swift
@@ -71,7 +71,7 @@ class KeybindMonitor {
             if cgEvent.type == .flagsChanged,
                let event = NSEvent(cgEvent: cgEvent),
                !Defaults[.triggerKey].contains(where: { $0.baseModifier == event.keyCode.baseModifier }) {
-                
+
                 self.checkForModifier(event, .kVK_Shift, .shift)
                 self.checkForModifier(event, .kVK_Command, .command)
                 self.checkForModifier(event, .kVK_Option, .option)

diff --git a/Loop/Managers/LoopManager.swift b/Loop/Managers/LoopManager.swift
@@ -151,17 +151,16 @@ class LoopManager {
             let useTriggerDelay = Defaults[.triggerDelay] > 0.1
             let useDoubleClickTrigger = Defaults[.doubleClickToTrigger]
 
-            if useDoubleClickTrigger {
-                if abs(self.lastTriggerKeyClick.timeIntervalSinceNow) < NSEvent.doubleClickInterval {
-                    if useTriggerDelay {
-                        if self.triggerDelayTimer == nil {
-                            self.startTriggerDelayTimer(seconds: Defaults[.triggerDelay]) {
-                                self.openLoop()
-                            }
+            if useDoubleClickTrigger &&
+               abs(self.lastTriggerKeyClick.timeIntervalSinceNow) < NSEvent.doubleClickInterval {
+                if useTriggerDelay {
+                    if self.triggerDelayTimer == nil {
+                        self.startTriggerDelayTimer(seconds: Defaults[.triggerDelay]) {
+                            self.openLoop()
                         }
-                    } else {
-                        self.openLoop()
                     }
+                } else {
+                    self.openLoop()
                 }
             } else if useTriggerDelay {
                 if self.triggerDelayTimer == nil {

diff --git a/Loop/Utilities/EventMonitor.swift b/Loop/Utilities/EventMonitor.swift
@@ -88,7 +88,7 @@ class CGEventMonitor: EventMonitor, Identifiable, Equatable {
         self.eventCallback = callback
 
         self.eventTap = CGEvent.tapCreate(
-            tap: .cgSessionEventTap ,
+            tap: .cgSessionEventTap,
             place: .headInsertEventTap,
             options: .defaultTap,
             eventsOfInterest: eventMask.rawValue,

diff --git a/Loop/Utilities/TriggerKeycorder.swift b/Loop/Utilities/TriggerKeycorder.swift
@@ -53,6 +53,7 @@ struct TriggerKeycorder: View {
                         .fixedSize(horizontal: true, vertical: false)
                 } else {
                     ForEach(self.selectionKey.sorted(), id: \.self) { key in
+                        // swiftlint:disable:next line_length
                         Text("\(key.isOnRightSide ? "Right" : "Left") \(Image(systemName: key.systemImage ?? "exclamationmark.circle.fill"))")
                             .frame(maxWidth: .infinity, maxHeight: .infinity)
                             .padding(5)

diff --git a/Loop/Window Management/Window.swift b/Loop/Window Management/Window.swift
@@ -69,6 +69,13 @@ class Window {
     func setFullscreen(_ state: Bool) -> Bool {
         return self.axWindow.setValue(.fullScreen, value: state)
     }
+    @discardableResult
+    func toggleFullscreen() -> Bool {
+        if !self.isFullscreen {
+            return self.setFullscreen(true)
+        }
+        return self.setHidden(false)
+    }
 
     var isHidden: Bool {
         return self.nsRunningApplication?.isHidden ?? false
@@ -83,6 +90,13 @@ class Window {
         }
         return result
     }
+    @discardableResult
+    func toggleHidden() -> Bool {
+        if !self.isHidden {
+            return self.setHidden(true)
+        }
+        return self.setHidden(false)
+    }
 
     var isMinimized: Bool {
         let result = self.axWindow.getValue(.minimized) as? NSNumber
@@ -92,6 +106,13 @@ class Window {
     func setMinimized(_ state: Bool) -> Bool {
         return self.axWindow.setValue(.minimized, value: state)
     }
+    @discardableResult
+    func toggleMinimized() -> Bool {
+        if !self.isMinimized {
+            return self.setMinimized(true)
+        }
+        return self.setMinimized(false)
+    }
 
     var position: CGPoint {
         var point: CGPoint = .zero

diff --git a/Loop/Window Management/WindowEngine.swift b/Loop/Window Management/WindowEngine.swift
@@ -23,41 +23,25 @@ struct WindowEngine {
         }
 
         if direction == .fullscreen {
-            if window.isFullscreen {
-                window.setFullscreen(false)
-            } else {
-                window.setFullscreen(true)
-            }
-
+            window.toggleFullscreen()
             WindowRecords.recordDirection(window, direction)
             return
         }
+        window.setFullscreen(false)
 
         if direction == .hide {
-            if window.isHidden {
-                window.setHidden(false)
-            } else {
-                window.setHidden(true)
-            }
+            window.toggleHidden()
+            return
         }
 
         if direction == .minimize {
-            if window.isMinimized {
-                window.setMinimized(false)
-            } else {
-                window.setMinimized(true)
-            }
+            window.toggleMinimized()
+            return
         }
 
-        window.setFullscreen(false)
-
-        let oldWindowFrame = window.frame
-        guard let screenFrame = screen.safeScreenFrame, let currentWindowFrame = WindowEngine.generateWindowFrame(
-            oldWindowFrame,
-            screenFrame,
-            direction,
-            window
-        ) else {
+        guard let screenFrame = screen.safeScreenFrame,
+              let currentWindowFrame = WindowEngine.generateWindowFrame(window.frame, screenFrame, direction, window)
+        else {
             return
         }
         var targetWindowFrame = WindowEngine.applyPadding(currentWindowFrame, direction)