Reduced top endpoint padding

README.md

@@ -24,10 +24,10 @@ let consoleManager = LCManager.shared
 Once prepared, the localConsole can be used throughout your project.
 ```swift
 
-// Show the console view.
+// Activate the console view.
 consoleManager.isVisible = true
 
-// Hide the console view.
+// Deactivate the console view.
 consoleManager.isVisible = false
 ```
 

Sources/LocalConsole/LCManager.swift

@@ -73,7 +73,7 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
         return lumaView
     }()
     
-    lazy var hideButton: UIButton = {
+    lazy var unhideButton: UIButton = {
         let button = UIButton()
         
         button.addAction(UIAction(handler: { [self] _ in
@@ -81,6 +81,9 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
                 consoleView.center = nearestTargetTo(consoleView.center, possibleTargets: possibleEndpoints.dropLast())
             }.startAnimation()
             grabberMode = false
+            
+            UserDefaults.standard.set(consoleView.center.x, forKey: "LocalConsole_X")
+            UserDefaults.standard.set(consoleView.center.y, forKey: "LocalConsole_Y")
         }), for: .touchUpInside)
         
         consoleView.addSubview(button)
@@ -165,9 +168,9 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
                 
                 // Top endpoints.
                 CGPoint(x: consoleSize.width / 2 + 12,
-                        y: (UIScreen.hasRoundedCorners ? 44 : 16) + consoleSize.height / 2 + 12),
+                        y: (UIScreen.hasRoundedCorners ? 38 : 16) + consoleSize.height / 2 + 12),
                 CGPoint(x: UIScreen.portraitSize.width - consoleSize.width / 2 - 12,
-                        y: (UIScreen.hasRoundedCorners ? 44 : 16) + consoleSize.height / 2 + 12),
+                        y: (UIScreen.hasRoundedCorners ? 38 : 16) + consoleSize.height / 2 + 12),
                 
                 // Bottom endpoints.
                 CGPoint(x: consoleSize.width / 2 + 12,
@@ -209,7 +212,7 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
             
             // Two endpoints, one for the top, one for the bottom..
             var endpoints = [CGPoint(x: UIScreen.portraitSize.width / 2,
-                                     y: (UIScreen.hasRoundedCorners ? 44 : 16) + consoleSize.height / 2 + 12),
+                                     y: (UIScreen.hasRoundedCorners ? 38 : 16) + consoleSize.height / 2 + 12),
                              CGPoint(x: UIScreen.portraitSize.width / 2,
                                      y: UIScreen.portraitSize.height - consoleSize.height / 2 - (keyboardHeight ?? consoleWindow?.safeAreaInsets.bottom ?? 0) - 12)]
             
@@ -217,20 +220,20 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
                 
                 // Left edge hiding endpoints.
                 if consoleView.center.y < (UIScreen.portraitSize.height - (temporaryKeyboardHeightValueTracker ?? 0)) / 2 {
-                    endpoints.append(CGPoint(x: -consoleSize.width / 2 + 10,
+                    endpoints.append(CGPoint(x: -consoleSize.width / 2 + 28,
                                              y: endpoints[0].y))
                 } else {
-                    endpoints.append(CGPoint(x: -consoleSize.width / 2 + 10,
+                    endpoints.append(CGPoint(x: -consoleSize.width / 2 + 28,
                                              y: endpoints[1].y))
                 }
             } else if consoleView.frame.maxX >= UIScreen.portraitSize.width {
                 
                 // Right edge hiding endpoints.
                 if consoleView.center.y < (UIScreen.portraitSize.height - (temporaryKeyboardHeightValueTracker ?? 0)) / 2 {
-                    endpoints.append(CGPoint(x: UIScreen.portraitSize.width + consoleSize.width / 2 - 10,
+                    endpoints.append(CGPoint(x: UIScreen.portraitSize.width + consoleSize.width / 2 - 28,
                                              y: endpoints[0].y))
                 } else {
-                    endpoints.append(CGPoint(x: UIScreen.portraitSize.width + consoleSize.width / 2 - 10,
+                    endpoints.append(CGPoint(x: UIScreen.portraitSize.width + consoleSize.width / 2 - 28,
                                              y: endpoints[1].y))
                 }
             }
@@ -244,7 +247,7 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
     func configureConsole() {
         consoleSize = CGSize(width: UserDefaults.standard.object(forKey: "LocalConsole_Width") as? CGFloat ?? consoleSize.width,
                              height: UserDefaults.standard.object(forKey: "LocalConsole_Height") as? CGFloat ?? consoleSize.height)
-
+        
         
         consoleView.layer.shadowRadius = 16
         consoleView.layer.shadowOpacity = 0.5
@@ -257,8 +260,8 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
         let _ = lumaView
         
         borderView.frame = CGRect(x: -1, y: -1,
-                                   width: consoleSize.width + 2,
-                                   height: consoleSize.height + 2)
+                                  width: consoleSize.width + 2,
+                                  height: consoleSize.height + 2)
         borderView.layer.borderWidth = 1
         borderView.layer.borderColor = UIColor(white: 1, alpha: 0.08).cgColor
         borderView.layer.cornerRadius = consoleView.layer.cornerRadius + 1
@@ -325,7 +328,7 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
         menuButton.showsMenuAsPrimaryAction = true
         consoleView.addSubview(menuButton)
         
-        let _ = hideButton
+        let _ = unhideButton
         
         NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillHide), name: UIResponder.keyboardWillHideNotification, object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillShow), name: UIResponder.keyboardWillShowNotification, object: nil)
@@ -337,11 +340,7 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
         
         // Update console cached based on last-cached origin.
         func updateConsoleOrigin() {
-            let cachedConsolePosition = CGPoint(x: UserDefaults.standard.object(forKey: "LocalConsole_X") as? CGFloat ?? possibleEndpoints.first!.x,
-                                                y: UserDefaults.standard.object(forKey: "LocalConsole_Y") as? CGFloat ?? possibleEndpoints.first!.y)
-            
-            consoleView.center = cachedConsolePosition // Update console center so possibleEndpoints are calculated correctly.
-            consoleView.center = nearestTargetTo(cachedConsolePosition, possibleTargets: possibleEndpoints)
+            snapToCachedEndpoint()
             
             if consoleView.center.x < 0 || consoleView.center.x > UIScreen.portraitSize.width {
                 grabberMode = true
@@ -397,6 +396,14 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
         }
     }
     
+    func snapToCachedEndpoint() {
+        let cachedConsolePosition = CGPoint(x: UserDefaults.standard.object(forKey: "LocalConsole_X") as? CGFloat ?? possibleEndpoints.first!.x,
+                                            y: UserDefaults.standard.object(forKey: "LocalConsole_Y") as? CGFloat ?? possibleEndpoints.first!.y)
+        
+        consoleView.center = cachedConsolePosition // Update console center so possibleEndpoints are calculated correctly.
+        consoleView.center = nearestTargetTo(cachedConsolePosition, possibleTargets: possibleEndpoints)
+    }
+    
     // MARK: - Public
     
     public var isVisible = false {
@@ -469,7 +476,7 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
                 }.startAnimation(afterDelay: 0.06)
                 
                 consoleTextView.isUserInteractionEnabled = false
-                hideButton.isHidden = false
+                unhideButton.isHidden = false
                 
             } else {
                 
@@ -491,7 +498,7 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
                 }.startAnimation()
                 
                 consoleTextView.isUserInteractionEnabled = true
-                hideButton.isHidden = true
+                unhideButton.isHidden = true
             }
         }
     }
@@ -689,22 +696,22 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
     func makeMenu() -> UIMenu {
         
         let copy = UIAction(title: "Copy",
-                                       image: UIImage(systemName: "doc.on.doc"), handler: { _ in
-                                        self.copy()
-                                       })
+                            image: UIImage(systemName: "doc.on.doc"), handler: { _ in
+            self.copy()
+        })
         
         let resize = UIAction(title: "Resize Console",
                               image: UIImage(systemName: "arrow.left.and.right.square"), handler: { _ in
-                                DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
-                                    ResizeController.shared.isActive.toggle()
-                                    ResizeController.shared.platterView.reveal()
-                                }
-                              })
+            DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
+                ResizeController.shared.isActive.toggle()
+                ResizeController.shared.platterView.reveal()
+            }
+        })
         
         let clear = UIAction(title: "Clear Console",
                              image: UIImage(systemName: "xmark.square"), handler: { _ in
-                                self.clear()
-                             })
+            self.clear()
+        })
         
         let consoleActions = UIMenu(title: "", options: .displayInline, children: [clear, resize])
         
@@ -715,14 +722,14 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
         
         let viewFrames = UIAction(title: debugBordersEnabled ? "Hide View Frames" : "Show View Frames",
                                   image: UIImage(systemName: frameSymbol), handler: { _ in
-                                    self.debugBordersEnabled.toggle()
-                                    self.menuButton.menu = self.makeMenu()
-                                  })
+            self.debugBordersEnabled.toggle()
+            self.menuButton.menu = self.makeMenu()
+        })
         
         let systemReport = UIAction(title: "System Report",
-                                  image: UIImage(systemName: "cpu"), handler: { _ in
-                                    self.systemReport()
-                                  })
+                                    image: UIImage(systemName: "cpu"), handler: { _ in
+            self.systemReport()
+        })
         
         // Show the right glyph for the current device being used.
         let deviceSymbol: String = {
@@ -747,28 +754,35 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
         }()
         
         let displayReport = UIAction(title: "Display Report",
-                                  image: UIImage(systemName: deviceSymbol), handler: { _ in
-                                    self.displayReport()
-                                  })
+                                     image: UIImage(systemName: deviceSymbol), handler: { _ in
+            self.displayReport()
+        })
         
         let respring = UIAction(title: "Restart Spring" + "Board",
                                 image: UIImage(systemName: "apps.iphone"), handler: { _ in
-                                    guard let window = UIApplication.shared.windows.first else { return }
-                                    
-                                    window.layer.cornerRadius = UIScreen.main.value(forKey: "_displ" + "ayCorn" + "erRa" + "dius") as! CGFloat
-                                    window.layer.masksToBounds = true
-                                    
-                                    let animator = UIViewPropertyAnimator(duration: 0.5, dampingRatio: 1) {
-                                        window.transform = .init(scaleX: 0.96, y: 0.96)
-                                        window.alpha = 0
-                                    }
-                                    animator.addCompletion { _ in
-                                        while true {
-                                            window.snapshotView(afterScreenUpdates: false)
-                                        }
-                                    }
-                                    animator.startAnimation()
-                                })
+            
+            guard let window = UIApplication.shared.windows.first else { return }
+            
+            window.layer.cornerRadius = UIScreen.main.value(forKey: "_displ" + "ayCorn" + "erRa" + "dius") as! CGFloat
+            window.layer.masksToBounds = true
+            
+            UIViewPropertyAnimator(duration: 0.5, dampingRatio: 1) {
+                window.transform = .init(scaleX: 0.96, y: 0.96)
+                window.alpha = 0
+            }.startAnimation()
+            
+            // Concurrently run these snapshots to decrease the time to crash.
+            for _ in 0...1000 {
+                DispatchQueue.global(qos: .default).async {
+                    
+                    // This will cause jetsam to terminate SpringBoard.
+                    while true {
+                        window.snapshotView(afterScreenUpdates: false)
+                    }
+                }
+            }
+        })
+        
         let debugActions = UIMenu(title: "", options: .displayInline,
                                   children: [UIMenu(title: "Debug", image: UIImage(systemName: "ant"),
                                                     children: [viewFrames, systemReport, displayReport, respring])])
@@ -832,13 +846,15 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
         switch recognizer.state {
         case .changed:
             
-            consoleView.center.x = initialViewLocation.x + translation.x
-            consoleView.center.y = initialViewLocation.y + translation.y
+            UIViewPropertyAnimator(duration: 0.175, dampingRatio: 1) { [self] in
+                consoleView.center = CGPoint(x: initialViewLocation.x + translation.x,
+                                             y: initialViewLocation.y + translation.y)
+            }.startAnimation()
             
             if consoleView.frame.maxX > 30 && consoleView.frame.minX < UIScreen.portraitSize.width - 30 {
-                self.grabberMode = false
+                grabberMode = false
             } else {
-                self.grabberMode = true
+                grabberMode = true
             }
             
         case .ended, .cancelled:
@@ -954,7 +970,7 @@ extension UIView {
               let swizzledMethod = class_getInstanceMethod(UIView.self, #selector(swizzled_layoutSubviews)) else { return }
         method_exchangeImplementations(originalMethod, swizzledMethod)
     }
-
+    
     @objc func swizzled_layoutSubviews() {
         swizzled_layoutSubviews()
         
@@ -1061,7 +1077,7 @@ class InvertedTextView: UITextView {
     // Thanks to WWDC21 Lab!
     override func layoutSubviews() {
         super.layoutSubviews()
-
+        
         if panGestureRecognizer.numberOfTouches == 0 && pendingOffsetChange {
             contentOffset.y = contentSize.height - bounds.size.height
         } else {

Sources/LocalConsole/ResizeController.swift

@@ -170,7 +170,7 @@ class ResizeController {
                 LCManager.shared.consoleView.layer.shadowOpacity = 0.5
                 
                 UIViewPropertyAnimator(duration: 0.6, dampingRatio: 1) {
-                    LCManager.shared.consoleView.center = LCManager.shared.possibleEndpoints.first!
+                    LCManager.shared.snapToCachedEndpoint()
                     
                     // Update grabbers (layout constraints)
                     LCManager.shared.consoleWindow?.layoutIfNeeded()