Skip to content

Commit cf8d3a0

Browse files
author
julianwyz
committed
fixes for Rightpoint#52
1 parent c5f3937 commit cf8d3a0

9 files changed

+30
-2
lines changed

RZTransitions-Demo/RZTransitions-Demo.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -801,7 +801,7 @@
801801
PRODUCT_BUNDLE_IDENTIFIER = "com.raizlabs.${PRODUCT_NAME:rfc1034identifier}";
802802
PRODUCT_NAME = "$(TARGET_NAME)";
803803
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
804-
TARGETED_DEVICE_FAMILY = 1;
804+
TARGETED_DEVICE_FAMILY = "1,2";
805805
WRAPPER_EXTENSION = app;
806806
};
807807
name = Debug;
@@ -817,7 +817,7 @@
817817
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
818818
PRODUCT_BUNDLE_IDENTIFIER = "com.raizlabs.${PRODUCT_NAME:rfc1034identifier}";
819819
PRODUCT_NAME = "$(TARGET_NAME)";
820-
TARGETED_DEVICE_FAMILY = 1;
820+
TARGETED_DEVICE_FAMILY = "1,2";
821821
WRAPPER_EXTENSION = app;
822822
};
823823
name = Release;

RZTransitions-Demo/RZTransitions-Demo/RZTransitions-Demo-Info.plist

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,15 @@
3333
<key>UISupportedInterfaceOrientations</key>
3434
<array>
3535
<string>UIInterfaceOrientationPortrait</string>
36+
<string>UIInterfaceOrientationLandscapeLeft</string>
37+
<string>UIInterfaceOrientationLandscapeRight</string>
38+
</array>
39+
<key>UISupportedInterfaceOrientations~ipad</key>
40+
<array>
41+
<string>UIInterfaceOrientationPortrait</string>
42+
<string>UIInterfaceOrientationLandscapeLeft</string>
43+
<string>UIInterfaceOrientationLandscapeRight</string>
44+
<string>UIInterfaceOrientationPortraitUpsideDown</string>
3645
</array>
3746
</dict>
3847
</plist>

RZTransitions/Transitions/RZCardSlideAnimationController.m

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ - (void)animateTransition:(id<UIViewControllerContextTransitioning>)transitionCo
5252
UIView *fromView = [(NSObject *)transitionContext rzt_fromView];
5353
UIView *toView = [(NSObject *)transitionContext rzt_toView];
5454
UIView *container = [transitionContext containerView];
55+
UIViewController *toViewController = [transitionContext viewControllerForKey:UITransitionContextToViewControllerKey];
5556

5657
UIView *bgView = [[UIView alloc] initWithFrame:container.bounds];
5758
bgView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
@@ -110,6 +111,8 @@ - (void)animateTransition:(id<UIViewControllerContextTransitioning>)transitionCo
110111
[transitionContext completeTransition:!transitionContext.transitionWasCancelled];
111112
}];
112113
}
114+
115+
toViewController.view.frame = [transitionContext finalFrameForViewController:toViewController];
113116
}
114117

115118
- (NSTimeInterval)transitionDuration:(id<UIViewControllerContextTransitioning>)transitionContext

RZTransitions/Transitions/RZRectZoomAnimationController.m

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ - (void)animateTransition:(id<UIViewControllerContextTransitioning>)transitionCo
5858
UIView *fromView = [(NSObject *)transitionContext rzt_fromView];
5959
UIView *toView = [(NSObject *)transitionContext rzt_toView];
6060
UIView *container = [transitionContext containerView];
61+
UIViewController *toViewController = [transitionContext viewControllerForKey:UITransitionContextToViewControllerKey];
6162

6263
CGRect originalFrame = fromView.frame;
6364
CGRect cellFrame = CGRectZero;
@@ -124,6 +125,8 @@ - (void)animateTransition:(id<UIViewControllerContextTransitioning>)transitionCo
124125
}];
125126
}];
126127
}
128+
129+
toViewController.view.frame = [transitionContext finalFrameForViewController:toViewController];
127130
}
128131

129132
- (NSTimeInterval)transitionDuration:(id<UIViewControllerContextTransitioning>)transitionContext

RZTransitions/Transitions/RZSegmentControlMoveFadeAnimationController.m

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ - (void)animateTransition:(id<UIViewControllerContextTransitioning>)transitionCo
4646
UIView *fromView = [(NSObject *)transitionContext rzt_fromView];
4747
UIView *toView = [(NSObject *)transitionContext rzt_toView];
4848
UIView *container = [transitionContext containerView];
49+
UIViewController *toViewController = [transitionContext viewControllerForKey:UITransitionContextToViewControllerKey];
4950

5051
CGAffineTransform scaleTransform = CGAffineTransformMakeScale(kRZSegScaleAmount, kRZSegScaleAmount);
5152
CGAffineTransform oldTranslateTransform;
@@ -77,6 +78,7 @@ - (void)animateTransition:(id<UIViewControllerContextTransitioning>)transitionCo
7778
[transitionContext completeTransition:!transitionContext.transitionWasCancelled];
7879
}];
7980

81+
toViewController.view.frame = [transitionContext finalFrameForViewController:toViewController];
8082
}
8183

8284
- (NSTimeInterval)transitionDuration:(id<UIViewControllerContextTransitioning>)transitionContext

RZTransitions/Transitions/RZShrinkZoomAnimationController.m

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ - (void)animateTransition:(id<UIViewControllerContextTransitioning>)transitionCo
3939
UIView *fromView = [(NSObject *)transitionContext rzt_fromView];
4040
UIView *toView = [(NSObject *)transitionContext rzt_toView];
4141
UIView *container = [transitionContext containerView];
42+
UIViewController *toViewController = [transitionContext viewControllerForKey:UITransitionContextToViewControllerKey];
4243

4344
[UIView animateWithDuration:0.5 delay:0 options:0 animations:^{
4445
[fromView setTransform:CGAffineTransformMakeScale(0.1, 0.1)];
@@ -55,6 +56,8 @@ - (void)animateTransition:(id<UIViewControllerContextTransitioning>)transitionCo
5556
}];
5657

5758
}];
59+
60+
toViewController.view.frame = [transitionContext finalFrameForViewController:toViewController];
5861
}
5962

6063
- (NSTimeInterval)transitionDuration:(id<UIViewControllerContextTransitioning>)transitionContext

RZTransitions/Transitions/RZZoomAlphaAnimationController.m

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ - (void)animateTransition:(id<UIViewControllerContextTransitioning>)transitionCo
4444
UIView *fromView = [(NSObject *)transitionContext rzt_fromView];
4545
UIView *toView = [(NSObject *)transitionContext rzt_toView];
4646
UIView *container = [transitionContext containerView];
47+
UIViewController *toViewController = [transitionContext viewControllerForKey:UITransitionContextToViewControllerKey];
4748

4849
toView.userInteractionEnabled = YES;
4950

@@ -82,6 +83,8 @@ - (void)animateTransition:(id<UIViewControllerContextTransitioning>)transitionCo
8283
[transitionContext completeTransition:!transitionContext.transitionWasCancelled];
8384
}];
8485
}
86+
87+
toViewController.view.frame = [transitionContext finalFrameForViewController:toViewController];
8588
}
8689

8790
- (NSTimeInterval)transitionDuration:(id<UIViewControllerContextTransitioning>)transitionContext

RZTransitions/Transitions/RZZoomBlurAnimationController.m

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,8 @@ - (void)animateTransition:(id<UIViewControllerContextTransitioning>)transitionCo
146146
[transitionContext completeTransition:!transitionContext.transitionWasCancelled];
147147
}];
148148
}
149+
150+
toViewController.view.frame = [transitionContext finalFrameForViewController:toViewController];
149151
}
150152

151153
- (NSTimeInterval)transitionDuration:(id<UIViewControllerContextTransitioning>)transitionContext

RZTransitions/Transitions/RZZoomPushAnimationController.m

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ - (void)animateTransition:(id<UIViewControllerContextTransitioning>)transitionCo
4242
UIView *toView = [(NSObject *)transitionContext rzt_toView];
4343
UIView *fromView = [(NSObject *)transitionContext rzt_fromView];
4444
UIView *container = [transitionContext containerView];
45+
UIViewController *toViewController = [transitionContext viewControllerForKey:UITransitionContextToViewControllerKey];
4546

4647
if ( self.isPositiveAnimation ) {
4748
toView.frame = container.frame;
@@ -86,6 +87,8 @@ - (void)animateTransition:(id<UIViewControllerContextTransitioning>)transitionCo
8687
[transitionContext completeTransition:!transitionContext.transitionWasCancelled];
8788
}];
8889
}
90+
91+
toViewController.view.frame = [transitionContext finalFrameForViewController:toViewController];
8992
}
9093

9194
- (NSTimeInterval)transitionDuration:(id<UIViewControllerContextTransitioning>)transitionContext

0 commit comments

Comments
 (0)