Skip to content

Fix broken animations #106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 29, 2023
Merged

Fix broken animations #106

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a26472
wip
davdroman Sep 28, 2023
d28ddd3
wip
davdroman Sep 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions Sources/NavigationTransitions/NavigationTransitionDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,27 @@ final class NavigationTransitionDelegate: NSObject, UINavigationControllerDelega
var transition: AnyNavigationTransition
private weak var baseDelegate: UINavigationControllerDelegate?
var interactionController: UIPercentDrivenInteractiveTransition?
private var initialAreAnimationsEnabled = UIView.areAnimationsEnabled
private var initialAreAnimationsEnabled: Bool?

init(transition: AnyNavigationTransition, baseDelegate: UINavigationControllerDelegate?) {
self.transition = transition
self.baseDelegate = baseDelegate
}

func navigationController(_ navigationController: UINavigationController, willShow viewController: UIViewController, animated: Bool) {
initialAreAnimationsEnabled = UIView.areAnimationsEnabled
UIView.setAnimationsEnabled(transition.animation != nil)
if navigationController.transitionCoordinator != nil {
self.initialAreAnimationsEnabled = UIView.areAnimationsEnabled
UIView.setAnimationsEnabled(transition.animation != nil)
}
baseDelegate?.navigationController?(navigationController, willShow: viewController, animated: animated)
}

func navigationController(_ navigationController: UINavigationController, didShow viewController: UIViewController, animated: Bool) {
baseDelegate?.navigationController?(navigationController, didShow: viewController, animated: animated)
UIView.setAnimationsEnabled(initialAreAnimationsEnabled)
if let initialAreAnimationsEnabled {
UIView.setAnimationsEnabled(initialAreAnimationsEnabled)
self.initialAreAnimationsEnabled = nil
}
}

func navigationController(_ navigationController: UINavigationController, interactionControllerFor animationController: UIViewControllerAnimatedTransitioning) -> UIViewControllerInteractiveTransitioning? {
Expand Down