Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| d995119198 | |||
| b4d7c06432 | |||
| a7b95a4379 |
@@ -312,7 +312,7 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
|
||||
let tapRecognizer = UITapStartEndGestureRecognizer(target: self, action: #selector(consolePiPTapStartEnd(recognizer:)))
|
||||
tapRecognizer.delegate = self
|
||||
|
||||
longPressRecognizer.minimumPressDuration = 0.1
|
||||
longPressRecognizer.minimumPressDuration = 0.3
|
||||
|
||||
consoleView.addGestureRecognizer(panRecognizer)
|
||||
consoleView.addGestureRecognizer(tapRecognizer)
|
||||
@@ -383,9 +383,11 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
|
||||
.first
|
||||
|
||||
if let windowScene = windowScene as? UIWindowScene {
|
||||
|
||||
windowSceneFound = true
|
||||
|
||||
UIWindow.swizzleStatusBarAppearanceOverride()
|
||||
SwizzleTool().swizzleContextMenuReverseOrder()
|
||||
|
||||
consoleWindow = ConsoleWindow(windowScene: windowScene)
|
||||
consoleWindow?.frame = UIScreen.main.bounds
|
||||
consoleWindow?.windowLevel = UIWindow.Level.statusBar
|
||||
@@ -397,9 +399,6 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
|
||||
|
||||
viewController.view.addSubview(consoleView)
|
||||
|
||||
UIWindow.swizzleStatusBarAppearanceOverride
|
||||
SwizzleTool().swizzleContextMenuReverseOrder()
|
||||
|
||||
updateConsoleOrigin()
|
||||
}
|
||||
}
|
||||
@@ -638,15 +637,23 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
|
||||
}
|
||||
|
||||
var dynamicReportTimer: Timer? {
|
||||
willSet { dynamicReportTimer?.invalidate() }
|
||||
willSet {
|
||||
timerInvalidationCounter = 0
|
||||
dynamicReportTimer?.invalidate()
|
||||
}
|
||||
}
|
||||
|
||||
var timerInvalidationCounter = 0
|
||||
|
||||
func systemReport() {
|
||||
DispatchQueue.main.async { [self] in
|
||||
|
||||
if currentText != "" { print("\n") }
|
||||
|
||||
dynamicReportTimer = Timer.scheduledTimer(withTimeInterval: 1, repeats: true) { timer in
|
||||
|
||||
guard consoleTextView.panGestureRecognizer.numberOfTouches == 0 else { return }
|
||||
|
||||
var _currentText = currentText
|
||||
|
||||
// To optimize performance, only scan the last 2500 characters of text for system report changes.
|
||||
@@ -668,10 +675,19 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
|
||||
|
||||
if currentText != _currentText {
|
||||
currentText = _currentText
|
||||
|
||||
timerInvalidationCounter = 0
|
||||
|
||||
} else {
|
||||
|
||||
// Invalidate the timer if there is no longer anything to update.
|
||||
timer.invalidate()
|
||||
timerInvalidationCounter += 1
|
||||
|
||||
// It has been 2 seconds and values have not changed.
|
||||
if timerInvalidationCounter == 2 {
|
||||
|
||||
// Invalidate the timer if there is no longer anything to update.
|
||||
dynamicReportTimer = nil
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -748,9 +764,11 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
|
||||
|
||||
func makeMenu() -> UIMenu {
|
||||
|
||||
let copy = UIAction(title: "Copy",
|
||||
image: UIImage(systemName: "doc.on.doc"), handler: { _ in
|
||||
self.copy()
|
||||
let share = UIAction(title: "Share Text...",
|
||||
image: UIImage(systemName: "square.and.arrow.up"), handler: { _ in
|
||||
let activityViewController = UIActivityViewController(activityItems: [self.consoleTextView.text ?? ""],
|
||||
applicationActivities: nil)
|
||||
self.viewController.present(activityViewController, animated: true)
|
||||
})
|
||||
|
||||
let resize = UIAction(title: "Resize Console",
|
||||
@@ -970,7 +988,7 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
|
||||
var menuContent: [UIMenuElement] = []
|
||||
|
||||
if consoleTextView.text != "" {
|
||||
menuContent.append(contentsOf: [copy, consoleActions])
|
||||
menuContent.append(contentsOf: [share, consoleActions])
|
||||
} else {
|
||||
menuContent.append(resize)
|
||||
}
|
||||
@@ -979,6 +997,8 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
|
||||
return UIMenu(title: "", children: menuContent)
|
||||
}
|
||||
|
||||
var consolePiPPopAnimator: UIViewPropertyAnimator?
|
||||
|
||||
@objc func longPressAction(recognizer: UILongPressGestureRecognizer) {
|
||||
switch recognizer.state {
|
||||
case .began:
|
||||
@@ -989,8 +1009,12 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
|
||||
|
||||
scrollLocked = false
|
||||
|
||||
UIViewPropertyAnimator(duration: 0.4, dampingRatio: 1) { [self] in
|
||||
consolePiPPopAnimator = UIViewPropertyAnimator(duration: 0.4, dampingRatio: 1) { [self] in
|
||||
consoleView.transform = .init(scaleX: 1.04, y: 1.04)
|
||||
}
|
||||
consolePiPPopAnimator?.startAnimation()
|
||||
|
||||
UIViewPropertyAnimator(duration: 0.4, dampingRatio: 1) { [self] in
|
||||
consoleTextView.alpha = 0.5
|
||||
menuButton.alpha = 0.5
|
||||
}.startAnimation()
|
||||
@@ -1025,7 +1049,10 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
|
||||
initialViewLocation = consoleView.center
|
||||
}
|
||||
|
||||
guard !scrollLocked else { return }
|
||||
guard !scrollLocked else {
|
||||
isPressed = false
|
||||
return
|
||||
}
|
||||
|
||||
let translation = recognizer.translation(in: consoleView.superview)
|
||||
let velocity = recognizer.velocity(in: consoleView.superview)
|
||||
@@ -1091,30 +1118,37 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
|
||||
}
|
||||
}
|
||||
|
||||
// Animate touch down.
|
||||
func consolePiPTouchDown() {
|
||||
guard !grabberMode else { return }
|
||||
|
||||
UIViewPropertyAnimator(duration: 0.75, dampingRatio: 1) { [self] in
|
||||
consoleView.transform = .init(scaleX: 0.97, y: 0.97)
|
||||
}.startAnimation()
|
||||
}
|
||||
var consolePiPTouchDownAnimator: UIViewPropertyAnimator?
|
||||
|
||||
// Animate touch up.
|
||||
func consolePiPTouchUp() {
|
||||
|
||||
UIViewPropertyAnimator(duration: scrollLocked ? 0.4 : 0.7, dampingRatio: scrollLocked ? 1 : 0.45) { [self] in
|
||||
consoleView.transform = .identity
|
||||
}.startAnimation()
|
||||
|
||||
UIViewPropertyAnimator(duration: 0.4, dampingRatio: 1) { [self] in
|
||||
if !grabberMode {
|
||||
consoleTextView.alpha = 1
|
||||
if !ResizeController.shared.isActive {
|
||||
menuButton.alpha = 1
|
||||
var isPressed: Bool = false {
|
||||
didSet {
|
||||
guard oldValue != isPressed else { return }
|
||||
|
||||
if isPressed {
|
||||
guard !grabberMode else { return }
|
||||
|
||||
consolePiPTouchDownAnimator = UIViewPropertyAnimator(duration: 0.6, dampingRatio: 1) { [self] in
|
||||
consoleView.transform = .init(scaleX: 0.96, y: 0.96)
|
||||
}
|
||||
consolePiPTouchDownAnimator?.startAnimation(afterDelay: 0.1)
|
||||
} else {
|
||||
consolePiPTouchDownAnimator?.stopAnimation(true)
|
||||
consolePiPPopAnimator?.stopAnimation(true)
|
||||
|
||||
UIViewPropertyAnimator(duration: scrollLocked ? 0.4 : 0.7, dampingRatio: scrollLocked ? 1 : 0.45) { [self] in
|
||||
consoleView.transform = .identity
|
||||
}.startAnimation()
|
||||
|
||||
UIViewPropertyAnimator(duration: 0.4, dampingRatio: 1) { [self] in
|
||||
if !grabberMode {
|
||||
consoleTextView.alpha = 1
|
||||
if !ResizeController.shared.isActive {
|
||||
menuButton.alpha = 1
|
||||
}
|
||||
}
|
||||
}.startAnimation()
|
||||
}
|
||||
}.startAnimation()
|
||||
}
|
||||
}
|
||||
|
||||
// Simulataneously listen to all gesture recognizers.
|
||||
@@ -1125,11 +1159,11 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
|
||||
@objc func consolePiPTapStartEnd(recognizer: UITapStartEndGestureRecognizer) {
|
||||
switch recognizer.state {
|
||||
case .began:
|
||||
consolePiPTouchDown()
|
||||
isPressed = true
|
||||
case .changed:
|
||||
break
|
||||
case .ended, .cancelled, .possible, .failed:
|
||||
consolePiPTouchUp()
|
||||
isPressed = false
|
||||
@unknown default:
|
||||
break
|
||||
}
|
||||
@@ -1196,12 +1230,13 @@ extension UIView {
|
||||
extension UIWindow {
|
||||
|
||||
/// Make sure this window does not have control over the status bar appearance.
|
||||
static let swizzleStatusBarAppearanceOverride: Void = {
|
||||
static func swizzleStatusBarAppearanceOverride() {
|
||||
guard let originalMethod = class_getInstanceMethod(UIWindow.self, NSSelectorFromString("_can" + "Affect" + "Status" + "Bar" + "Appearance")),
|
||||
let swizzledMethod = class_getInstanceMethod(UIWindow.self, #selector(swizzled_statusBarAppearance))
|
||||
else { return }
|
||||
|
||||
method_exchangeImplementations(originalMethod, swizzledMethod)
|
||||
}()
|
||||
}
|
||||
|
||||
@objc func swizzled_statusBarAppearance() -> Bool {
|
||||
return isKeyWindow
|
||||
@@ -1369,7 +1404,6 @@ fileprivate func _debugPrint(_ items: Any) {
|
||||
// Support for auto-rotate.
|
||||
class ConsoleViewController: UIViewController {
|
||||
|
||||
|
||||
override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
|
||||
|
||||
// Cancel the panner console is being panned to allow for location manipulation.
|
||||
|
||||
Reference in New Issue
Block a user