Update LCManager.swift

Code maintenance, fix for grabber long press bug.

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 Duraid Abdul
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -3,8 +3,8 @@
 Welcome to LocalConsole! This Swift Package makes on-device debugging easy with a convenient PiP-style console that can display items in the same way ```print()``` will in Xcode. This tool can also dynamically display view frames and restart SpringBoard right from your live app.
 
 <div>
-  <img src="https://github.com/duraidabdul/LocalConsole/blob/main/Additional%20Files/Demo_Pan.gif?raw=true" width="320">
-  <img src="https://github.com/duraidabdul/LocalConsole/blob/main/Additional%20Files/Demo_Resize.gif?raw=true" width="320">
+  <img src="https://github.com/duraidabdul/Demos/blob/main/Demo_Pan.gif?raw=true" width="320">
+  <img src="https://github.com/duraidabdul/Demos/blob/main/Demo_Resize.gif?raw=true" width="320">
 </div>
 
 ## **Setup**
@@ -17,38 +17,32 @@ Welcome to LocalConsole! This Swift Package makes on-device debugging easy with
 ```swift
 import LocalConsole
 
-let localConsoleManager = LCManager.shared
+let consoleManager = LCManager.shared
 ```
 
 ## **Usage**
 Once prepared, the localConsole can be used throughout your project.
 ```swift
 
-// Show the console view.
-localConsoleManager.isVisible = true
+// Activate the console view.
+consoleManager.isVisible = true
 
-// Hide the console view.
-localConsoleManager.isVisible = false
+// Deactivate the console view.
+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,6 +22,7 @@ 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/ResizeController.swift

@@ -7,6 +7,7 @@
 
 import UIKit
 
+@available(iOSApplicationExtension, unavailable)
 class ResizeController {
     
     public static let shared = ResizeController()
@@ -114,8 +115,18 @@ class ResizeController {
             // Ensure initial autolayout is performed unanimated.
             LCManager.shared.consoleWindow?.layoutIfNeeded()
             
+            FrameRateRequest().perform(duration: 1.5)
+            
             if isActive {
                 
+                UIViewPropertyAnimator(duration: 0.75, dampingRatio: 1) {
+                    
+                    let textView = LCManager.shared.consoleTextView
+                    
+                    textView.contentOffset.y = textView.contentSize.height - textView.bounds.size.height
+                }.startAnimation()
+                
+                
                 if LCManager.shared.consoleView.traitCollection.userInterfaceStyle == .light {
                     LCManager.shared.consoleView.layer.shadowOpacity = 0.25
                 }
@@ -161,7 +172,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()
@@ -189,15 +200,22 @@ class ResizeController {
     
     var initialHeight = CGFloat.zero
     
+    static let kMinConsoleHeight: CGFloat = 108
+    static let kMaxConsoleHeight: CGFloat = 346
+    
+    let verticalPanner_frameRateRequest = FrameRateRequest()
+    
     @objc func verticalPanner(recognizer: UIPanGestureRecognizer) {
         
         let translation = recognizer.translation(in: bottomGrabber.superview)
         
-        let maxHeight: CGFloat = 346
-        let minHeight: CGFloat = 108
+        let minHeight = Self.kMinConsoleHeight
+        let maxHeight = Self.kMaxConsoleHeight
         
         switch recognizer.state {
         case .began:
+            verticalPanner_frameRateRequest.isActive = true
+            
             initialHeight = LCManager.shared.consoleSize.height
             
             UIViewPropertyAnimator(duration: 0.4, dampingRatio: 1) { [self] in
@@ -224,16 +242,23 @@ class ResizeController {
                 }
             }()
             
+            LCManager.shared.lumaHeightAnchor.constant = resolvedHeight
             LCManager.shared.consoleSize.height = resolvedHeight
             LCManager.shared.consoleView.center.y = consoleCenterPoint.y
             
         case .ended, .cancelled:
+            verticalPanner_frameRateRequest.isActive = false
+            
+            FrameRateRequest().perform(duration: 0.4)
+            
             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
@@ -252,17 +277,22 @@ class ResizeController {
     
     var initialWidth = CGFloat.zero
     
+    static let kMinConsoleWidth: CGFloat = 112
     static let kMaxConsoleWidth: CGFloat = UIScreen.portraitSize.width - 56
     
+    let horizontalPanner_frameRateRequest = FrameRateRequest()
+    
     @objc func horizontalPanner(recognizer: UIPanGestureRecognizer) {
         
         let translation = recognizer.translation(in: bottomGrabber.superview)
         
-        let maxWidth: CGFloat = Self.kMaxConsoleWidth
-        let minWidth: CGFloat = 112
+        let minWidth = Self.kMinConsoleWidth
+        let maxWidth = Self.kMaxConsoleWidth
         
         switch recognizer.state {
         case .began:
+            horizontalPanner_frameRateRequest.isActive = true
+            
             initialWidth = LCManager.shared.consoleSize.width
             
             UIViewPropertyAnimator(duration: 0.4, dampingRatio: 1) { [self] in
@@ -294,6 +324,10 @@ class ResizeController {
             
         case .ended, .cancelled:
             
+            horizontalPanner_frameRateRequest.isActive = false
+            
+            FrameRateRequest().perform(duration: 0.4)
+            
             UIViewPropertyAnimator(duration: 0.4, dampingRatio: 0.7) {
                 if LCManager.shared.consoleSize.width > maxWidth {
                     LCManager.shared.consoleSize.width = maxWidth
@@ -317,6 +351,7 @@ class ResizeController {
     }
 }
 
+@available(iOSApplicationExtension, unavailable)
 class PlatterView: UIView {
     
     override init(frame: CGRect) {
@@ -377,6 +412,7 @@ class PlatterView: UIView {
         
         let subtitleLabel = UILabel()
         subtitleLabel.text = "Use the grabbers to resize the console."
+        subtitleLabel.font = .systemFont(ofSize: 17, weight: .medium)
         subtitleLabel.sizeToFit()
         subtitleLabel.alpha = 0.5
         subtitleLabel.center.x = bounds.width / 2
@@ -408,7 +444,7 @@ class PlatterView: UIView {
     
     lazy var doneButton: UIButton = {
         let button = UIButton(type: .custom)
-        button.backgroundColor = .systemBlue.resolvedColor(with: UITraitCollection(userInterfaceStyle: .dark))
+        button.backgroundColor = UIColor.systemBlue.resolvedColor(with: UITraitCollection(userInterfaceStyle: .dark))
         button.setTitle("Done", for: .normal)
         button.setTitleColor(.white, for: .normal)
         button.titleLabel?.font = .systemFont(ofSize: 17, weight: .medium)
@@ -455,11 +491,12 @@ class PlatterView: UIView {
             
             // Resolves a text view frame animation bug that occurs when *decreasing* text view width.
             if LCManager.shared.consoleSize.width > LCManager.shared.defaultConsoleSize.width {
-                LCManager.shared.consoleTextView.frame.size.width = LCManager.shared.defaultConsoleSize.width
+                LCManager.shared.consoleTextView.frame.size.width = LCManager.shared.defaultConsoleSize.width - 4
             }
             
             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()

Sources/LocalConsole/SystemReport.swift

@@ -0,0 +1,108 @@
+//
+//  SystemReport.swift
+//  LocalConsole
+//
+//  Created by Duraid Abdul on 2021-06-01.
+//
+
+import Foundation
+import MachO
+
+class SystemReport {
+    static let shared = SystemReport()
+    
+    var versionString: String {
+        ProcessInfo.processInfo.operatingSystemVersionString
+            .replacingOccurrences(of: "Build ", with: "")
+            .replacingOccurrences(of: "Version ", with: "")
+    }
+    
+    // Current device thermal state.
+    var thermalState: String {
+        let state = ProcessInfo.processInfo.thermalState
+        
+        switch state {
+        case .nominal: return "Nominal"
+        case .fair : return "Fair"
+        case .serious : return "Serious"
+        case .critical : return "Critical"
+        default: return "Unknown"
+        }
+    }
+    
+    // Retrieve device mobile gestalt cache.
+    lazy var gestaltCacheExtra: NSDictionary? = {
+        let url = URL(fileURLWithPath: "/pri" + "vate/va" + "r/containe" + "rs/Shared/Sys" + "temGroup/sys" + "temgroup.com.apple.mobilegestal" + "tcache/Libr" + "ary/Ca" + "ches/com.app" + "le.MobileGes" + "talt.plist")
+        
+        let dictionary = NSDictionary(contentsOf: url)
+        return dictionary?.value(forKey: "CacheE" + "xtra") as? NSDictionary
+    }()
+    
+    // Device marketing name.
+    lazy var gestaltMarketingName: Any = gestaltCacheExtra?.value(forKey: "Z/dqyWS6OZ" + "TRy10UcmUAhw") ?? "Unknown"
+    
+    // iBoot (second-stage loader) version.
+    lazy var gestaltFirmwareVersion: Any = gestaltCacheExtra?.value(forKey: "LeSRsiLoJC" + "Mhjn6nd6GWbQ") ?? "Unknown"
+    
+    // CPU architecture.
+    lazy var gestaltArchitecture: Any = gestaltCacheExtra?.value(forKey: "k7QIBwZJJO" + "Vw+Sej/8h8VA") ?? deviceArchitecture
+    
+    // Fallback in case gestaltArchitecture doesn't return a value.
+    var deviceArchitecture: String {
+        let info = NXGetLocalArchInfo()
+        return String(utf8String: (info?.pointee.description)!) ?? "Unknown"
+    }
+    
+    lazy var gestaltModelIdentifier: Any = gestaltCacheExtra?.value(forKey: "h9jDsbgj7xI" + "VeIQ8S3/X3Q") ?? modelIdentifier
+    
+    // Fallback in case gestaltModelIdentifier doesn't return a value.
+    var modelIdentifier: String {
+        if let simulatorModelIdentifier = ProcessInfo().environment["SIMULATOR_MO" + "DEL_IDENTIFIER"] { return simulatorModelIdentifier }
+        var sysinfo = utsname()
+        uname(&sysinfo) // ignore return value
+        return String(bytes: Data(bytes: &sysinfo.machine, count: Int(_SYS_NAMELEN)), encoding: .ascii)?.trimmingCharacters(in: .controlCharacters) ?? "Unknown"
+    }
+    
+    var kernel: String {
+        var size = 0
+        sysctlbyname("ker" + "n.os" + "type", nil, &size, nil, 0)
+        
+        var string = [CChar](repeating: 0,  count: Int(size))
+        sysctlbyname("ker" + "n.os" + "type", &string, &size, nil, 0)
+        return String(cString: string)
+    }
+    
+    var kernelVersion: String {
+        var size = 0
+        sysctlbyname("ker" + "n.os" + "release", nil, &size, nil, 0)
+        
+        var string = [CChar](repeating: 0,  count: Int(size))
+        sysctlbyname("ker" + "n.os" + "release", &string, &size, nil, 0)
+        return String(cString: string)
+    }
+    
+    var compileDate: String {
+        var size = 0
+        sysctlbyname("ker" + "n.ve" + "rsion", nil, &size, nil, 0)
+        
+        var string = [CChar](repeating: 0,  count: Int(size))
+        sysctlbyname("ker" + "n.ve" + "rsion", &string, &size, nil, 0)
+        let fullString = String(cString: string) /// Ex: Darwin Kernel Version 20.6.0: Mon May 10 03:15:29 PDT 2021; root:xnu-7195.140.13.0.1~20/RELEASE_ARM64_T8101
+        
+        let detector = try? NSDataDetector(types: NSTextCheckingResult.CheckingType.date.rawValue)
+        if let matches = detector?.matches(in: fullString, options: [], range: NSRange(location: 0, length: fullString.utf16.count)) {
+            for match in matches {
+                
+                if let date = match.date {
+                    
+                    let dateformatter = DateFormatter()
+                    dateformatter.dateStyle = .medium
+                    
+                    return dateformatter.string(from: date)
+                }
+            }
+        }
+        
+        return "Unknown"
+    }
+}