@capgo/capacitor-updater 8.47.10 → 8.47.13

package/ios/Sources/CapacitorUpdaterPlugin/CapacitorUpdaterPlugin.swift

@@ -89,6 +89,8 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
     static let autoUpdateModeLaunch = "onLaunch"
     static let autoUpdateModeAlways = "always"
     static let autoUpdateModeOnlyDownload = "onlyDownload"
+    static let shakeMenuGestureShake = "shake"
+    static let shakeMenuGestureThreeFingerPinch = "threeFingerPinch"
     private static let previewLoaderTimeoutMs = 60000
     private let keepUrlPathFlagKey = "__capgo_keep_url_path_after_reload"
     private let customIdDefaultsKey = "CapacitorUpdater.customId"
@@ -167,6 +169,9 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
     private var webViewStatsReporter: WebViewStatsReporter?
     public var shakeMenuEnabled = false
     public var shakeChannelSelectorEnabled = false
+    public var shakeMenuGesture = CapacitorUpdaterPlugin.shakeMenuGestureShake
+    var shakeMenuPinchGestureRecognizer: UIPinchGestureRecognizer?
+    var shakeMenuPinchGestureTriggered = false
     public var previewSessionEnabled = false
     private var previewSessionAlertPending = false
     private var isLeavingPreviewForIncomingLink = false
@@ -241,6 +246,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         resetWhenUpdate = getConfig().getBoolean("resetWhenUpdate", true)
         shakeMenuEnabled = getConfig().getBoolean("shakeMenu", false)
         shakeChannelSelectorEnabled = getConfig().getBoolean("allowShakeChannelSelector", false)
+        shakeMenuGesture = Self.normalizedShakeMenuGesture(getConfig().getString("shakeMenuGesture", Self.shakeMenuGestureShake))
         let storedPreviewSessionEnabled = UserDefaults.standard.bool(forKey: previewSessionDefaultsKey)
         let shouldClearPreviewSessionBecauseDisabled = !allowPreview && storedPreviewSessionEnabled
         previewSessionEnabled = allowPreview && storedPreviewSessionEnabled
@@ -251,6 +257,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
             shakeChannelSelectorEnabled = UserDefaults.standard.object(forKey: previewPreviousShakeChannelSelectorDefaultsKey) as? Bool
                 ?? shakeChannelSelectorEnabled
         }
+        syncShakeMenuGestureRecognizer()
         periodCheckDelay = Self.normalizedPeriodCheckDelaySeconds(getConfig().getInt("periodCheckDelay", 0))
 
         implementation.setPublicKey(getConfig().getString("publicKey") ?? "")
@@ -1212,6 +1219,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         self.previewSessionAlertPending = true
         self.implementation.previewSession = true
         self.shakeMenuEnabled = true
+        self.syncShakeMenuGestureRecognizer()
         UserDefaults.standard.set(true, forKey: self.previewSessionDefaultsKey)
         UserDefaults.standard.set(true, forKey: self.previewSessionAlertPendingDefaultsKey)
         UserDefaults.standard.synchronize()
@@ -1398,6 +1406,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         }
         self.shakeMenuEnabled = previousShakeMenuEnabled
         self.shakeChannelSelectorEnabled = previousShakeChannelSelectorEnabled
+        self.syncShakeMenuGestureRecognizer()
         _ = self.implementation.setPreviewFallbackBundle(fallback: nil)
         self.clearPreviewSessionPreferences()
         logger.info("Preview session ended")
@@ -1421,6 +1430,8 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         self.hidePreviewTransitionLoader(reason: "preview-session-disabled")
         self.shakeMenuEnabled = self.getBooleanConfig("shakeMenu", defaultValue: false)
         self.shakeChannelSelectorEnabled = self.getBooleanConfig("allowShakeChannelSelector", defaultValue: false)
+        self.shakeMenuGesture = Self.normalizedShakeMenuGesture(self.getStringConfig("shakeMenuGesture", defaultValue: Self.shakeMenuGestureShake))
+        self.syncShakeMenuGestureRecognizer()
         self.clearPreviewSessionPreferences()
     }
 
@@ -1652,6 +1663,8 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         self.implementation.previewSession = false
         self.shakeMenuEnabled = self.getBooleanConfig("shakeMenu", defaultValue: false)
         self.shakeChannelSelectorEnabled = self.getBooleanConfig("allowShakeChannelSelector", defaultValue: false)
+        self.shakeMenuGesture = Self.normalizedShakeMenuGesture(self.getStringConfig("shakeMenuGesture", defaultValue: Self.shakeMenuGestureShake))
+        self.syncShakeMenuGestureRecognizer()
         self.restorePreviewPreviousAppId()
         self.restorePreviewPreviousDefaultChannel()
         _ = self.implementation.setPreviewFallbackBundle(fallback: nil)
@@ -2765,6 +2778,28 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         }
     }
 
+    static func normalizedShakeMenuGesture(_ value: String?) -> String {
+        guard let value, !value.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty else {
+            return shakeMenuGestureShake
+        }
+        let normalized = value.trimmingCharacters(in: .whitespacesAndNewlines)
+        if normalized == shakeMenuGestureThreeFingerPinch {
+            return shakeMenuGestureThreeFingerPinch
+        }
+        return shakeMenuGestureShake
+    }
+
+    static func isSupportedShakeMenuGesture(_ value: String?) -> Bool {
+        guard let value else {
+            return true
+        }
+        let normalized = value.trimmingCharacters(in: .whitespacesAndNewlines)
+        if normalized.isEmpty {
+            return false
+        }
+        return normalized == shakeMenuGestureShake || normalized == shakeMenuGestureThreeFingerPinch
+    }
+
     static func autoUpdateModeForLegacyDirectUpdateMode(_ directUpdateMode: String) -> String {
         switch directUpdateMode {
         case autoUpdateModeInstall, autoUpdateModeLaunch, autoUpdateModeAlways:
@@ -3485,14 +3520,25 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
             return
         }
 
+        if let gesture = call.getString("gesture") {
+            guard Self.isSupportedShakeMenuGesture(gesture) else {
+                logger.error("Unsupported shake menu gesture: \(gesture)")
+                call.reject("Unsupported shake menu gesture. Use \"shake\" or \"threeFingerPinch\".")
+                return
+            }
+            self.shakeMenuGesture = Self.normalizedShakeMenuGesture(gesture)
+        }
+
         self.shakeMenuEnabled = enabled
-        logger.info("Shake menu \(enabled ? "enabled" : "disabled")")
+        self.syncShakeMenuGestureRecognizer()
+        logger.info("Shake menu \(enabled ? "enabled" : "disabled") with \(self.shakeMenuGesture) gesture")
         call.resolve()
     }
 
     @objc func isShakeMenuEnabled(_ call: CAPPluginCall) {
         call.resolve([
-            "enabled": self.shakeMenuEnabled
+            "enabled": self.shakeMenuEnabled,
+            "gesture": self.shakeMenuGesture
         ])
     }
 
@@ -3504,6 +3550,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         }
 
         self.shakeChannelSelectorEnabled = enabled
+        self.syncShakeMenuGestureRecognizer()
         logger.info("Shake channel selector \(enabled ? "enabled" : "disabled")")
         call.resolve()
     }

package/ios/Sources/CapacitorUpdaterPlugin/ShakeMenu.swift

@@ -9,6 +9,7 @@ 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
@@ -26,42 +27,124 @@ 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
             }
 
-            let now = Date().timeIntervalSince1970
-            guard now - lastShakeMenuShownAt >= shakeMenuCooldownSeconds else {
-                plugin.logger.info("Shake menu ignored because cooldown is active")
-                return
-            }
+            _ = showCapacitorUpdaterMenu(plugin: plugin, bridge: bridge, gestureName: "Shake")
+        }
+    }
 
-            if canShowPreviewMenu {
-                if showDefaultMenu(plugin: plugin, bridge: bridge) {
-                    lastShakeMenuShownAt = now
-                }
-            } else {
-                if showChannelSelector(plugin: plugin, bridge: bridge) {
-                    lastShakeMenuShownAt = now
-                }
+    @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
     }
 
     @discardableResult

package/package.json

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