From 675f97db3e82d0713e9eeec9b1a0786a7d7456db Mon Sep 17 00:00:00 2001
From: Marcus Kida <mkida@atlassian.com>
Date: Mon, 28 Nov 2016 11:59:55 +1100
Subject: [PATCH] =?UTF-8?q?Fix=20transition=20animator=20not=20doing=20app?=
 =?UTF-8?q?earance=20begin=20and=20end=20calls=20which=20results=20in=20pa?=
 =?UTF-8?q?rent=20VC=E2=80=99s=20`view(Did-)Will(Dis-)Appear`=20not=20bein?=
 =?UTF-8?q?g=20called?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 NYTPhotoViewer/NYTPhotoTransitionAnimator.m | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/NYTPhotoViewer/NYTPhotoTransitionAnimator.m b/NYTPhotoViewer/NYTPhotoTransitionAnimator.m
index aa80441d..87f2675d 100644
--- a/NYTPhotoViewer/NYTPhotoTransitionAnimator.m
+++ b/NYTPhotoViewer/NYTPhotoTransitionAnimator.m
@@ -18,6 +18,8 @@
 @interface NYTPhotoTransitionAnimator ()
 
 @property (nonatomic, readonly) BOOL shouldPerformZoomingAnimation;
+@property (nonatomic, weak) UIViewController *toViewController;
+@property (nonatomic, weak) UIViewController *fromViewController;
 
 @end
 
@@ -46,8 +48,12 @@ - (void)setupTransitionContainerHierarchyWithTransitionContext:(id <UIViewContro
     UIView *fromView = [transitionContext viewForKey:UITransitionContextFromViewKey];
     UIView *toView = [transitionContext viewForKey:UITransitionContextToViewKey];
 
-    UIViewController *toViewController = [transitionContext viewControllerForKey:UITransitionContextToViewControllerKey];
-    toView.frame = [transitionContext finalFrameForViewController:toViewController];
+    self.toViewController =  [transitionContext viewControllerForKey:UITransitionContextToViewControllerKey];
+    self.fromViewController = [transitionContext viewControllerForKey:UITransitionContextFromViewControllerKey];
+    
+    toView.frame = [transitionContext finalFrameForViewController:self.toViewController];
+    [self.toViewController beginAppearanceTransition:YES animated:YES];
+    [self.fromViewController beginAppearanceTransition:NO animated:YES];
     
     if (![toView isDescendantOfView:transitionContext.containerView]) {
         [transitionContext.containerView addSubview:toView];
@@ -253,6 +259,10 @@ + (UIView *)newAnimationViewFromView:(UIView *)view {
 }
 
 #pragma mark - UIViewControllerAnimatedTransitioning
+- (void)animationEnded:(BOOL)transitionCompleted {
+    [self.toViewController endAppearanceTransition];
+    [self.fromViewController endAppearanceTransition];
+}
 
 - (NSTimeInterval)transitionDuration:(id <UIViewControllerContextTransitioning>)transitionContext {
     if (self.shouldPerformZoomingAnimation) {