Merge branch 'release/2.1.1'

glisom · Jan 12, 2019 · 5a39c0d · 5a39c0d
2 parents 0a5e678 + babb8e2
commit 5a39c0d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,7 @@
-## 2.0.1 (2018-12-5)
+## 2.1.1 (2018-12-1)
+- flashing blur effect bugfix
+
+## 2.1.0 (2018-12-5)
 - new parallax option on slide presentations
 - interaction configuration can now be constrained by mode (.dismiss, .present)
 

diff --git a/Jelly.podspec b/Jelly.podspec
@@ -6,7 +6,7 @@
 
 Pod::Spec.new do |s|
     s.name             = 'Jelly'
-    s.version          = '2.1.0'
+    s.version          = '2.1.1'
     s.summary          = 'Jelly is a library for animated, non-interactive & interactive viewcontroller transitions and presentations with the focus on a simple and yet flexible API.'
 
     s.description      = <<-DESC

diff --git a/Jelly/Classes/private/Animators/Interaction Controllers/InteractionController.swift b/Jelly/Classes/private/Animators/Interaction Controllers/InteractionController.swift
@@ -188,6 +188,9 @@ extension InteractionController {
                 cancel()
             case .ended:
                 interactionInProgress = false
+                if (!shouldCompleteTransition && progress == 0) {
+                    presentationController?.cancelAnimationEffect()
+                }
                 shouldCompleteTransition ? finish() : cancel()
             default:
                 break

diff --git a/Jelly/Classes/private/PresentationController.swift b/Jelly/Classes/private/PresentationController.swift
@@ -105,6 +105,16 @@ extension PresentationController {
             self.dimmingView.alpha = alpha
         })
     }
+
+    public func cancelAnimationEffect() {
+        let backgroundStyle = presentation.presentationUIConfiguration.backgroundStyle
+        switch backgroundStyle {
+        case .blurred(let style):
+            blurView.effect = UIBlurEffect(style: style)
+        case .dimmed(let alpha):
+            dimmingView.alpha = alpha
+        }
+    }
 }
 extension PresentationController {
     private func setupBlurView () {