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

🎨 Add UIColor context to fix CI Build compile

Sources/LocalConsole/LCManager.swift

@@ -8,7 +8,6 @@
 //#if canImport(UIKit)
 
 import UIKit
-import MachO
 
 var GLOBAL_DEBUG_BORDERS = false
 var GLOBAL_BORDER_TRACKERS: [BorderManager] = []
@@ -75,14 +74,14 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
                     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 - (consoleWindow?.safeAreaInsets.bottom ?? 0) - 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 - (consoleWindow?.safeAreaInsets.bottom ?? 0) - 12)]
+                            y: UIScreen.portraitSize.height - consoleSize.height / 2 - (keyboardHeight ?? consoleWindow?.safeAreaInsets.bottom ?? 0) - 12)]
         } 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 - (consoleWindow?.safeAreaInsets.bottom ?? 0) - 12)]
+                            y: UIScreen.portraitSize.height - consoleSize.height / 2 - (keyboardHeight ?? consoleWindow?.safeAreaInsets.bottom ?? 0) - 12)]
         }
     }
     
@@ -175,6 +174,9 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
         consoleView.addSubview(menuButton)
         
         UIView.swizzleDebugBehaviour
+        
+        NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillHide), name: UIResponder.keyboardWillHideNotification, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillShow), name: UIResponder.keyboardWillShowNotification, object: nil)
     }
     
     /// Adds a LocalConsole window to the app's main scene.
@@ -279,6 +281,32 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
     
     // MARK: - Private
     
+    
+    // MARK: Handle keyboard show/hide.
+    private var keyboardHeight: CGFloat? = nil {
+        didSet {
+            
+            if consoleView.center != possibleEndpoints[0] && consoleView.center != possibleEndpoints[1] {
+                let nearestTargetPosition = nearestTargetTo(consoleView.center, possibleTargets: possibleEndpoints.suffix(2))
+                
+                UIViewPropertyAnimator(duration: 0.55, dampingRatio: 1) {
+                    self.consoleView.center = nearestTargetPosition
+                }.startAnimation()
+            }
+        }
+    }
+    
+    @objc func keyboardWillShow(_ notification: Notification) {
+        if let keyboardFrame: NSValue = notification.userInfo?[UIResponder.keyboardFrameEndUserInfoKey] as? NSValue {
+            let keyboardRectangle = keyboardFrame.cgRectValue
+            self.keyboardHeight = keyboardRectangle.height
+        }
+    }
+    
+    @objc func keyboardWillHide() {
+        keyboardHeight = nil
+    }
+    
     private var debugBordersEnabled = false {
         didSet {
             GLOBAL_DEBUG_BORDERS = debugBordersEnabled
@@ -309,50 +337,25 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
     
     func systemReport() {
         DispatchQueue.main.async { [self] in
-            print("Screen Scale:        \(UIScreen.main.scale)\n")
-            print("Screen Size:         \(UIScreen.main.bounds.size)")
-            print("Screen Radius:       \(UIScreen.main.value(forKey: "_displayCornerRadius") as! CGFloat)")
-            print("Max Frame Rate:      \(UIScreen.main.maximumFramesPerSecond) Hz")
-            print("Low Power Mode:      \(ProcessInfo.processInfo.isLowPowerModeEnabled)")
-            print("System Uptime:       \(Int(ProcessInfo.processInfo.systemUptime))s")
-            print("OS Version:          \(versionString)")
-            print("Thermal State:       \(thermalState)")
-            print("Processor Cores:     \(Int(ProcessInfo.processInfo.processorCount))")
-            print("Device RAM:          \(round(100 * Double(ProcessInfo.processInfo.physicalMemory) * pow(10, -9)) / 100) GB")
-            print("Architecture:        \(deviceArchitecture)")
-            print("Model:               \(modelIdentifier)")
+            print("Screen Scale:       \(UIScreen.main.scale)\n")
+            print("Screen Radius:      \(UIScreen.main.value(forKey: "_displayCornerRadius") as! CGFloat)")
+            print("Screen Size:        \(UIScreen.main.bounds.size)")
+            print("Max Frame Rate:     \(UIScreen.main.maximumFramesPerSecond) Hz")
+            print("Low Power Mode:     \(ProcessInfo.processInfo.isLowPowerModeEnabled)")
+            print("System Uptime:      \(Int(ProcessInfo.processInfo.systemUptime))s")
+            print("Thermal State:      \(SystemReport.shared.thermalState)")
+            print("Processor Cores:    \(Int(ProcessInfo.processInfo.processorCount))")
+            print("Memory:             \(round(100 * Double(ProcessInfo.processInfo.physicalMemory) * pow(10, -9)) / 100) GB")
+            print("OS Compile Date:    \(SystemReport.shared.compileDate)")
+            print("System Version:     \(SystemReport.shared.versionString)")
+            print("Kernel Version:     \(SystemReport.shared.kernel) \(SystemReport.shared.kernelVersion)")
+            print("Firmware:           \(SystemReport.shared.gestaltFirmwareVersion)")
+            print("Architecture:       \(SystemReport.shared.gestaltArchitecture)")
+            print("Model Identifier:   \(SystemReport.shared.gestaltModelIdentifier)")
+            print("Marketing Name:     \(SystemReport.shared.gestaltMarketingName)")
         }
     }
     
-    var modelIdentifier: String {
-        if let simulatorModelIdentifier = ProcessInfo().environment["SIMULATOR_MODEL_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)
-    }
-    
-    var deviceArchitecture: String {
-        let info = NXGetLocalArchInfo()
-        return String(utf8String: (info?.pointee.description)!) ?? "Unknown"
-    }
-    
-    var versionString: String {
-        ProcessInfo.processInfo.operatingSystemVersionString
-            .replacingOccurrences(of: "Build ", with: "")
-            .replacingOccurrences(of: "Version ", with: "")
-    }
-    
-    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"
-        }
-    }
     
     @objc func toggleLock() {
         scrollLocked.toggle()

Sources/LocalConsole/ResizeController.swift

@@ -408,7 +408,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)

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: "/private/var/containers/Shared/SystemGroup/systemgroup.com.apple.mobilegestaltcache/Library/Caches/com.apple.MobileGestalt.plist")
+        
+        let dictionary = NSDictionary(contentsOf: url)
+        return dictionary?.value(forKey: "CacheExtra") as? NSDictionary
+    }()
+    
+    // Device marketing name.
+    lazy var gestaltMarketingName: Any = gestaltCacheExtra?.value(forKey: "Z/dqyWS6OZTRy10UcmUAhw") ?? "Unknown"
+    
+    // iBoot (second-stage loader) version.
+    lazy var gestaltFirmwareVersion: Any = gestaltCacheExtra?.value(forKey: "LeSRsiLoJCMhjn6nd6GWbQ") ?? "Unknown"
+    
+    // CPU architecture.
+    lazy var gestaltArchitecture: Any = gestaltCacheExtra?.value(forKey: "k7QIBwZJJOVw+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: "h9jDsbgj7xIVeIQ8S3/X3Q") ?? modelIdentifier
+    
+    // Fallback in case gestaltModelIdentifier doesn't return a value.
+    var modelIdentifier: String {
+        if let simulatorModelIdentifier = ProcessInfo().environment["SIMULATOR_MODEL_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("kern.ostype", nil, &size, nil, 0)
+        
+        var string = [CChar](repeating: 0,  count: Int(size))
+        sysctlbyname("kern.ostype", &string, &size, nil, 0)
+        return String(cString: string)
+    }
+    
+    var kernelVersion: String {
+        var size = 0
+        sysctlbyname("kern.osrelease", nil, &size, nil, 0)
+        
+        var string = [CChar](repeating: 0,  count: Int(size))
+        sysctlbyname("kern.osrelease", &string, &size, nil, 0)
+        return String(cString: string)
+    }
+    
+    var compileDate: String {
+        var size = 0
+        sysctlbyname("kern.version", nil, &size, nil, 0)
+        
+        var string = [CChar](repeating: 0,  count: Int(size))
+        sysctlbyname("kern.version", &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"
+    }
+}