@capgo/capacitor-updater 8.47.9 → 8.47.11

package/ios/Sources/CapacitorUpdaterPlugin/ShakeMenu.swift

@@ -7,6 +7,10 @@
 import UIKit
 import Capacitor
 
+private var lastShakeMenuShownAt: TimeInterval = 0
+private let shakeMenuCooldownSeconds: TimeInterval = 1.2
+private let threeFingerPinchScaleDelta: CGFloat = 0.30
+
 extension UIApplication {
     // swiftlint:disable:next line_length
     public class func topViewController(_ base: UIViewController? = UIApplication.shared.windows.first?.rootViewController) -> UIViewController? {
@@ -23,45 +27,140 @@ extension UIApplication {
     }
 }
 
+extension CapacitorUpdaterPlugin: UIGestureRecognizerDelegate {
+    func syncShakeMenuGestureRecognizer() {
+        DispatchQueue.main.async { [weak self] in
+            guard let self else { return }
+
+            let shouldInstall = self.shakeMenuGesture == Self.shakeMenuGestureThreeFingerPinch &&
+                (self.shakeMenuEnabled || self.shakeChannelSelectorEnabled)
+
+            guard shouldInstall, let targetView = self.bridge?.webView ?? self.bridge?.viewController?.view else {
+                self.removeShakeMenuGestureRecognizer()
+                return
+            }
+
+            if self.shakeMenuPinchGestureRecognizer?.view === targetView {
+                return
+            }
+
+            self.removeShakeMenuGestureRecognizer()
+
+            let recognizer = UIPinchGestureRecognizer(target: self, action: #selector(self.handleShakeMenuPinch(_:)))
+            recognizer.cancelsTouchesInView = false
+            recognizer.delaysTouchesBegan = false
+            recognizer.delaysTouchesEnded = false
+            recognizer.delegate = self
+            targetView.addGestureRecognizer(recognizer)
+            self.shakeMenuPinchGestureRecognizer = recognizer
+            self.logger.info("Three finger pinch menu gesture initialized")
+        }
+    }
+
+    func removeShakeMenuGestureRecognizer() {
+        if let recognizer = self.shakeMenuPinchGestureRecognizer {
+            recognizer.view?.removeGestureRecognizer(recognizer)
+            self.shakeMenuPinchGestureRecognizer = nil
+            self.shakeMenuPinchGestureTriggered = false
+            self.logger.info("Three finger pinch menu gesture stopped")
+        }
+    }
+
+    @objc func handleShakeMenuPinch(_ recognizer: UIPinchGestureRecognizer) {
+        if recognizer.state == .ended || recognizer.state == .cancelled || recognizer.state == .failed {
+            self.shakeMenuPinchGestureTriggered = false
+            return
+        }
+        guard recognizer.state == .changed, !self.shakeMenuPinchGestureTriggered, recognizer.numberOfTouches == 3 else {
+            return
+        }
+        guard abs(recognizer.scale - 1) >= threeFingerPinchScaleDelta else {
+            return
+        }
+        guard self.shakeMenuGesture == Self.shakeMenuGestureThreeFingerPinch, let bridge = self.bridge else {
+            return
+        }
+        guard let window = recognizer.view?.window ?? bridge.viewController?.view.window else {
+            return
+        }
+
+        self.shakeMenuPinchGestureTriggered = true
+        _ = window.showCapacitorUpdaterMenu(plugin: self, bridge: bridge, gestureName: "Three finger pinch")
+    }
+
+    public func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
+        if gestureRecognizer === self.shakeMenuPinchGestureRecognizer {
+            self.shakeMenuPinchGestureTriggered = false
+        }
+        return true
+    }
+
+    public func gestureRecognizer(
+        _: UIGestureRecognizer,
+        shouldRecognizeSimultaneouslyWith _: UIGestureRecognizer
+    ) -> Bool {
+        true
+    }
+}
+
 extension UIWindow {
     override open func motionEnded(_ motion: UIEvent.EventSubtype, with event: UIEvent?) {
         if motion == .motionShake {
-            // Find the CapacitorUpdaterPlugin instance
             guard let bridgeViewController = rootViewController as? CAPBridgeViewController,
                   let bridge = bridgeViewController.bridge,
                   let plugin = bridge.plugin(withName: "CapacitorUpdater") as? CapacitorUpdaterPlugin else {
                 return
             }
-
-            let canShowPreviewMenu = plugin.shakeMenuEnabled && plugin.hasActivePreviewSession()
-            let canShowChannelSelector = plugin.shakeChannelSelectorEnabled
-
-            if !canShowPreviewMenu && !canShowChannelSelector {
-                if plugin.shakeMenuEnabled {
-                    plugin.logger.info("Shake preview menu ignored because no preview session is active")
-                }
+            guard plugin.shakeMenuGesture == CapacitorUpdaterPlugin.shakeMenuGestureShake else {
                 return
             }
 
-            if canShowPreviewMenu {
-                showDefaultMenu(plugin: plugin, bridge: bridge)
-            } else {
-                showChannelSelector(plugin: plugin, bridge: bridge)
+            _ = showCapacitorUpdaterMenu(plugin: plugin, bridge: bridge, gestureName: "Shake")
+        }
+    }
+
+    @discardableResult
+    fileprivate func showCapacitorUpdaterMenu(plugin: CapacitorUpdaterPlugin, bridge: CAPBridgeProtocol, gestureName: String) -> Bool {
+        let canShowPreviewMenu = plugin.shakeMenuEnabled && plugin.hasActivePreviewSession()
+        let canShowChannelSelector = plugin.shakeChannelSelectorEnabled
+
+        if !canShowPreviewMenu && !canShowChannelSelector {
+            if plugin.shakeMenuEnabled {
+                plugin.logger.info("\(gestureName) preview menu ignored because no preview session is active")
             }
+            return false
         }
+
+        let now = Date().timeIntervalSince1970
+        guard now - lastShakeMenuShownAt >= shakeMenuCooldownSeconds else {
+            plugin.logger.info("\(gestureName) menu ignored because cooldown is active")
+            return false
+        }
+
+        let didShow = canShowPreviewMenu
+            ? showDefaultMenu(plugin: plugin, bridge: bridge)
+            : showChannelSelector(plugin: plugin, bridge: bridge)
+
+        if didShow {
+            lastShakeMenuShownAt = now
+        }
+        return didShow
     }
 
-    private func showDefaultMenu(plugin: CapacitorUpdaterPlugin, bridge: CAPBridgeProtocol) {
+    @discardableResult
+    private func showDefaultMenu(plugin: CapacitorUpdaterPlugin, bridge: CAPBridgeProtocol) -> Bool {
         // Prevent multiple alerts from showing
-        if let topVC = UIApplication.topViewController(),
-           topVC.isKind(of: UIAlertController.self) {
+        guard let topVC = UIApplication.topViewController() else {
+            return false
+        }
+        if topVC.isKind(of: UIAlertController.self) {
             plugin.logger.info("UIAlertController is already presented")
-            return
+            return false
         }
 
         guard plugin.hasActivePreviewSession() else {
             plugin.logger.info("Shake preview menu ignored because no preview session is active")
-            return
+            return false
         }
 
         let appName = Bundle.main.infoDictionary?["CFBundleDisplayName"] as? String ?? "App"
@@ -96,7 +195,7 @@ extension UIWindow {
         if plugin.shakeChannelSelectorEnabled {
             alertShake.addAction(UIAlertAction(title: "Switch channel", style: .default) { _ in
                 let showSelector = {
-                    self.showChannelSelector(plugin: plugin, bridge: bridge)
+                    _ = self.showChannelSelector(plugin: plugin, bridge: bridge)
                 }
 
                 if let presenter = alertShake.presentingViewController {
@@ -110,10 +209,9 @@ extension UIWindow {
         alertShake.addAction(UIAlertAction(title: cancelButtonTitle, style: .default))
 
         DispatchQueue.main.async {
-            if let topVC = UIApplication.topViewController() {
-                topVC.present(alertShake, animated: true)
-            }
+            topVC.present(alertShake, animated: true)
         }
+        return true
     }
 
     private func showConfiguredDefaultMenu(plugin: CapacitorUpdaterPlugin, bridge: CAPBridgeProtocol) {
@@ -179,12 +277,15 @@ extension UIWindow {
         }
     }
 
-    private func showChannelSelector(plugin: CapacitorUpdaterPlugin, bridge: CAPBridgeProtocol) {
+    @discardableResult
+    private func showChannelSelector(plugin: CapacitorUpdaterPlugin, bridge: CAPBridgeProtocol) -> Bool {
         // Prevent multiple alerts from showing
-        if let topVC = UIApplication.topViewController(),
-           topVC.isKind(of: UIAlertController.self) {
+        guard let topVC = UIApplication.topViewController() else {
+            return false
+        }
+        if topVC.isKind(of: UIAlertController.self) {
             plugin.logger.info("UIAlertController is already presented")
-            return
+            return false
         }
 
         let updater = plugin.implementation
@@ -208,28 +309,27 @@ extension UIWindow {
         })
 
         DispatchQueue.main.async {
-            if let topVC = UIApplication.topViewController() {
-                topVC.present(loadingAlert, animated: true) {
-                    // Fetch channels in background
-                    DispatchQueue.global(qos: .userInitiated).async {
-                        let result = updater.listChannels()
+            topVC.present(loadingAlert, animated: true) {
+                // Fetch channels in background
+                DispatchQueue.global(qos: .userInitiated).async {
+                    let result = updater.listChannels()
 
-                        DispatchQueue.main.async {
-                            loadingAlert.dismiss(animated: true) {
-                                guard !didCancel else { return }
-                                if !result.error.isEmpty {
-                                    self.showError(message: "Failed to load channels: \(result.error)", plugin: plugin)
-                                } else if result.channels.isEmpty {
-                                    self.showError(message: "No channels available for self-assignment", plugin: plugin)
-                                } else {
-                                    self.presentChannelPicker(channels: result.channels, plugin: plugin, bridge: bridge)
-                                }
+                    DispatchQueue.main.async {
+                        loadingAlert.dismiss(animated: true) {
+                            guard !didCancel else { return }
+                            if !result.error.isEmpty {
+                                self.showError(message: "Failed to load channels: \(result.error)", plugin: plugin)
+                            } else if result.channels.isEmpty {
+                                self.showError(message: "No channels available for self-assignment", plugin: plugin)
+                            } else {
+                                self.presentChannelPicker(channels: result.channels, plugin: plugin, bridge: bridge)
                             }
                         }
                     }
                 }
             }
         }
+        return true
     }
 
     private func presentChannelPicker(channels: [[String: Any]], plugin: CapacitorUpdaterPlugin, bridge: CAPBridgeProtocol) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-updater",
-  "version": "8.47.9",
+  "version": "8.47.11",
   "license": "MPL-2.0",
   "description": "Live update for capacitor apps",
   "main": "dist/plugin.cjs.js",