Skip to content

Bugfix/jstricker/single child transition crash #141

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

Open
jatraiz wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

Bugfix/jstricker/single child transition crash #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
31bdf06
possible fix for transitioning while transitioning crash
jatraiz Mar 24, 2015
70e6e9c
added queue to keep track of transition requests
jatraiz Mar 24, 2015
9d99424
updated to use a single block & only take not of the last presentatio…
jatraiz Mar 24, 2015
79e820b
changes as per PR
jatraiz Mar 24, 2015
94091ce
new line added
jatraiz Mar 24, 2015
99a24ee
Merge branch 'develop' into bugfix/jstricker/singleChildTransitionCrash
mattThousand Jun 25, 2015
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
3 changes: 3 additions & 0 deletions ...ls/Components/RZSingleChildContainerViewController/RZSingleChildContainerViewController.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,3 +81,6 @@ typedef void (^RZSingleChildContainerViewControllerCompletionBlock)(void);
- (UIView *)childContentContainerView;

@end



38 changes: 25 additions & 13 deletions ...ls/Components/RZSingleChildContainerViewController/RZSingleChildContainerViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ @interface RZSingleChildContainerAlphaTransitioner : NSObject <UIViewControllerA

@end


// -------

@interface RZSingleChildContainerViewController ()
Expand All @@ -55,6 +56,8 @@ @interface RZSingleChildContainerViewController ()

@property (weak, nonatomic) UIViewController *viewControllerOnWhichWeCalledBegin;

@property (copy, nonatomic) void(^queuedPresentationBlock)();

@end

@implementation RZSingleChildContainerViewController
Expand Down Expand Up @@ -163,41 +166,50 @@ - (void)setContentViewController:(UIViewController *)viewController animated:(BO

- (void)setContentViewController:(UIViewController *)viewController animated:(BOOL)animated completion:(RZSingleChildContainerViewControllerCompletionBlock)completion
{
__weak __typeof(self) weakSelf = self
;
if ( self.isTransitioning ) {
[NSException raise:NSInternalInconsistencyException format:@"%@: Cannot start a transition while a transition is already in place.", [self class]];

self.queuedPresentationBlock = ^{
[weakSelf setContentViewController:viewController animated:animated completion:completion];
};

return;
}

__weak __typeof(self) wself = self;


// We need to set isTransitioning to NO once the transition completes.
// Then we run the passed-in completion block if it is not nil.
void (^compoundCompletion)(void) = ^{
self.isTransitioning = NO;
if ( completion ) {
completion();
}
if ( self.queuedPresentationBlock != nil ) {
self.queuedPresentationBlock();
self.queuedPresentationBlock = nil;
}
};

[self performBlockWhenViewLoaded:^{
self.isTransitioning = YES;
UIViewController *currentChild = wself.currentContentViewController;
UIViewController *currentChild = weakSelf.currentContentViewController;

if ( animated ) {

[currentChild beginAppearanceTransition:NO animated:YES];

[currentChild willMoveToParentViewController:nil];
[wself addChildViewController:viewController];
viewController.view.frame = [wself childContentContainerView].bounds;
[weakSelf addChildViewController:viewController];
viewController.view.frame = [weakSelf childContentContainerView].bounds;
viewController.view.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;

[viewController beginAppearanceTransition:YES animated:YES];

RZSingleChildContainerTransitionContext *ctx = [[RZSingleChildContainerTransitionContext alloc] initWithContainerVC:wself
RZSingleChildContainerTransitionContext *ctx = [[RZSingleChildContainerTransitionContext alloc] initWithContainerVC:weakSelf
fromVC:currentChild
toVC:viewController
completion:compoundCompletion];
[wself.contentVCAnimatedTransition animateTransition:ctx];
[weakSelf.contentVCAnimatedTransition animateTransition:ctx];
}
else {

Expand All @@ -210,14 +222,14 @@ - (void)setContentViewController:(UIViewController *)viewController animated:(BO
[currentChild removeFromParentViewController];
[currentChild endAppearanceTransition];

[wself addChildViewController:viewController];
viewController.view.frame = [wself childContentContainerView].bounds;
[weakSelf addChildViewController:viewController];
viewController.view.frame = [weakSelf childContentContainerView].bounds;
viewController.view.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
if ( hasWindow ) {
[viewController beginAppearanceTransition:YES animated:NO];
}
[[wself childContentContainerView] addSubview:viewController.view];
[viewController didMoveToParentViewController:wself];
[[weakSelf childContentContainerView] addSubview:viewController.view];
[viewController didMoveToParentViewController:weakSelf];
if ( hasWindow ) {
[viewController endAppearanceTransition];
}
Expand Down
Loading