Merge branch 'release/4.2.0'

Author: lvnkmn

Zoomy/Classes/Classes/ImageZoomController.swift

@@ -479,14 +479,29 @@ extension ImageZoomController: UIScrollViewDelegate {
 
 //MARK: UIGestureRecognizerDelegate
 extension ImageZoomController: UIGestureRecognizerDelegate {
-    
     public func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
+        if gestureRecognizer == imageViewPinchGestureRecognizer,
+            gestureRecognizer.numberOfTouches > 1,
+            otherGestureRecognizer is UIPanGestureRecognizer &&
+            otherGestureRecognizer != imageViewPanGestureRecognizer {
+            return false
+        }
         return true
     }
 
+    public func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldBeRequiredToFailBy otherGestureRecognizer: UIGestureRecognizer) -> Bool {
+        if gestureRecognizer == imageViewPinchGestureRecognizer,
+            gestureRecognizer.numberOfTouches > 1,
+            otherGestureRecognizer is UIPanGestureRecognizer &&
+            otherGestureRecognizer != imageViewPanGestureRecognizer {
+            return true
+        }
+        return false
+    }
+    
     public func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldReceive touch: UITouch) -> Bool {
         guard let action = gestureRecognizerActions[gestureRecognizer] else { return true }
 
         return !(action is Action.None)
     }
-}
+}

Zoomy/Classes/Classes/ImageZoomControllerIsPresentingScrollViewOverlayState.swift

@@ -180,7 +180,7 @@ private extension ImageZoomControllerIsPresentingScrollViewOverlayState {
         case .smallerThanAnsestorView:
             return owner.settings.primaryBackgroundColor
         case .fillsAnsestorView:
-            return owner.settings.secundaryBackgroundColor
+            return owner.settings.secondaryBackgroundColor
         }
     }
 

Zoomy/Classes/Extensions/ImageZoomControllerSettings+Equatable.swift

@@ -9,7 +9,7 @@ extension ImageZoomControllerSettings: Equatable {
                 lhs.isEnabled == rhs.isEnabled &&
                 lhs.shouldDisplayBackground == rhs.shouldDisplayBackground &&
                 lhs.primaryBackgroundColor == rhs.primaryBackgroundColor &&
-                lhs.secundaryBackgroundColor == rhs.secundaryBackgroundColor &&
+                lhs.secondaryBackgroundColor == rhs.secondaryBackgroundColor &&
                 lhs.neededTranslationToDismissOverlayOnScrollBounce == rhs.neededTranslationToDismissOverlayOnScrollBounce
     }
 }

Zoomy/Classes/Structs/ImageZoomControllerSettings.swift

@@ -31,7 +31,7 @@ public struct ImageZoomControllerSettings: ConfigurableUsingClosure {
 
     /// BackgroundView's color will animate to this value when content becomes bigger than or equal to any dimension of the view it's displayed in
     /// This will only have effect when shouldDisplayBackground is set to true
-    public var secundaryBackgroundColor = UIColor.black
+    public var secondaryBackgroundColor = UIColor.black
 
     /// The scale at which the primary backgroundColor will be fully visible, alpha is lower before that
     public var primaryBackgroundColorThreshold: ImageViewScale = 2
@@ -134,9 +134,9 @@ public extension ImageZoomControllerSettings {
         return settings
     }
 
-    func with(secundaryBackgroundColor: UIColor) -> Settings {
+    func with(secondaryBackgroundColor: UIColor) -> Settings {
         var settings = self
-        settings.secundaryBackgroundColor = secundaryBackgroundColor
+        settings.secondaryBackgroundColor = secondaryBackgroundColor
         return settings
     }