diff --git a/SlideMenu/Source/SlideNavigationController.h b/SlideMenu/Source/SlideNavigationController.h index b64701b..fd6af5f 100644 --- a/SlideMenu/Source/SlideNavigationController.h +++ b/SlideMenu/Source/SlideNavigationController.h @@ -63,14 +63,14 @@ extern NSString *const SlideNavigationControllerDidReveal; @property (nonatomic, strong) id menuRevealAnimator; + (SlideNavigationController *)sharedInstance; -- (void)switchToViewController:(UIViewController *)viewController withCompletion:(void (^)())completion __deprecated; -- (void)popToRootAndSwitchToViewController:(UIViewController *)viewController withSlideOutAnimation:(BOOL)slideOutAnimation andCompletion:(void (^)())completion; -- (void)popToRootAndSwitchToViewController:(UIViewController *)viewController withCompletion:(void (^)())completion; -- (void)popAllAndSwitchToViewController:(UIViewController *)viewController withSlideOutAnimation:(BOOL)slideOutAnimation andCompletion:(void (^)())completion; -- (void)popAllAndSwitchToViewController:(UIViewController *)viewController withCompletion:(void (^)())completion; -- (void)bounceMenu:(Menu)menu withCompletion:(void (^)())completion; -- (void)openMenu:(Menu)menu withCompletion:(void (^)())completion; -- (void)closeMenuWithCompletion:(void (^)())completion; +- (void)switchToViewController:(UIViewController *)viewController withCompletion:(void (^)(void))completion __deprecated; +- (void)popToRootAndSwitchToViewController:(UIViewController *)viewController withSlideOutAnimation:(BOOL)slideOutAnimation andCompletion:(void (^)(void))completion; +- (void)popToRootAndSwitchToViewController:(UIViewController *)viewController withCompletion:(void (^)(void))completion; +- (void)popAllAndSwitchToViewController:(UIViewController *)viewController withSlideOutAnimation:(BOOL)slideOutAnimation andCompletion:(void (^)(void))completion; +- (void)popAllAndSwitchToViewController:(UIViewController *)viewController withCompletion:(void (^)(void))completion; +- (void)bounceMenu:(Menu)menu withCompletion:(void (^)(void))completion; +- (void)openMenu:(Menu)menu withCompletion:(void (^)(void))completion; +- (void)closeMenuWithCompletion:(void (^)(void))completion; - (void)toggleLeftMenu; - (void)toggleRightMenu; - (BOOL)isMenuOpen; diff --git a/SlideMenu/Source/SlideNavigationController.m b/SlideMenu/Source/SlideNavigationController.m index d7409a6..c2a95d0 100644 --- a/SlideMenu/Source/SlideNavigationController.m +++ b/SlideMenu/Source/SlideNavigationController.m @@ -174,7 +174,7 @@ - (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrie #pragma mark - Public Methods - -- (void)bounceMenu:(Menu)menu withCompletion:(void (^)())completion +- (void)bounceMenu:(Menu)menu withCompletion:(void (^)(void))completion { [self prepareMenuForReveal:menu]; NSInteger movementDirection = (menu == MenuLeft) ? 1 : -1; @@ -210,7 +210,7 @@ - (void)bounceMenu:(Menu)menu withCompletion:(void (^)())completion - (void)switchToViewController:(UIViewController *)viewController withSlideOutAnimation:(BOOL)slideOutAnimation popType:(PopType)poptype - andCompletion:(void (^)())completion + andCompletion:(void (^)(void))completion { if (self.avoidSwitchingToSameClassViewController && [self.topViewController isKindOfClass:viewController.class]) { @@ -267,43 +267,43 @@ - (void)switchToViewController:(UIViewController *)viewController } } -- (void)switchToViewController:(UIViewController *)viewController withCompletion:(void (^)())completion +- (void)switchToViewController:(UIViewController *)viewController withCompletion:(void (^)(void))completion { [self switchToViewController:viewController withSlideOutAnimation:YES popType:PopTypeRoot andCompletion:completion]; } - (void)popToRootAndSwitchToViewController:(UIViewController *)viewController withSlideOutAnimation:(BOOL)slideOutAnimation - andCompletion:(void (^)())completion + andCompletion:(void (^)(void))completion { [self switchToViewController:viewController withSlideOutAnimation:slideOutAnimation popType:PopTypeRoot andCompletion:completion]; } - (void)popToRootAndSwitchToViewController:(UIViewController *)viewController - withCompletion:(void (^)())completion + withCompletion:(void (^)(void))completion { [self switchToViewController:viewController withSlideOutAnimation:YES popType:PopTypeRoot andCompletion:completion]; } - (void)popAllAndSwitchToViewController:(UIViewController *)viewController withSlideOutAnimation:(BOOL)slideOutAnimation - andCompletion:(void (^)())completion + andCompletion:(void (^)(void))completion { [self switchToViewController:viewController withSlideOutAnimation:slideOutAnimation popType:PopTypeAll andCompletion:completion]; } - (void)popAllAndSwitchToViewController:(UIViewController *)viewController - withCompletion:(void (^)())completion + withCompletion:(void (^)(void))completion { [self switchToViewController:viewController withSlideOutAnimation:YES popType:PopTypeAll andCompletion:completion]; } -- (void)closeMenuWithCompletion:(void (^)())completion +- (void)closeMenuWithCompletion:(void (^)(void))completion { [self closeMenuWithDuration:self.menuRevealAnimationDuration andCompletion:completion]; } -- (void)openMenu:(Menu)menu withCompletion:(void (^)())completion +- (void)openMenu:(Menu)menu withCompletion:(void (^)(void))completion { [self openMenu:menu withDuration:self.menuRevealAnimationDuration andCompletion:completion]; } @@ -424,7 +424,7 @@ - (void)enableTapGestureToCloseMenu:(BOOL)enable } } -- (void)toggleMenu:(Menu)menu withCompletion:(void (^)())completion +- (void)toggleMenu:(Menu)menu withCompletion:(void (^)(void))completion { if ([self isMenuOpen]) [self closeMenuWithCompletion:completion]; @@ -473,7 +473,7 @@ - (BOOL)shouldDisplayMenu:(Menu)menu forViewController:(UIViewController *)vc return NO; } -- (void)openMenu:(Menu)menu withDuration:(float)duration andCompletion:(void (^)())completion +- (void)openMenu:(Menu)menu withDuration:(float)duration andCompletion:(void (^)(void))completion { [self enableTapGestureToCloseMenu:YES]; @@ -496,7 +496,7 @@ - (void)openMenu:(Menu)menu withDuration:(float)duration andCompletion:(void (^) }]; } -- (void)closeMenuWithDuration:(float)duration andCompletion:(void (^)())completion +- (void)closeMenuWithDuration:(float)duration andCompletion:(void (^)(void))completion { [self enableTapGestureToCloseMenu:NO];