From ed02be7bbe15482a2f1b59e36e1955bc5e25dffc Mon Sep 17 00:00:00 2001 From: Grant Isom Date: Tue, 18 Dec 2018 13:34:18 -0600 Subject: [PATCH 1/2] https://github.com/SebastianBoldt/Jelly/issues/63 - Flashing UIBlurEffect --- .../InteractionController.swift | 3 +++ Jelly/Classes/private/PresentationController.swift | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/Jelly/Classes/private/Animators/Interaction Controllers/InteractionController.swift b/Jelly/Classes/private/Animators/Interaction Controllers/InteractionController.swift index 5ded1a6..3098910 100644 --- 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 index 0200604..fae92f0 100644 --- 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 () { From babb8e28476014b2be236c47a4da67d6de1abb66 Mon Sep 17 00:00:00 2001 From: Sebastian Boldt Date: Sat, 12 Jan 2019 10:28:27 +0100 Subject: [PATCH 2/2] updated version number and changelog for 2.1.1 --- CHANGELOG.md | 5 ++++- Jelly.podspec | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b801aef..f996fcd 100644 --- 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 index b8fa55e..4735064 100644 --- 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