diff --git a/RZTransitions-Demo/RZTransitions-Demo.xcodeproj/project.pbxproj b/RZTransitions-Demo/RZTransitions-Demo.xcodeproj/project.pbxproj index 103c3f9..b7b806b 100644 --- a/RZTransitions-Demo/RZTransitions-Demo.xcodeproj/project.pbxproj +++ b/RZTransitions-Demo/RZTransitions-Demo.xcodeproj/project.pbxproj @@ -801,7 +801,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.raizlabs.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - TARGETED_DEVICE_FAMILY = 1; + TARGETED_DEVICE_FAMILY = "1,2"; WRAPPER_EXTENSION = app; }; name = Debug; @@ -817,7 +817,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.raizlabs.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; - TARGETED_DEVICE_FAMILY = 1; + TARGETED_DEVICE_FAMILY = "1,2"; WRAPPER_EXTENSION = app; }; name = Release; diff --git a/RZTransitions-Demo/RZTransitions-Demo/RZTransitions-Demo-Info.plist b/RZTransitions-Demo/RZTransitions-Demo/RZTransitions-Demo-Info.plist index c3fdacd..e91991d 100644 --- a/RZTransitions-Demo/RZTransitions-Demo/RZTransitions-Demo-Info.plist +++ b/RZTransitions-Demo/RZTransitions-Demo/RZTransitions-Demo-Info.plist @@ -33,6 +33,15 @@ UISupportedInterfaceOrientations UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + UIInterfaceOrientationPortraitUpsideDown diff --git a/RZTransitions/Transitions/RZCardSlideAnimationController.m b/RZTransitions/Transitions/RZCardSlideAnimationController.m index 50c9c75..a915a5e 100644 --- a/RZTransitions/Transitions/RZCardSlideAnimationController.m +++ b/RZTransitions/Transitions/RZCardSlideAnimationController.m @@ -52,6 +52,7 @@ - (void)animateTransition:(id)transitionCo UIView *fromView = [(NSObject *)transitionContext rzt_fromView]; UIView *toView = [(NSObject *)transitionContext rzt_toView]; UIView *container = [transitionContext containerView]; + UIViewController *toViewController = [transitionContext viewControllerForKey:UITransitionContextToViewControllerKey]; UIView *bgView = [[UIView alloc] initWithFrame:container.bounds]; bgView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight; @@ -110,6 +111,8 @@ - (void)animateTransition:(id)transitionCo [transitionContext completeTransition:!transitionContext.transitionWasCancelled]; }]; } + + toViewController.view.frame = [transitionContext finalFrameForViewController:toViewController]; } - (NSTimeInterval)transitionDuration:(id)transitionContext diff --git a/RZTransitions/Transitions/RZRectZoomAnimationController.m b/RZTransitions/Transitions/RZRectZoomAnimationController.m index 0710244..a074d56 100644 --- a/RZTransitions/Transitions/RZRectZoomAnimationController.m +++ b/RZTransitions/Transitions/RZRectZoomAnimationController.m @@ -58,6 +58,7 @@ - (void)animateTransition:(id)transitionCo UIView *fromView = [(NSObject *)transitionContext rzt_fromView]; UIView *toView = [(NSObject *)transitionContext rzt_toView]; UIView *container = [transitionContext containerView]; + UIViewController *toViewController = [transitionContext viewControllerForKey:UITransitionContextToViewControllerKey]; CGRect originalFrame = fromView.frame; CGRect cellFrame = CGRectZero; @@ -124,6 +125,8 @@ - (void)animateTransition:(id)transitionCo }]; }]; } + + toViewController.view.frame = [transitionContext finalFrameForViewController:toViewController]; } - (NSTimeInterval)transitionDuration:(id)transitionContext diff --git a/RZTransitions/Transitions/RZSegmentControlMoveFadeAnimationController.m b/RZTransitions/Transitions/RZSegmentControlMoveFadeAnimationController.m index 314d338..8ba82b2 100644 --- a/RZTransitions/Transitions/RZSegmentControlMoveFadeAnimationController.m +++ b/RZTransitions/Transitions/RZSegmentControlMoveFadeAnimationController.m @@ -46,6 +46,7 @@ - (void)animateTransition:(id)transitionCo UIView *fromView = [(NSObject *)transitionContext rzt_fromView]; UIView *toView = [(NSObject *)transitionContext rzt_toView]; UIView *container = [transitionContext containerView]; + UIViewController *toViewController = [transitionContext viewControllerForKey:UITransitionContextToViewControllerKey]; CGAffineTransform scaleTransform = CGAffineTransformMakeScale(kRZSegScaleAmount, kRZSegScaleAmount); CGAffineTransform oldTranslateTransform; @@ -77,6 +78,7 @@ - (void)animateTransition:(id)transitionCo [transitionContext completeTransition:!transitionContext.transitionWasCancelled]; }]; + toViewController.view.frame = [transitionContext finalFrameForViewController:toViewController]; } - (NSTimeInterval)transitionDuration:(id)transitionContext diff --git a/RZTransitions/Transitions/RZShrinkZoomAnimationController.m b/RZTransitions/Transitions/RZShrinkZoomAnimationController.m index 6f34c89..36f61a5 100644 --- a/RZTransitions/Transitions/RZShrinkZoomAnimationController.m +++ b/RZTransitions/Transitions/RZShrinkZoomAnimationController.m @@ -39,6 +39,7 @@ - (void)animateTransition:(id)transitionCo UIView *fromView = [(NSObject *)transitionContext rzt_fromView]; UIView *toView = [(NSObject *)transitionContext rzt_toView]; UIView *container = [transitionContext containerView]; + UIViewController *toViewController = [transitionContext viewControllerForKey:UITransitionContextToViewControllerKey]; [UIView animateWithDuration:0.5 delay:0 options:0 animations:^{ [fromView setTransform:CGAffineTransformMakeScale(0.1, 0.1)]; @@ -55,6 +56,8 @@ - (void)animateTransition:(id)transitionCo }]; }]; + + toViewController.view.frame = [transitionContext finalFrameForViewController:toViewController]; } - (NSTimeInterval)transitionDuration:(id)transitionContext diff --git a/RZTransitions/Transitions/RZZoomAlphaAnimationController.m b/RZTransitions/Transitions/RZZoomAlphaAnimationController.m index d763fdf..6ccae8e 100644 --- a/RZTransitions/Transitions/RZZoomAlphaAnimationController.m +++ b/RZTransitions/Transitions/RZZoomAlphaAnimationController.m @@ -44,6 +44,7 @@ - (void)animateTransition:(id)transitionCo UIView *fromView = [(NSObject *)transitionContext rzt_fromView]; UIView *toView = [(NSObject *)transitionContext rzt_toView]; UIView *container = [transitionContext containerView]; + UIViewController *toViewController = [transitionContext viewControllerForKey:UITransitionContextToViewControllerKey]; toView.userInteractionEnabled = YES; @@ -82,6 +83,8 @@ - (void)animateTransition:(id)transitionCo [transitionContext completeTransition:!transitionContext.transitionWasCancelled]; }]; } + + toViewController.view.frame = [transitionContext finalFrameForViewController:toViewController]; } - (NSTimeInterval)transitionDuration:(id)transitionContext diff --git a/RZTransitions/Transitions/RZZoomBlurAnimationController.m b/RZTransitions/Transitions/RZZoomBlurAnimationController.m index cca6873..9a90b08 100644 --- a/RZTransitions/Transitions/RZZoomBlurAnimationController.m +++ b/RZTransitions/Transitions/RZZoomBlurAnimationController.m @@ -146,6 +146,8 @@ - (void)animateTransition:(id)transitionCo [transitionContext completeTransition:!transitionContext.transitionWasCancelled]; }]; } + + toViewController.view.frame = [transitionContext finalFrameForViewController:toViewController]; } - (NSTimeInterval)transitionDuration:(id)transitionContext diff --git a/RZTransitions/Transitions/RZZoomPushAnimationController.m b/RZTransitions/Transitions/RZZoomPushAnimationController.m index d1b1eb5..ec684af 100644 --- a/RZTransitions/Transitions/RZZoomPushAnimationController.m +++ b/RZTransitions/Transitions/RZZoomPushAnimationController.m @@ -42,6 +42,7 @@ - (void)animateTransition:(id)transitionCo UIView *toView = [(NSObject *)transitionContext rzt_toView]; UIView *fromView = [(NSObject *)transitionContext rzt_fromView]; UIView *container = [transitionContext containerView]; + UIViewController *toViewController = [transitionContext viewControllerForKey:UITransitionContextToViewControllerKey]; if ( self.isPositiveAnimation ) { toView.frame = container.frame; @@ -86,6 +87,8 @@ - (void)animateTransition:(id)transitionCo [transitionContext completeTransition:!transitionContext.transitionWasCancelled]; }]; } + + toViewController.view.frame = [transitionContext finalFrameForViewController:toViewController]; } - (NSTimeInterval)transitionDuration:(id)transitionContext