Update LCManager.swift

Added interaction and animations for hiding console away

README.md

@@ -17,7 +17,7 @@ Welcome to LocalConsole! This Swift Package makes on-device debugging easy with
 ```swift
 import LocalConsole
 
-let localConsoleManager = LCManager.shared
+let consoleManager = LCManager.shared
 ```
 
 ## **Usage**
@@ -25,30 +25,29 @@ Once prepared, the localConsole can be used throughout your project.
 ```swift
 
 // Show the console view.
-localConsoleManager.isVisible = true
+consoleManager.isVisible = true
 
 // Hide the console view.
-localConsoleManager.isVisible = false
+consoleManager.isVisible = false
 ```
 
 ```swift
 // Print items to the console view.
-localConsoleManager.print("Hello, world!")
+consoleManager.print("Hello, world!")
 
 // Clear console text.
-localConsoleManager.clear()
+consoleManager.clear()
 
 // Copy console text.
-localConsoleManager.copy()
+consoleManager.copy()
 ```
 
 ```swift
 // Change the console view font size.
-localConsoleManager.fontSize = 5
+consoleManager.fontSize = 5
 ```
 
 
 ## **To-Do**
-* Support for iOS 13
 * Screen edge console hiding
 * Make console view reactive to landscape/portrait switch

Sources/LocalConsole/Extensions.swift

@@ -22,7 +22,6 @@ extension UIScreen {
     static var hasRoundedCorners = UIScreen.main.value(forKey: "_" + "display" + "Corner" + "Radius") as! CGFloat > 0
 }
 
-@available(iOSApplicationExtension, unavailable)
 extension UIApplication {
     var statusBarHeight: CGFloat {
         if let window = UIApplication.shared.windows.first {

Sources/LocalConsole/LCManager.swift

@@ -12,7 +12,6 @@ import SwiftUI
 
 var GLOBAL_BORDER_TRACKERS: [BorderManager] = []
 
-@available(iOSApplicationExtension, unavailable)
 public class LCManager: NSObject, UIGestureRecognizerDelegate {
     
     public static let shared = LCManager()
@@ -48,6 +47,30 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
     
     let defaultConsoleSize = CGSize(width: 228, height: 142)
     
+    lazy var borderView = UIView()
+    
+    var lumaHeightAnchor: NSLayoutConstraint!
+    
+    lazy var lumaView: UIView = {
+        let lumaView = UIView.lumaView()
+        lumaView.alpha = 0
+        
+        consoleView.addSubview(lumaView)
+        
+        lumaView.translatesAutoresizingMaskIntoConstraints = false
+        
+        lumaHeightAnchor = lumaView.heightAnchor.constraint(equalToConstant: 96)
+        
+        NSLayoutConstraint.activate([
+            lumaView.leadingAnchor.constraint(equalTo: consoleView.leadingAnchor),
+            lumaView.trailingAnchor.constraint(equalTo: consoleView.trailingAnchor),
+            lumaHeightAnchor,
+            lumaView.centerYAnchor.constraint(equalTo: consoleView.centerYAnchor)
+        ])
+        
+        return lumaView
+    }()
+    
     /// The fixed size of the console view.
     lazy var consoleSize = defaultConsoleSize {
         didSet {
@@ -86,11 +109,11 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
     var consoleWindow: ConsoleWindow?
     
     // The console needs a parent view controller in order to display context menus.
-    let viewController = UIViewController()
+    lazy var viewController = UIViewController()
     lazy var consoleView = viewController.view!
     
     /// Text view that displays printed items.
-    let consoleTextView = InvertedTextView()
+    lazy var consoleTextView = InvertedTextView()
     
     /// Button that reveals menu.
     lazy var menuButton = UIButton()
@@ -99,23 +122,58 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
     var scrollLocked = true
     
     /// Feedback generator for the long press action.
-    let feedbackGenerator = UISelectionFeedbackGenerator()
+    lazy var feedbackGenerator = UISelectionFeedbackGenerator()
     
     lazy var panRecognizer = UIPanGestureRecognizer(target: self, action: #selector(consolePiPPanner(recognizer:)))
     lazy var longPressRecognizer = UILongPressGestureRecognizer(target: self, action: #selector(longPressAction(recognizer:)))
     
     /// 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 = [CGPoint(x: 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.hasRoundedCorners ? 44 : 16) + consoleSize.height / 2 + 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 {
+                
+                endpoints = [endpoints[0], endpoints[1]]
+                
+                // Left edge hiding endpoints.
+                if consoleView.center.y < UIScreen.portraitSize.height / 2 {
+                    endpoints.append(CGPoint(x: -consoleSize.width / 2 + 12,
+                                             y: endpoints[0].y))
+                } else {
+                    endpoints.append(CGPoint(x: -consoleSize.width / 2 + 12,
+                                             y: endpoints[1].y))
+                }
+            } else if consoleView.frame.maxX >= UIScreen.portraitSize.width {
+                
+                endpoints = [endpoints[2], endpoints[3]]
+                
+                // Right edge hiding endpoints.
+                if consoleView.center.y < UIScreen.portraitSize.height / 2 {
+                    endpoints.append(CGPoint(x: UIScreen.portraitSize.width + consoleSize.width / 2 - 12,
+                                             y: endpoints[0].y))
+                } else {
+                    endpoints.append(CGPoint(x: UIScreen.portraitSize.width + consoleSize.width / 2 - 12,
+                                             y: endpoints[1].y))
+                }
+            }
+            
+            return endpoints
+//            } else if consoleView.frame.minX >= 12
+            
         } else {
+            
+            // Two endpoints, one for the top, one for the bottom..
             return [CGPoint(x: UIScreen.portraitSize.width / 2,
                             y: (UIScreen.hasRoundedCorners ? 44 : 16) + consoleSize.height / 2 + 12),
                     CGPoint(x: UIScreen.portraitSize.width / 2,
@@ -140,7 +198,8 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
         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)
@@ -303,7 +362,74 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
         }
     }
     
-    private var _hasRelayedOffsetChange = false
+    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()
+                    
+                    lumaView.subviews.first?.alpha = 1
+                    lumaView.backgroundColor = .clear
+                }
+                
+                UIViewPropertyAnimator(duration: 0.3, dampingRatio: 1) { [self] in
+                    consoleTextView.alpha = 0
+                    menuButton.alpha = 0
+                }.startAnimation()
+                
+                UIViewPropertyAnimator(duration: 0.5, dampingRatio: 1) { [self] in
+                    lumaView.alpha = 1
+                }.startAnimation()
+                
+                UIViewPropertyAnimator(duration: 0.2, dampingRatio: 1) { [self] in
+                    borderView.alpha = 0
+                    consoleView.backgroundColor = .clear
+                }.startAnimation(afterDelay: 0.25)
+                
+                lumaHeightAnchor.constant = 96
+                UIViewPropertyAnimator(duration: 0.4, dampingRatio: 1) { [self] in
+                    lumaView.layer.cornerRadius = 8
+                    consoleView.layoutIfNeeded()
+                }.startAnimation(afterDelay: 0.3)
+                
+                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
+                    
+                    lumaView.backgroundColor = .black
+                }.startAnimation()
+                
+                UIViewPropertyAnimator(duration: 0.4, dampingRatio: 1) { [self] in
+                    lumaView.subviews.first?.alpha = 0
+                }.startAnimation(afterDelay: 0.2)
+                
+                UIViewPropertyAnimator(duration: 0.3, dampingRatio: 1) { [self] in
+                    consoleTextView.alpha = 1
+                    menuButton.alpha = 1
+                    borderView.alpha = 1
+                    consoleView.backgroundColor = .black
+                }.startAnimation(afterDelay: 0.3)
+                
+                UIViewPropertyAnimator(duration: 0.6, dampingRatio: 1) { [self] in
+                    lumaView.alpha = 0
+                    
+                }.startAnimation(afterDelay: 0.4)
+                
+                consoleTextView.isUserInteractionEnabled = true
+                
+            }
+        }
+    }
     
     /// Print items to the console view.
     public func print(_ items: Any) {
@@ -382,12 +508,46 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
         }
     }
     
+    var dynamicReportTimer: Timer? {
+        willSet { dynamicReportTimer?.invalidate() }
+    }
+    
     func systemReport() {
         DispatchQueue.main.async { [self] in
             
+            if currentText != "" { print("\n") }
+            
+            dynamicReportTimer = Timer.scheduledTimer(withTimeInterval: 1, repeats: true) { timer in
+                var _currentText = currentText
+                
+                // To optimize performance, only scan the last 2500 characters of text for system report changes.
+                let range: NSRange = {
+                    if _currentText.count <= 2500 {
+                        return NSMakeRange(0, _currentText.count)
+                    }
+                    return NSMakeRange(_currentText.count - 2500, 2500)
+                }()
+                
+                let regex0 = try! NSRegularExpression(pattern: "Thermal State:      .*", options: NSRegularExpression.Options.caseInsensitive)
+                _currentText = regex0.stringByReplacingMatches(in: _currentText, options: [], range: range, withTemplate: "Thermal State:      \(SystemReport.shared.thermalState)")
+                
+                let regex1 = try! NSRegularExpression(pattern: "System Uptime:      .*", options: NSRegularExpression.Options.caseInsensitive)
+                _currentText = regex1.stringByReplacingMatches(in: _currentText, options: [], range: range, withTemplate: "System Uptime:      \(ProcessInfo.processInfo.systemUptime.formattedString!)")
+                
+                let regex2 = try! NSRegularExpression(pattern: "Low Power Mode:     .*", options: NSRegularExpression.Options.caseInsensitive)
+                _currentText = regex2.stringByReplacingMatches(in: _currentText, options: [], range: range, withTemplate: "Low Power Mode:     \(ProcessInfo.processInfo.isLowPowerModeEnabled)")
+                
+                if currentText != _currentText {
+                    currentText = _currentText
+                } else {
+                    
+                    // Invalidate the timer if there is no longer anything to update.
+                    timer.invalidate()
+                }
+            }
+            
             print(
                   """
-                  \n
                   Model Name:         \(SystemReport.shared.gestaltMarketingName)
                   Model Identifier:   \(SystemReport.shared.gestaltModelIdentifier)
                   Architecture:       \(SystemReport.shared.gestaltArchitecture)
@@ -398,20 +558,20 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
                   Memory:             \(round(100 * Double(ProcessInfo.processInfo.physicalMemory) * pow(10, -9)) / 100) GB
                   Processor Cores:    \(Int(ProcessInfo.processInfo.processorCount))
                   Thermal State:      \(SystemReport.shared.thermalState)
-                  System Uptime:      \(Int(ProcessInfo.processInfo.systemUptime))s
+                  System Uptime:      \(ProcessInfo.processInfo.systemUptime.formattedString!)
                   Low Power Mode:     \(ProcessInfo.processInfo.isLowPowerModeEnabled)
                   """
             )
-            
         }
     }
     
     func displayReport() {
         DispatchQueue.main.async { [self] in
             
+            if currentText != "" { print("\n") }
+            
             print(
                   """
-                  \n
                   Screen Size:            \(UIScreen.main.bounds.size)
                   Screen Corner Radius:   \(UIScreen.main.value(forKey: "_displ" + "ayCorn" + "erRa" + "dius") as! CGFloat)
                   Screen Scale:           \(UIScreen.main.scale)
@@ -428,15 +588,15 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
     
     func commitTextChanges(requestMenuUpdate menuUpdateRequested: Bool) {
         
-        if consoleTextView.contentOffset.y > consoleTextView.contentSize.height - 20 - consoleTextView.bounds.size.height ||
-            _hasRelayedOffsetChange == false {
-            consoleTextView.pendingOffsetChange = true
+        if consoleTextView.contentOffset.y > consoleTextView.contentSize.height - consoleTextView.bounds.size.height - 20 {
             
-            _hasRelayedOffsetChange = true
+            // Weird, weird fix that makes the scroll view bottom pinning system work.
+            consoleTextView.isScrollEnabled.toggle()
+            consoleTextView.isScrollEnabled.toggle()
+            
+            consoleTextView.pendingOffsetChange = true
         }
         
-        consoleTextView.text = currentText
-        
         setAttributedText(currentText)
         
         if menuUpdateRequested {
@@ -560,6 +720,9 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
     @objc func longPressAction(recognizer: UILongPressGestureRecognizer) {
         switch recognizer.state {
         case .began:
+            
+            guard !grabberMode else { return }
+            
             feedbackGenerator.selectionChanged()
             
             scrollLocked = false
@@ -567,6 +730,7 @@ 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:
             
@@ -577,7 +741,10 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
             }.startAnimation()
             
             UIViewPropertyAnimator(duration: 0.4, dampingRatio: 1) { [self] in
-                consoleTextView.alpha = 1
+                if !grabberMode {
+                    consoleTextView.alpha = 1
+                    menuButton.alpha = 1
+                }
             }.startAnimation()
         default: break
         }
@@ -589,7 +756,7 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
             initialViewLocation = consoleView.center
         }
         
-        guard !scrollLocked else { return }
+        guard !scrollLocked || grabberMode else { return }
         
         let translation = recognizer.translation(in: consoleView.superview)
         let velocity = recognizer.velocity(in: consoleView.superview)
@@ -624,20 +791,20 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
             }
             positionAnimator.startAnimation()
             
+            DispatchQueue.main.asyncAfter(deadline: .now() + 0.05) {
+                self.grabberMode = nearestTargetPosition.x < 0 || nearestTargetPosition.x > UIScreen.portraitSize.width
+            }
+            
         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()
     }
     
@@ -648,11 +815,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()
     }
     
@@ -724,6 +890,48 @@ extension UIView {
         GLOBAL_BORDER_TRACKERS.append(tracker)
         tracker.activate()
     }
+    
+    static func lumaView() -> 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"))
+        
+        let pillContainer = UIView()
+        pillContainer.addSubview(pillView)
+        pillContainer.clipsToBounds = true
+        pillContainer.layer.cornerCurve = .continuous
+        
+        pillView.translatesAutoresizingMaskIntoConstraints = false
+        
+        NSLayoutConstraint.activate([
+            pillView.leadingAnchor.constraint(equalTo: pillContainer.leadingAnchor),
+            pillView.trailingAnchor.constraint(equalTo: pillContainer.trailingAnchor),
+            pillView.topAnchor.constraint(equalTo: pillContainer.topAnchor),
+            pillView.bottomAnchor.constraint(equalTo: pillContainer.bottomAnchor)
+        ])
+        
+        return pillContainer
+    }
 }
 
 extension UIWindow {
@@ -772,3 +980,15 @@ class InvertedTextView: UITextView {
         }
     }
 }
+
+extension TimeInterval {
+    var formattedString: String? {
+        let formatter = DateComponentsFormatter()
+        formatter.allowedUnits = [.hour, .minute, .second]
+        return formatter.string(from: self)
+    }
+}
+
+fileprivate func _debugPrint(_ items: Any) {
+    print(items)
+}

Sources/LocalConsole/ResizeController.swift

@@ -7,7 +7,6 @@
 
 import UIKit
 
-@available(iOSApplicationExtension, unavailable)
 class ResizeController {
     
     public static let shared = ResizeController()
@@ -330,7 +329,6 @@ class ResizeController {
     }
 }
 
-@available(iOSApplicationExtension, unavailable)
 class PlatterView: UIView {
     
     override init(frame: CGRect) {