Merge branch 'develop' into cyborg_joshi-MrKai77#175

Loop/Assets.xcassets/App Icons/Greg Lassale/AppIcon-Black Hole.appiconset/Contents.json

@@ -0,0 +1,68 @@
+{
+  "images" : [
+    {
+      "filename" : "Black Hole-16.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "16x16"
+    },
+    {
+      "filename" : "Black Hole-32.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "16x16"
+    },
+    {
+      "filename" : "Black Hole-32.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "32x32"
+    },
+    {
+      "filename" : "Black Hole-64.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "32x32"
+    },
+    {
+      "filename" : "Black Hole-128.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "128x128"
+    },
+    {
+      "filename" : "Black Hole-256.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "128x128"
+    },
+    {
+      "filename" : "Black Hole-256.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "256x256"
+    },
+    {
+      "filename" : "Black Hole-512.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "256x256"
+    },
+    {
+      "filename" : "Black Hole-512.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "512x512"
+    },
+    {
+      "filename" : "Black Hole-1024.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "512x512"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Loop/Assets.xcassets/App Icons/Greg Lassale/AppIcon-Neon.appiconset/Contents.json

@@ -0,0 +1,68 @@
+{
+  "images" : [
+    {
+      "filename" : "Neon-16.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "16x16"
+    },
+    {
+      "filename" : "Neon-32.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "16x16"
+    },
+    {
+      "filename" : "Neon-32.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "32x32"
+    },
+    {
+      "filename" : "Neon-64.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "32x32"
+    },
+    {
+      "filename" : "Neon-128.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "128x128"
+    },
+    {
+      "filename" : "Neon-256.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "128x128"
+    },
+    {
+      "filename" : "Neon-256.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "256x256"
+    },
+    {
+      "filename" : "Neon-512.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "256x256"
+    },
+    {
+      "filename" : "Neon-512.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "512x512"
+    },
+    {
+      "filename" : "Neon-1024.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "512x512"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Loop/Assets.xcassets/App Icons/Greg Lassale/AppIcon-Simon.appiconset/Contents.json

@@ -0,0 +1,68 @@
+{
+  "images" : [
+    {
+      "filename" : "Simon-16.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "16x16"
+    },
+    {
+      "filename" : "Simon-32.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "16x16"
+    },
+    {
+      "filename" : "Simon-32.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "32x32"
+    },
+    {
+      "filename" : "Simon-64.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "32x32"
+    },
+    {
+      "filename" : "Simon-128.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "128x128"
+    },
+    {
+      "filename" : "Simon-256.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "128x128"
+    },
+    {
+      "filename" : "Simon-256.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "256x256"
+    },
+    {
+      "filename" : "Simon-512.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "256x256"
+    },
+    {
+      "filename" : "Simon-512.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "512x512"
+    },
+    {
+      "filename" : "Simon-1024.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "512x512"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Loop/Assets.xcassets/App Icons/Greg Lassale/AppIcon-Synthwave Sunset.appiconset/Contents.json

@@ -0,0 +1,68 @@
+{
+  "images" : [
+    {
+      "filename" : "Synthwave Sunset-16.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "16x16"
+    },
+    {
+      "filename" : "Synthwave Sunset-32.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "16x16"
+    },
+    {
+      "filename" : "Synthwave Sunset-32.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "32x32"
+    },
+    {
+      "filename" : "Synthwave Sunset-64.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "32x32"
+    },
+    {
+      "filename" : "Synthwave Sunset-128.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "128x128"
+    },
+    {
+      "filename" : "Synthwave Sunset-256.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "128x128"
+    },
+    {
+      "filename" : "Synthwave Sunset-256.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "256x256"
+    },
+    {
+      "filename" : "Synthwave Sunset-512.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "256x256"
+    },
+    {
+      "filename" : "Synthwave Sunset-512.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "512x512"
+    },
+    {
+      "filename" : "Synthwave Sunset-1024.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "512x512"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Loop/Assets.xcassets/App Icons/Greg Lassale/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Loop/Extensions/Defaults+Extensions.swift

@@ -32,6 +32,7 @@ extension Defaults.Keys {
     static let radialMenuCornerRadius = Key<CGFloat>("radialMenuCornerRadius", default: 50)
     static let radialMenuThickness = Key<CGFloat>("radialMenuThickness", default: 22)
     static let hideUntilDirectionIsChosen = Key<Bool>("hideUntilDirectionIsChosen", default: false)
+    static let disableCursorInteraction = Key<Bool>("disableCursorInteraction", default: false)
 
     static let triggerKey = Key<Set<CGKeyCode>>("trigger", default: [.kVK_Function])
     static let doubleClickToTrigger = Key<Bool>("doubleClickToTrigger", default: false)
@@ -46,10 +47,27 @@ extension Defaults.Keys {
     static let keybinds = Key<[WindowAction]>("keybinds", default: [
         WindowAction(.maximize, keybind: [.kVK_Space]),
         WindowAction(.center, keybind: [.kVK_Return]),
-        WindowAction(.cycleTop, keybind: [.kVK_UpArrow]),
-        WindowAction(.cycleBottom, keybind: [.kVK_DownArrow]),
-        WindowAction(.cycleLeft, keybind: [.kVK_LeftArrow]),
-        WindowAction(.cycleRight, keybind: [.kVK_RightArrow]),
+
+        WindowAction("Top Cycle", [
+            .init(.topHalf),
+            .init(.topThird),
+            .init(.topTwoThirds)
+        ], [.kVK_UpArrow]),
+        WindowAction("Bottom Cycle", [
+            .init(.bottomHalf),
+            .init(.bottomThird),
+            .init(.bottomTwoThirds)
+        ], [.kVK_DownArrow]),
+        WindowAction("Right Cycle", [
+            .init(.rightHalf),
+            .init(.rightThird),
+            .init(.rightTwoThirds)
+        ], [.kVK_RightArrow]),
+        WindowAction("Left Cycle", [
+            .init(.leftHalf),
+            .init(.leftThird),
+            .init(.leftTwoThirds)
+        ], [.kVK_LeftArrow]),
 
         WindowAction(.topLeftQuarter, keybind: [.kVK_UpArrow, .kVK_LeftArrow]),
         WindowAction(.topRightQuarter, keybind: [.kVK_UpArrow, .kVK_RightArrow]),

Loop/Managers/IconManager.swift

@@ -16,6 +16,7 @@ class IconManager {
         var iconName: String
         var unlockTime: Int
         var unlockMessage: String?
+        var footer: String?
 
         func getName() -> String {
             if let name = self.name {
@@ -25,6 +26,8 @@ class IconManager {
                 return iconName.replacingOccurrences(of: prefix, with: "")
             }
         }
+
+        static var gregLassaleFooter = "This icon was designed by Greg Lassale (@greglassale on 𝕏)"
     }
 
     private static let icons: [Icon] = [
@@ -43,12 +46,18 @@ class IconManager {
         ),
         Icon(iconName: "AppIcon-Meta Loop", unlockTime: 100),
         Icon(iconName: "AppIcon-Keycap", unlockTime: 200),
-        Icon(iconName: "AppIcon-White", unlockTime: 300),
-        Icon(iconName: "AppIcon-Black", unlockTime: 400),
+        Icon(iconName: "AppIcon-White", unlockTime: 400),
+        Icon(iconName: "AppIcon-Black", unlockTime: 500),
+
+        Icon(iconName: "AppIcon-Simon", unlockTime: 1000, footer: Icon.gregLassaleFooter),
+        Icon(iconName: "AppIcon-Neon", unlockTime: 1500, footer: Icon.gregLassaleFooter),
+        Icon(iconName: "AppIcon-Synthwave Sunset", unlockTime: 2000, footer: Icon.gregLassaleFooter),
+        Icon(iconName: "AppIcon-Black Hole", unlockTime: 2500, footer: Icon.gregLassaleFooter),
+
         Icon(
             iconName: "AppIcon-Loop Master",
-            unlockTime: 1000,
-            unlockMessage: ("1000 loops conquered! "
+            unlockTime: 5000,
+            unlockMessage: ("5000 loops conquered! "
                 + "The universe has witnessed the birth of a Loop Master! "
                 + "Enjoy your well-deserved reward: a brand-new icon!")
         )