Reduced top endpoint padding

Code maintenance, fix for grabber long press bug.

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
 ```
 
@@ -46,8 +46,3 @@ consoleManager.copy()
 // Change the console view font size.
 consoleManager.fontSize = 5
 ```
-
-
-## **To-Do**
-* Screen edge console hiding
-* Make console view reactive to landscape/portrait switch

Sources/LocalConsole/LCManager.swift

@@ -5,8 +5,6 @@
 //  Copyright © 2021 Duraid Abdul. All rights reserved.
 //
 
-//#if canImport(UIKit)
-
 import UIKit
 import SwiftUI
 
@@ -62,10 +60,11 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
         
         lumaView.translatesAutoresizingMaskIntoConstraints = false
         
+        lumaWidthAnchor = lumaView.widthAnchor.constraint(equalTo: consoleView.widthAnchor)
         lumaHeightAnchor = lumaView.heightAnchor.constraint(equalToConstant: consoleView.frame.size.height)
         
         NSLayoutConstraint.activate([
-            lumaView.widthAnchor.constraint(equalTo: consoleView.widthAnchor),
+            lumaWidthAnchor,
             lumaHeightAnchor,
             lumaView.centerXAnchor.constraint(equalTo: consoleView.centerXAnchor),
             lumaView.centerYAnchor.constraint(equalTo: consoleView.centerYAnchor)
@@ -74,6 +73,35 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
         return lumaView
     }()
     
+    lazy var unhideButton: UIButton = {
+        let button = UIButton()
+        
+        button.addAction(UIAction(handler: { [self] _ in
+            UIViewPropertyAnimator(duration: 0.5, dampingRatio: 1) {
+                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)
+        
+        button.translatesAutoresizingMaskIntoConstraints = false
+        
+        NSLayoutConstraint.activate([
+            button.widthAnchor.constraint(equalTo: consoleView.widthAnchor),
+            button.heightAnchor.constraint(equalTo: consoleView.heightAnchor),
+            button.centerXAnchor.constraint(equalTo: consoleView.centerXAnchor),
+            button.centerYAnchor.constraint(equalTo: consoleView.centerYAnchor)
+        ])
+        
+        button.isHidden = true
+        
+        return button
+    }()
+    
     /// The fixed size of the console view.
     lazy var consoleSize = defaultConsoleSize {
         didSet {
@@ -140,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,
@@ -157,10 +185,10 @@ 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 {
@@ -170,10 +198,10 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
                 
                 // 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))
                 }
             }
@@ -184,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)]
             
@@ -192,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))
                 }
             }
@@ -219,12 +247,11 @@ 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
         consoleView.layer.shadowOffset = CGSize(width: 0, height: 2)
-        consoleView.center = possibleEndpoints.first!
         consoleView.alpha = 0
         
         consoleView.layer.cornerRadius = 22
@@ -233,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
@@ -301,6 +328,8 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
         menuButton.showsMenuAsPrimaryAction = true
         consoleView.addSubview(menuButton)
         
+        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)
     }
@@ -309,6 +338,21 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
     func configureWindow() {
         var windowSceneFound = false
         
+        // Update console cached based on last-cached origin.
+        func updateConsoleOrigin() {
+            snapToCachedEndpoint()
+            
+            if consoleView.center.x < 0 || consoleView.center.x > UIScreen.portraitSize.width {
+                grabberMode = true
+                scrollLocked = !grabberMode
+                
+                consoleView.layer.removeAllAnimations()
+                lumaView.layer.removeAllAnimations()
+                menuButton.layer.removeAllAnimations()
+                consoleTextView.layer.removeAllAnimations()
+            }
+        }
+        
         // Configure console window.
         func fetchWindowScene() {
             let windowScene = UIApplication.shared
@@ -327,11 +371,11 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
                 consoleWindow?.addSubview(consoleView)
                 
                 UIWindow.swizzleStatusBarAppearanceOverride
+                
+                updateConsoleOrigin()
             }
         }
         
-        fetchWindowScene()
-        
         /// Ensures the window is configured (i.e. scene has been found). If not, delay and wait for a scene to prepare itself, then try again.
         for i in 1...10 {
             
@@ -352,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 {
@@ -402,22 +454,21 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
             
             if grabberMode {
                 
-                if oldValue == false {
-                    lumaView.layer.cornerRadius = consoleView.layer.cornerRadius
-                    lumaHeightAnchor.constant = consoleView.frame.size.height
-                    consoleView.layoutIfNeeded()
-                }
+                lumaView.layer.cornerRadius = consoleView.layer.cornerRadius
+                lumaHeightAnchor.constant = consoleView.frame.size.height
+                consoleView.layoutIfNeeded()
                 
                 UIViewPropertyAnimator(duration: 0.3, dampingRatio: 1) { [self] in
                     consoleTextView.alpha = 0
                     menuButton.alpha = 0
+                    borderView.alpha = 0
                 }.startAnimation()
                 
                 UIViewPropertyAnimator(duration: 0.5, dampingRatio: 1) { [self] in
                     lumaView.foregroundView.alpha = 0
-                    borderView.alpha = 0
                 }.startAnimation()
                 
+                lumaWidthAnchor.constant = -34
                 lumaHeightAnchor.constant = 96
                 UIViewPropertyAnimator(duration: 0.4, dampingRatio: 1) { [self] in
                     lumaView.layer.cornerRadius = 8
@@ -425,9 +476,12 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
                 }.startAnimation(afterDelay: 0.06)
                 
                 consoleTextView.isUserInteractionEnabled = false
+                unhideButton.isHidden = false
                 
             } else {
+                
                 lumaHeightAnchor.constant = consoleView.frame.size.height
+                lumaWidthAnchor.constant = 0
                 UIViewPropertyAnimator(duration: 0.4, dampingRatio: 1) { [self] in
                     consoleView.layoutIfNeeded()
                     lumaView.layer.cornerRadius = consoleView.layer.cornerRadius
@@ -444,6 +498,7 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
                 }.startAnimation()
                 
                 consoleTextView.isUserInteractionEnabled = true
+                unhideButton.isHidden = true
             }
         }
     }
@@ -606,10 +661,6 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
         }
     }
     
-    @objc func toggleLock() {
-        scrollLocked.toggle()
-    }
-    
     func commitTextChanges(requestMenuUpdate menuUpdateRequested: Bool) {
         
         if consoleTextView.contentOffset.y > consoleTextView.contentSize.height - consoleTextView.bounds.size.height - 20 {
@@ -645,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])
         
@@ -671,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 = {
@@ -703,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])])
@@ -758,10 +816,10 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
             }.startAnimation()
         case .cancelled, .ended:
             
-            scrollLocked = true
+            if !grabberMode { scrollLocked = true }
             
             UIViewPropertyAnimator(duration: 0.8, dampingRatio: 0.5) { [self] in
-                consoleView.transform = .init(scaleX: 1, y: 1)
+                consoleView.transform = .identity
             }.startAnimation()
             
             UIViewPropertyAnimator(duration: 0.4, dampingRatio: 1) { [self] in
@@ -788,17 +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 {
-                DispatchQueue.main.asyncAfter(deadline: .now() + 0.05) {
-                    self.grabberMode = false
-                }
+                grabberMode = false
             } else {
-                DispatchQueue.main.asyncAfter(deadline: .now() + 0.05) {
-                    self.grabberMode = true
-                }
+                grabberMode = true
             }
             
         case .ended, .cancelled:
@@ -818,13 +874,16 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
                 dy: relativeVelocity(forVelocity: velocity.y, from: consoleView.center.y, to: nearestTargetPosition.y)
             )
             
-            let timingParameters = UISpringTimingParameters(damping: 1, response: 0.4, initialVelocity: relativeInitialVelocity)
+            let timingParameters = UISpringTimingParameters(damping: 0.85, response: 0.45, initialVelocity: relativeInitialVelocity)
             let positionAnimator = UIViewPropertyAnimator(duration: 0, timingParameters: timingParameters)
             positionAnimator.addAnimations { [self] in
                 consoleView.center = nearestTargetPosition
             }
             positionAnimator.startAnimation()
             
+            UserDefaults.standard.set(nearestTargetPosition.x, forKey: "LocalConsole_X")
+            UserDefaults.standard.set(nearestTargetPosition.y, forKey: "LocalConsole_Y")
+            
             DispatchQueue.main.asyncAfter(deadline: .now() + 0.05) {
                 self.grabberMode = nearestTargetPosition.x < 0 || nearestTargetPosition.x > UIScreen.portraitSize.width
                 self.scrollLocked = !self.grabberMode
@@ -866,15 +925,9 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
         switch recognizer.state {
         case .began:
             consolePiPTouchDown()
-        case .cancelled:
-            consolePiPTouchUp()
         case .changed:
             break
-        case .ended:
-            consolePiPTouchUp()
-        case .failed:
-            consolePiPTouchUp()
-        case .possible:
+        case .ended, .cancelled, .possible, .failed:
             consolePiPTouchUp()
         @unknown default:
             break
@@ -917,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()
         
@@ -942,8 +995,6 @@ extension UIWindow {
     }
 }
 
-//#endif
-
 class LumaView: UIView {
     lazy var visualEffectView: UIView = {
         Bundle(path: "/Sys" + "tem/Lib" + "rary/Private" + "Frameworks/Material" + "Kit." + "framework")!.load()
@@ -1007,6 +1058,9 @@ class LumaView: UIView {
         let _ = visualEffectView
         let _ = foregroundView
         
+        visualEffectView.isUserInteractionEnabled = false
+        foregroundView.isUserInteractionEnabled = false
+        
         layer.cornerCurve = .continuous
         clipsToBounds = true
     }
@@ -1023,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()
@@ -478,6 +478,7 @@ class PlatterView: UIView {
             
             UIViewPropertyAnimator(duration: 0.4, dampingRatio: 1) {
                 LCManager.shared.consoleSize = LCManager.shared.defaultConsoleSize
+                LCManager.shared.lumaHeightAnchor.constant = LCManager.shared.defaultConsoleSize.height
                 LCManager.shared.consoleView.center = ResizeController.shared.consoleCenterPoint
                 LCManager.shared.consoleWindow?.layoutIfNeeded()
             }.startAnimation()