diff --git a/Pod/Classes/.gitkeep b/Pod/Classes/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/Pod/Classes/Animators/MBTXYAnimator.m b/Pod/Classes/Animators/MBTXYAnimator.m index bcb124d..c36d586 100644 --- a/Pod/Classes/Animators/MBTXYAnimator.m +++ b/Pod/Classes/Animators/MBTXYAnimator.m @@ -48,7 +48,7 @@ - (void)animateTransition:(id )transitionC toView.frame = finalToFrame; } completion:^(BOOL finished) { - if (!finished) { + if ([transitionContext transitionWasCancelled]) { fromView.frame = initialFromFrame; toView.frame = initialToFrame; } diff --git a/Pod/Classes/Animators/MBTZAnimator.m b/Pod/Classes/Animators/MBTZAnimator.m index a694082..7075b90 100644 --- a/Pod/Classes/Animators/MBTZAnimator.m +++ b/Pod/Classes/Animators/MBTZAnimator.m @@ -44,14 +44,14 @@ - (void)animateTransition:(id)transitionCo options:0 animations:^{ fromView.transform = CGAffineTransformMakeScale(scaleFromX, scaleFromY); - fromView.alpha = 0; + fromView.alpha = 0.0; toView.transform = CGAffineTransformIdentity; - toView.alpha = 1; + toView.alpha = 1.0; } completion:^(BOOL finished) { if (!finished) { fromView.transform = CGAffineTransformIdentity; - fromView.alpha = 1; + fromView.alpha = 1.0; } [transitionContext completeTransition:![transitionContext transitionWasCancelled]]; diff --git a/Pod/Classes/MBT3DGridViewController.h b/Pod/Classes/MBT3DGridViewController.h index 58324e6..a7dfebf 100644 --- a/Pod/Classes/MBT3DGridViewController.h +++ b/Pod/Classes/MBT3DGridViewController.h @@ -49,11 +49,6 @@ typedef NS_ENUM(NSInteger, MBT3DGridTransitionDirection) { @property (weak, nonatomic) IBOutlet UIView *backgroundView; -/** - * <#Description#> - * - * @param direction <#direction description#> - */ - (BOOL)moveAlongDirection:(MBT3DGridTransitionDirection)direction interactively:(BOOL)interactively; @end diff --git a/Pod/Classes/MBT3DGridViewController.m b/Pod/Classes/MBT3DGridViewController.m index e9d547e..945d6f0 100644 --- a/Pod/Classes/MBT3DGridViewController.m +++ b/Pod/Classes/MBT3DGridViewController.m @@ -55,6 +55,7 @@ - (void)viewDidLoad { [self addChildViewController:self.currentContentViewController]; [self.currentContentViewController beginAppearanceTransition:YES animated:NO]; [self.view addSubview:self.currentContentViewController.view]; + [self.currentContentViewController didMoveToParentViewController:self]; [self.currentContentViewController endAppearanceTransition]; }