From 2b5532a0fb9a19253d00d1f916634fc4e18edee4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguye=CC=82=CC=83n=20Anh=20Tua=CC=82=CC=81n?= Date: Thu, 21 Jul 2016 16:00:28 +0700 Subject: [PATCH 1/2] [fix] check if presentingViewController is kind of class UITabBarController --- RZTransitions/Managers/RZTransitionsManager.m | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/RZTransitions/Managers/RZTransitionsManager.m b/RZTransitions/Managers/RZTransitionsManager.m index 5d09cf4..9ffbab2 100644 --- a/RZTransitions/Managers/RZTransitionsManager.m +++ b/RZTransitions/Managers/RZTransitionsManager.m @@ -158,6 +158,10 @@ - (void)overrideAnimationDirection:(BOOL)override withTransition:(RZUniqueTransi // Find the dismissed view controller's view controller it is returning to UIViewController *presentingViewController = dismissed.presentingViewController; + if ( [presentingViewController isKindOfClass:[UITabBarController class]] ) { + UITabBarController *tabBarController = (UITabBarController *) presentingViewController; + presentingViewController = tabBarController.selectedViewController; + } if ( [presentingViewController isKindOfClass:[UINavigationController class]] ) { UIViewController *childVC = (UIViewController *)[[presentingViewController childViewControllers] lastObject]; if ( childVC != nil ) { From 4dd5318f7d5410f7f331edc3a1815e60603a8b50 Mon Sep 17 00:00:00 2001 From: Tuan Nguyen Date: Wed, 27 Jul 2016 12:36:33 +0700 Subject: [PATCH 2/2] disable rotation before dismiss --- RZTransitions/Interactors/RZBaseSwipeInteractionController.m | 3 +++ 1 file changed, 3 insertions(+) diff --git a/RZTransitions/Interactors/RZBaseSwipeInteractionController.m b/RZTransitions/Interactors/RZBaseSwipeInteractionController.m index 81c59c0..bcabc13 100644 --- a/RZTransitions/Interactors/RZBaseSwipeInteractionController.m +++ b/RZTransitions/Interactors/RZBaseSwipeInteractionController.m @@ -94,6 +94,9 @@ - (void)handlePanGesture:(UIPanGestureRecognizer *)panGestureRecognizer [self.fromViewController.navigationController popViewControllerAnimated:YES]; } else if (self.action & RZTransitionAction_Dismiss) { + [[NSNotificationCenter defaultCenter] + postNotificationName:@"disableRotation" + object:nil]; [self.fromViewController dismissViewControllerAnimated:YES completion:nil]; } }