Merge branch 'main' of https://github.com/duraidabdul/LocalConsole into main

Code maintenance, fix for grabber long press bug.

README.md

@@ -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

@@ -48,6 +48,32 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
     
     let defaultConsoleSize = CGSize(width: 228, height: 142)
     
+    lazy var borderView = UIView()
+    
+    var lumaWidthAnchor: NSLayoutConstraint!
+    var lumaHeightAnchor: NSLayoutConstraint!
+    
+    lazy var lumaView: LumaView = {
+        let lumaView = LumaView()
+        lumaView.foregroundView.backgroundColor = .black
+        lumaView.layer.cornerRadius = consoleView.layer.cornerRadius
+        
+        consoleView.addSubview(lumaView)
+        
+        lumaView.translatesAutoresizingMaskIntoConstraints = false
+        
+        lumaHeightAnchor = lumaView.heightAnchor.constraint(equalToConstant: consoleView.frame.size.height)
+        
+        NSLayoutConstraint.activate([
+            lumaView.widthAnchor.constraint(equalTo: consoleView.widthAnchor),
+            lumaHeightAnchor,
+            lumaView.centerXAnchor.constraint(equalTo: consoleView.centerXAnchor),
+            lumaView.centerYAnchor.constraint(equalTo: consoleView.centerYAnchor)
+        ])
+        
+        return lumaView
+    }()
+    
     /// The fixed size of the console view.
     lazy var consoleSize = defaultConsoleSize {
         didSet {
@@ -106,20 +132,85 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
     
     /// Gesture endpoints. Each point represents a corner of the screen. TODO: Handle screen rotation.
     var possibleEndpoints: [CGPoint] {
+        
         if consoleSize.width < UIScreen.portraitSize.width - 112 {
-            return [CGPoint(x: consoleSize.width / 2 + 12,
-                            y: (UIScreen.hasRoundedCorners ? 44 : 16) + consoleSize.height / 2 + 12),
-                    CGPoint(x: UIScreen.portraitSize.width - consoleSize.width / 2 - 12,
-                            y: (UIScreen.hasRoundedCorners ? 44 : 16) + consoleSize.height / 2 + 12),
-                    CGPoint(x: consoleSize.width / 2 + 12,
-                            y: UIScreen.portraitSize.height - consoleSize.height / 2 - (keyboardHeight ?? consoleWindow?.safeAreaInsets.bottom ?? 0) - 12),
-                    CGPoint(x: UIScreen.portraitSize.width - consoleSize.width / 2 - 12,
-                            y: UIScreen.portraitSize.height - consoleSize.height / 2 - (keyboardHeight ?? consoleWindow?.safeAreaInsets.bottom ?? 0) - 12)]
+            
+            // Four endpoints, one for each corner.
+            var endpoints = [
+                
+                // Top endpoints.
+                CGPoint(x: consoleSize.width / 2 + 12,
+                        y: (UIScreen.hasRoundedCorners ? 44 : 16) + consoleSize.height / 2 + 12),
+                CGPoint(x: UIScreen.portraitSize.width - consoleSize.width / 2 - 12,
+                        y: (UIScreen.hasRoundedCorners ? 44 : 16) + consoleSize.height / 2 + 12),
+                
+                // Bottom endpoints.
+                CGPoint(x: consoleSize.width / 2 + 12,
+                        y: UIScreen.portraitSize.height - consoleSize.height / 2 - (keyboardHeight ?? consoleWindow?.safeAreaInsets.bottom ?? 0) - 12),
+                CGPoint(x: UIScreen.portraitSize.width - consoleSize.width / 2 - 12,
+                        y: UIScreen.portraitSize.height - consoleSize.height / 2 - (keyboardHeight ?? consoleWindow?.safeAreaInsets.bottom ?? 0) - 12)]
+            
+            if consoleView.frame.minX <= 0 {
+                
+                // Left edge endpoints.
+                endpoints = [endpoints[0], endpoints[2]]
+                
+                // Left edge hiding endpoints.
+                if consoleView.center.y < (UIScreen.portraitSize.height - (temporaryKeyboardHeightValueTracker ?? 0)) / 2 {
+                    endpoints.append(CGPoint(x: -consoleSize.width / 2 + 10,
+                                             y: endpoints[0].y))
+                } else {
+                    endpoints.append(CGPoint(x: -consoleSize.width / 2 + 10,
+                                             y: endpoints[1].y))
+                }
+            } else if consoleView.frame.maxX >= UIScreen.portraitSize.width {
+                
+                // Right edge endpoints.
+                endpoints = [endpoints[1], endpoints[3]]
+                
+                // 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,
+                                             y: endpoints[0].y))
+                } else {
+                    endpoints.append(CGPoint(x: UIScreen.portraitSize.width + consoleSize.width / 2 - 10,
+                                             y: endpoints[1].y))
+                }
+            }
+            
+            return endpoints
+            
         } else {
-            return [CGPoint(x: UIScreen.portraitSize.width / 2,
-                            y: (UIScreen.hasRoundedCorners ? 44 : 16) + consoleSize.height / 2 + 12),
-                    CGPoint(x: UIScreen.portraitSize.width / 2,
-                            y: UIScreen.portraitSize.height - consoleSize.height / 2 - (keyboardHeight ?? consoleWindow?.safeAreaInsets.bottom ?? 0) - 12)]
+            
+            // 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),
+                             CGPoint(x: UIScreen.portraitSize.width / 2,
+                                     y: UIScreen.portraitSize.height - consoleSize.height / 2 - (keyboardHeight ?? consoleWindow?.safeAreaInsets.bottom ?? 0) - 12)]
+            
+            if consoleView.frame.minX <= 0 {
+                
+                // Left edge hiding endpoints.
+                if consoleView.center.y < (UIScreen.portraitSize.height - (temporaryKeyboardHeightValueTracker ?? 0)) / 2 {
+                    endpoints.append(CGPoint(x: -consoleSize.width / 2 + 10,
+                                             y: endpoints[0].y))
+                } else {
+                    endpoints.append(CGPoint(x: -consoleSize.width / 2 + 10,
+                                             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,
+                                             y: endpoints[0].y))
+                } else {
+                    endpoints.append(CGPoint(x: UIScreen.portraitSize.width + consoleSize.width / 2 - 10,
+                                             y: endpoints[1].y))
+                }
+            }
+            
+            return endpoints
         }
     }
     
@@ -128,19 +219,24 @@ 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.backgroundColor = .black
+
         
         consoleView.layer.shadowRadius = 16
         consoleView.layer.shadowOpacity = 0.5
         consoleView.layer.shadowOffset = CGSize(width: 0, height: 2)
-        consoleView.center = possibleEndpoints.first!
+        
+        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 = nearestTargetTo(cachedConsolePosition, possibleTargets: possibleEndpoints)
+        
         consoleView.alpha = 0
         
         consoleView.layer.cornerRadius = 22
         consoleView.layer.cornerCurve = .continuous
         
-        let borderView = UIView()
+        let _ = lumaView
+        
         borderView.frame = CGRect(x: -1, y: -1,
                                    width: consoleSize.width + 2,
                                    height: consoleSize.height + 2)
@@ -199,7 +295,8 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
         circle.isUserInteractionEnabled = false
         menuButton.addSubview(circle)
         
-        let ellipsisImage = UIImageView(image: UIImage(systemName: "ellipsis", withConfiguration: UIImage.SymbolConfiguration(pointSize: 17)))
+        let ellipsisImage = UIImageView(image: UIImage(systemName: "ellipsis",
+                                                       withConfiguration: UIImage.SymbolConfiguration(pointSize: 17, weight: .medium)))
         ellipsisImage.frame.size = circle.bounds.size
         ellipsisImage.contentMode = .center
         circle.addSubview(ellipsisImage)
@@ -209,6 +306,11 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
         menuButton.showsMenuAsPrimaryAction = true
         consoleView.addSubview(menuButton)
         
+        if consoleView.center.x < 0 || consoleView.center.x > UIScreen.portraitSize.width {
+            grabberMode = true
+            scrollLocked = !grabberMode
+        }
+        
         NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillHide), name: UIResponder.keyboardWillHideNotification, object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillShow), name: UIResponder.keyboardWillShowNotification, object: nil)
     }
@@ -303,6 +405,60 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
         }
     }
     
+    var grabberMode: Bool = false {
+        
+        didSet {
+            guard oldValue != grabberMode else { return }
+            
+            if grabberMode {
+                
+                if oldValue == false {
+                    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
+                    
+                }.startAnimation()
+                
+                lumaHeightAnchor.constant = 96
+                UIViewPropertyAnimator(duration: 0.4, dampingRatio: 1) { [self] in
+                    lumaView.layer.cornerRadius = 8
+                    consoleView.layoutIfNeeded()
+                }.startAnimation(afterDelay: 0.06)
+                
+                consoleTextView.isUserInteractionEnabled = false
+                
+            } else {
+                lumaHeightAnchor.constant = consoleView.frame.size.height
+                UIViewPropertyAnimator(duration: 0.4, dampingRatio: 1) { [self] in
+                    consoleView.layoutIfNeeded()
+                    lumaView.layer.cornerRadius = consoleView.layer.cornerRadius
+                }.startAnimation()
+                
+                UIViewPropertyAnimator(duration: 0.3, dampingRatio: 1) { [self] in
+                    consoleTextView.alpha = 1
+                    menuButton.alpha = 1
+                    borderView.alpha = 1
+                }.startAnimation(afterDelay: 0.2)
+                
+                UIViewPropertyAnimator(duration: 0.65, dampingRatio: 1) { [self] in
+                    lumaView.foregroundView.alpha = 1
+                }.startAnimation()
+                
+                consoleTextView.isUserInteractionEnabled = true
+            }
+        }
+    }
+    
     /// Print items to the console view.
     public func print(_ items: Any) {
         if currentText == "" {
@@ -324,18 +480,25 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
     
     // MARK: - Private
     
+    var temporaryKeyboardHeightValueTracker: CGFloat?
     
     // MARK: Handle keyboard show/hide.
     private var keyboardHeight: CGFloat? = nil {
         didSet {
             
+            temporaryKeyboardHeightValueTracker = oldValue
+            
             if consoleView.center != possibleEndpoints[0] && consoleView.center != possibleEndpoints[1] {
                 let nearestTargetPosition = nearestTargetTo(consoleView.center, possibleTargets: possibleEndpoints.suffix(2))
                 
+                Swift.print(possibleEndpoints.suffix(2))
+                
                 UIViewPropertyAnimator(duration: 0.55, dampingRatio: 1) {
                     self.consoleView.center = nearestTargetPosition
                 }.startAnimation()
             }
+            
+            temporaryKeyboardHeightValueTracker = keyboardHeight
         }
     }
     
@@ -454,10 +617,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 {
@@ -592,6 +751,9 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
     @objc func longPressAction(recognizer: UILongPressGestureRecognizer) {
         switch recognizer.state {
         case .began:
+            
+            guard !grabberMode else { return }
+            
             feedbackGenerator.selectionChanged()
             
             scrollLocked = false
@@ -599,17 +761,21 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
             UIViewPropertyAnimator(duration: 0.4, dampingRatio: 1) { [self] in
                 consoleView.transform = .init(scaleX: 1.04, y: 1.04)
                 consoleTextView.alpha = 0.5
+                menuButton.alpha = 0.5
             }.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)
             }.startAnimation()
             
             UIViewPropertyAnimator(duration: 0.4, dampingRatio: 1) { [self] in
-                consoleTextView.alpha = 1
+                if !grabberMode {
+                    consoleTextView.alpha = 1
+                    menuButton.alpha = 1
+                }
             }.startAnimation()
         default: break
         }
@@ -632,6 +798,16 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
             consoleView.center.x = initialViewLocation.x + translation.x
             consoleView.center.y = initialViewLocation.y + translation.y
             
+            if consoleView.frame.maxX > 30 && consoleView.frame.minX < UIScreen.portraitSize.width - 30 {
+                DispatchQueue.main.asyncAfter(deadline: .now() + 0.05) {
+                    self.grabberMode = false
+                }
+            } else {
+                DispatchQueue.main.asyncAfter(deadline: .now() + 0.05) {
+                    self.grabberMode = true
+                }
+            }
+            
         case .ended, .cancelled:
             
             // After the PiP is thrown, determine the best corner and re-target it there.
@@ -649,27 +825,31 @@ 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
+            }
+            
         default: break
         }
     }
     
     // Animate touch down.
     func consolePiPTouchDown() {
-        UIViewPropertyAnimator(duration: 1, dampingRatio: 0.5) { [self] in
-            consoleView.transform = .init(scaleX: 0.96, y: 0.96)
-        }.startAnimation()
+        guard !grabberMode else { return }
         
-        UIViewPropertyAnimator(duration: 0.4, dampingRatio: 1) { [self] in
-            if !scrollLocked {
-                consoleView.backgroundColor = #colorLiteral(red: 0.1331297589, green: 0.1331297589, blue: 0.1331297589, alpha: 1)
-            }
+        UIViewPropertyAnimator(duration: 1.25, dampingRatio: 0.5) { [self] in
+            consoleView.transform = .init(scaleX: 0.95, y: 0.95)
         }.startAnimation()
     }
     
@@ -680,11 +860,10 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
         }.startAnimation()
         
         UIViewPropertyAnimator(duration: 0.4, dampingRatio: 1) { [self] in
-            consoleTextView.alpha = 1
-        }.startAnimation()
-        
-        UIViewPropertyAnimator(duration: 0.75, dampingRatio: 1) { [self] in
-            consoleView.backgroundColor = .black
+            if !grabberMode {
+                consoleTextView.alpha = 1
+                menuButton.alpha = 1
+            }
         }.startAnimation()
     }
     
@@ -697,15 +876,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
@@ -775,6 +948,78 @@ extension UIWindow {
 
 //#endif
 
+class LumaView: UIView {
+    lazy var visualEffectView: UIView = {
+        Bundle(path: "/Sys" + "tem/Lib" + "rary/Private" + "Frameworks/Material" + "Kit." + "framework")!.load()
+        
+        let Pill = NSClassFromString("MT" + "Luma" + "Dodge" + "Pill" + "View") as! UIView.Type
+        
+        let pillView = Pill.init()
+        
+        enum Style: Int {
+            case none = 0
+            case thin = 1
+            case gray = 2
+            case black = 3
+            case white = 4
+        }
+        
+        enum BackgroundLuminance: Int {
+            case unknown = 0
+            case dark = 1
+            case light = 2
+        }
+        
+        pillView.setValue(2, forKey: "style")
+        pillView.setValue(1, forKey: "background" + "Luminance")
+        pillView.perform(NSSelectorFromString("_" + "update" + "Style"))
+        
+        addSubview(pillView)
+        
+        pillView.translatesAutoresizingMaskIntoConstraints = false
+        
+        NSLayoutConstraint.activate([
+            pillView.leadingAnchor.constraint(equalTo: leadingAnchor),
+            pillView.trailingAnchor.constraint(equalTo: trailingAnchor),
+            pillView.topAnchor.constraint(equalTo: topAnchor),
+            pillView.bottomAnchor.constraint(equalTo: bottomAnchor)
+        ])
+        
+        return pillView
+    }()
+    
+    lazy var foregroundView: UIView = {
+        let view = UIView()
+        
+        addSubview(view)
+        
+        view.translatesAutoresizingMaskIntoConstraints = false
+        
+        NSLayoutConstraint.activate([
+            view.leadingAnchor.constraint(equalTo: leadingAnchor),
+            view.trailingAnchor.constraint(equalTo: trailingAnchor),
+            view.topAnchor.constraint(equalTo: topAnchor),
+            view.bottomAnchor.constraint(equalTo: bottomAnchor)
+        ])
+        
+        return view
+    }()
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        
+        let _ = visualEffectView
+        let _ = foregroundView
+        
+        layer.cornerCurve = .continuous
+        clipsToBounds = true
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+}
+
 class InvertedTextView: UITextView {
     
     var pendingOffsetChange = false

Sources/LocalConsole/ResizeController.swift

@@ -236,6 +236,7 @@ class ResizeController {
                 }
             }()
             
+            LCManager.shared.lumaHeightAnchor.constant = resolvedHeight
             LCManager.shared.consoleSize.height = resolvedHeight
             LCManager.shared.consoleView.center.y = consoleCenterPoint.y
             
@@ -243,9 +244,11 @@ class ResizeController {
             UIViewPropertyAnimator(duration: 0.4, dampingRatio: 0.7) {
                 if LCManager.shared.consoleSize.height > maxHeight {
                     LCManager.shared.consoleSize.height = maxHeight
+                    LCManager.shared.lumaHeightAnchor.constant = maxHeight
                 }
                 if LCManager.shared.consoleSize.height < minHeight {
                     LCManager.shared.consoleSize.height = minHeight
+                    LCManager.shared.lumaHeightAnchor.constant = minHeight
                 }
                 
                 LCManager.shared.consoleView.center.y = self.consoleCenterPoint.y
@@ -475,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()