Update LCManager.swift

Sources/LocalConsole/LCManager.swift

@@ -15,8 +15,8 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
     
     public static let shared = LCManager()
     
-    /// Set the font size. The font can be set to a minimum value of 5.0 and a maximum value of 20.0. The default value is 7.5.
-    public var fontSize: CGFloat = 7.5 {
+    /// Set the font size. The font can be set to a minimum value of 5.0 and a maximum value of 20.0. The default value is 8.
+    public var fontSize: CGFloat = 8 {
         didSet {
             guard fontSize >= 4 else { fontSize = 4; return }
             guard fontSize <= 20 else { fontSize = 20; return }
@@ -44,7 +44,7 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
         }
     }
     
-    let defaultConsoleSize = CGSize(width: 228, height: 142)
+    let defaultConsoleSize = CGSize(width: 240, height: 148)
     
     lazy var borderView = UIView()
     
@@ -73,7 +73,7 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
         return lumaView
     }()
     
-    lazy var hideButton: UIButton = {
+    lazy var unhideButton: UIButton = {
         let button = UIButton()
         
         button.addAction(UIAction(handler: { [self] _ in
@@ -81,6 +81,9 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
                 consoleView.center = nearestTargetTo(consoleView.center, possibleTargets: possibleEndpoints.dropLast())
             }.startAnimation()
             grabberMode = false
+            
+            UserDefaults.standard.set(consoleView.center.x, forKey: "LocalConsole_X")
+            UserDefaults.standard.set(consoleView.center.y, forKey: "LocalConsole_Y")
         }), for: .touchUpInside)
         
         consoleView.addSubview(button)
@@ -106,22 +109,22 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
             
             // Update text view width.
             if consoleView.frame.size.width > ResizeController.kMaxConsoleWidth {
-                consoleTextView.frame.size.width = ResizeController.kMaxConsoleWidth - 4
+                consoleTextView.frame.size.width = ResizeController.kMaxConsoleWidth - 2
             } else if consoleView.frame.size.width < ResizeController.kMinConsoleWidth {
-                consoleTextView.frame.size.width = ResizeController.kMinConsoleWidth - 4
+                consoleTextView.frame.size.width = ResizeController.kMinConsoleWidth - 2
             } else {
-                consoleTextView.frame.size.width = consoleSize.width - 4
+                consoleTextView.frame.size.width = consoleSize.width - 2
             }
             
             // Update text view height.
             if consoleView.frame.size.height > ResizeController.kMaxConsoleHeight {
-                consoleTextView.frame.size.height = ResizeController.kMaxConsoleHeight - 4
+                consoleTextView.frame.size.height = ResizeController.kMaxConsoleHeight - 2
                 + (consoleView.frame.size.height - ResizeController.kMaxConsoleHeight) * 2 / 3
             } else if consoleView.frame.size.height < ResizeController.kMinConsoleHeight {
-                consoleTextView.frame.size.height = ResizeController.kMinConsoleHeight - 4
+                consoleTextView.frame.size.height = ResizeController.kMinConsoleHeight - 2
                 + (consoleView.frame.size.height - ResizeController.kMinConsoleHeight) * 2 / 3
             } else {
-                consoleTextView.frame.size.height = consoleSize.height - 4
+                consoleTextView.frame.size.height = consoleSize.height - 2
             }
             
             consoleTextView.contentOffset.y = consoleTextView.contentSize.height - consoleTextView.bounds.size.height
@@ -165,9 +168,9 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
                 
                 // Top endpoints.
                 CGPoint(x: consoleSize.width / 2 + 12,
-                        y: (UIScreen.hasRoundedCorners ? 44 : 16) + consoleSize.height / 2 + 12),
+                        y: (UIScreen.hasRoundedCorners ? 38 : 16) + consoleSize.height / 2 + 12),
                 CGPoint(x: UIScreen.portraitSize.width - consoleSize.width / 2 - 12,
-                        y: (UIScreen.hasRoundedCorners ? 44 : 16) + consoleSize.height / 2 + 12),
+                        y: (UIScreen.hasRoundedCorners ? 38 : 16) + consoleSize.height / 2 + 12),
                 
                 // Bottom endpoints.
                 CGPoint(x: consoleSize.width / 2 + 12,
@@ -209,7 +212,7 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
             
             // 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),
+                                     y: (UIScreen.hasRoundedCorners ? 38 : 16) + consoleSize.height / 2 + 12),
                              CGPoint(x: UIScreen.portraitSize.width / 2,
                                      y: UIScreen.portraitSize.height - consoleSize.height / 2 - (keyboardHeight ?? consoleWindow?.safeAreaInsets.bottom ?? 0) - 12)]
             
@@ -251,7 +254,7 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
         consoleView.layer.shadowOffset = CGSize(width: 0, height: 2)
         consoleView.alpha = 0
         
-        consoleView.layer.cornerRadius = 22
+        consoleView.layer.cornerRadius = 24
         consoleView.layer.cornerCurve = .continuous
         
         let _ = lumaView
@@ -267,10 +270,10 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
         consoleView.addSubview(borderView)
         
         // Configure text view.
-        consoleTextView.frame = CGRect(x: 2, y: 2, width: consoleSize.width - 4, height: consoleSize.height - 4)
+        consoleTextView.frame = CGRect(x: 1, y: 1, width: consoleSize.width - 2, height: consoleSize.height - 2)
         consoleTextView.isEditable = false
         consoleTextView.backgroundColor = .clear
-        consoleTextView.textContainerInset = UIEdgeInsets(top: 10, left: 8, bottom: 10, right: 8)
+        consoleTextView.textContainerInset = UIEdgeInsets(top: 10, left: 10, bottom: 10, right: 10)
         
         consoleTextView.isSelectable = false
         consoleTextView.showsVerticalScrollIndicator = false
@@ -294,7 +297,7 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
         consoleView.addGestureRecognizer(longPressRecognizer)
         
         // Prepare menu button.
-        let diameter = CGFloat(28)
+        let diameter = CGFloat(30)
         
         // This tuned button frame is used to adjust where the menu appears.
         menuButton = UIButton(frame: CGRect(x: consoleView.bounds.width - 44,
@@ -315,7 +318,7 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
         menuButton.addSubview(circle)
         
         let ellipsisImage = UIImageView(image: UIImage(systemName: "ellipsis",
-                                                       withConfiguration: UIImage.SymbolConfiguration(pointSize: 17, weight: .medium)))
+                                                       withConfiguration: UIImage.SymbolConfiguration(pointSize: 18, weight: .medium)))
         ellipsisImage.frame.size = circle.bounds.size
         ellipsisImage.contentMode = .center
         circle.addSubview(ellipsisImage)
@@ -325,7 +328,7 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
         menuButton.showsMenuAsPrimaryAction = true
         consoleView.addSubview(menuButton)
         
-        let _ = hideButton
+        let _ = unhideButton
         
         NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillHide), name: UIResponder.keyboardWillHideNotification, object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillShow), name: UIResponder.keyboardWillShowNotification, object: nil)
@@ -337,11 +340,7 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
         
         // Update console cached based on last-cached origin.
         func updateConsoleOrigin() {
-            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 = cachedConsolePosition // Update console center so possibleEndpoints are calculated correctly.
-            consoleView.center = nearestTargetTo(cachedConsolePosition, possibleTargets: possibleEndpoints)
+            snapToCachedEndpoint()
             
             if consoleView.center.x < 0 || consoleView.center.x > UIScreen.portraitSize.width {
                 grabberMode = true
@@ -397,6 +396,14 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
         }
     }
     
+    func snapToCachedEndpoint() {
+        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 = cachedConsolePosition // Update console center so possibleEndpoints are calculated correctly.
+        consoleView.center = nearestTargetTo(cachedConsolePosition, possibleTargets: possibleEndpoints)
+    }
+    
     // MARK: - Public
     
     public var isVisible = false {
@@ -406,9 +413,11 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
             if isVisible {
                 
                 if !isConsoleConfigured {
-                    configureWindow()
-                    configureConsole()
-                    isConsoleConfigured = true
+                    DispatchQueue.main.async { [self] in
+                        configureWindow()
+                        configureConsole()
+                        isConsoleConfigured = true
+                    }
                 }
                 
                 commitTextChanges(requestMenuUpdate: true)
@@ -469,7 +478,7 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
                 }.startAnimation(afterDelay: 0.06)
                 
                 consoleTextView.isUserInteractionEnabled = false
-                hideButton.isHidden = false
+                unhideButton.isHidden = false
                 
             } else {
                 
@@ -491,7 +500,7 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
                 }.startAnimation()
                 
                 consoleTextView.isUserInteractionEnabled = true
-                hideButton.isHidden = true
+                unhideButton.isHidden = true
             }
         }
     }
@@ -904,7 +913,9 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
         UIViewPropertyAnimator(duration: 0.4, dampingRatio: 1) { [self] in
             if !grabberMode {
                 consoleTextView.alpha = 1
-                menuButton.alpha = 1
+                if !ResizeController.shared.isActive {
+                    menuButton.alpha = 1
+                }
             }
         }.startAnimation()
     }

Sources/LocalConsole/ResizeController.swift

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