fix the dock move triggers

maybe random dock movements in the future?

DockPhobia/AppDelegate.swift

@@ -86,10 +86,10 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 	
 	@objc func didTapStart() {
 		if mouseTracker.running {
-			mouseTracker.removeMonitor()
+			mouseTracker.stop()
 			changeMenuIcon(running: false)
 		} else {
-			mouseTracker.addMonitor()
+			mouseTracker.start()
 			changeMenuIcon(running: true)
 		}
 		setupMenus()

DockPhobia/MouseTracker.swift

@@ -15,8 +15,8 @@ struct Screen {
 
 enum DockSide: Int, RawRepresentable {
 	case left
-	case right
 	case bottom
+	case right
 	
 	public typealias RawValue = String
 	
@@ -31,6 +31,12 @@ enum DockSide: Int, RawRepresentable {
 		}
 	}
 	
+	/// Random Dock Side
+	/// - will return a random Dock Side when calling DockSide()
+	public init() {
+		self = DockSide(rawValue: Int.random(in: 1...3))!
+	}
+	
 	public init?(rawValue: String) {
 		switch rawValue {
 		case "left":
@@ -43,6 +49,19 @@ enum DockSide: Int, RawRepresentable {
 			return nil
 		}
 	}
+	
+	public init?(rawValue: Int) {
+		switch rawValue {
+		case 1:
+			self = .left
+		case 2:
+			self = .bottom
+		case 3:
+			self = .right
+		default:
+			return nil
+		}
+	}
 }
 
 class MouseTracker {
@@ -52,7 +71,10 @@ class MouseTracker {
 	
 	var running: Bool = false
 	
+	var currentDockSide: DockSide
+	
 	init() {
+		print(DockSide())
 		if let screen = NSScreen.main {
 			let rect = screen.frame
 			self.screen = Screen(
@@ -63,6 +85,9 @@ class MouseTracker {
 		} else {
 			fatalError("no screen wtf???")
 		}
+		self.currentDockSide = .bottom
+		moveDock(.bottom)
+		start()
 	}
 	
 	func checkMouse(_ event: NSEvent) {
@@ -71,15 +96,9 @@ class MouseTracker {
 		#if DEBUG
 		print(location)
 		#endif
-		if location.y > 1000 {
+		
-			if location.x < screen.width/2 {
+		switch currentDockSide {
-				moveDock(.right)
+		case .left:
-				return
-			} else {
-				moveDock(.left)
-				return
-			}
-		}
 			if location.x < 100 {
 				if location.y < screen.height/2 {
 					moveDock(.bottom)
@@ -89,6 +108,17 @@ class MouseTracker {
 					return
 				}
 			}
+		case .bottom:
+			if location.y > 1000 {
+				if location.x < screen.width/2 {
+					moveDock(.right)
+					return
+				} else {
+					moveDock(.left)
+					return
+				}
+			}
+		case .right:
 			if location.x > 1600 {
 				if location.y < screen.height/2 {
 					moveDock(.bottom)
@@ -99,14 +129,15 @@ class MouseTracker {
 				}
 			}
 		}
+	}
 	
-	func addMonitor() {
+	func start() {
 		self.monitor = NSEvent.addGlobalMonitorForEvents(matching: .mouseMoved, handler: checkMouse)
 		self.running = true
 		print("started tracking")
 	}
 	
-	func removeMonitor() {
+	func stop() {
 		if let monitor = monitor {
 			NSEvent.removeMonitor(monitor)
 			self.running = false
@@ -124,9 +155,11 @@ class MouseTracker {
   end tell
   """
 		applescript(script)
+		currentDockSide = toSide
 	}
 	
-	func applescript(_ script: String) {
+	@discardableResult
+	func applescript(_ script: String) -> String? {
 		var error: NSDictionary?
 		if let scriptObject = NSAppleScript(source: script) {
 			scriptObject.executeAndReturnError(&error)
@@ -134,6 +167,7 @@ class MouseTracker {
 				print(error as Any)
 			}
 		}
+		return nil
 	}
 }