diff --git a/SlideMenu/Helper Classes/MenuViewController.m b/SlideMenu/Helper Classes/MenuViewController.m index 3e947be..a4813be 100644 --- a/SlideMenu/Helper Classes/MenuViewController.m +++ b/SlideMenu/Helper Classes/MenuViewController.m @@ -62,7 +62,7 @@ break; } - [[SlideNavigationController sharedInstance] switchViewController:vc withCompletion:nil]; + [[SlideNavigationController sharedInstance] switchToViewController:vc withCompletion:nil]; } @end diff --git a/SlideMenu/Helper Classes/ProfileDetailViewController.m b/SlideMenu/Helper Classes/ProfileDetailViewController.m index 6f54452..875a027 100644 --- a/SlideMenu/Helper Classes/ProfileDetailViewController.m +++ b/SlideMenu/Helper Classes/ProfileDetailViewController.m @@ -24,7 +24,7 @@ - (BOOL)slideNavigationControllerShouldDisplayRightMenu { - return YES; + return NO; } @end diff --git a/SlideMenu/Source/SlideNavigationController.h b/SlideMenu/Source/SlideNavigationController.h index c912360..5764875 100644 --- a/SlideMenu/Source/SlideNavigationController.h +++ b/SlideMenu/Source/SlideNavigationController.h @@ -29,6 +29,6 @@ typedef enum{ @property (nonatomic, strong) UIBarButtonItem *rightBarButtonItem; + (SlideNavigationController *)sharedInstance; -- (void)switchViewController:(UIViewController *)viewController withCompletion:(void (^)())completion; +- (void)switchToViewController:(UIViewController *)viewController withCompletion:(void (^)())completion; @end diff --git a/SlideMenu/Source/SlideNavigationController.m b/SlideMenu/Source/SlideNavigationController.m index 5b5c7af..e3e45f9 100644 --- a/SlideMenu/Source/SlideNavigationController.m +++ b/SlideMenu/Source/SlideNavigationController.m @@ -80,7 +80,7 @@ static SlideNavigationController *singletonInstance; #pragma mark - Public Methods - -- (void)switchViewController:(UIViewController *)viewController withCompletion:(void (^)())completion +- (void)switchToViewController:(UIViewController *)viewController withCompletion:(void (^)())completion { if (self.avoidSwitchingToSameClassViewController && [self.topViewController isKindOfClass:viewController.class]) { @@ -207,8 +207,6 @@ static SlideNavigationController *singletonInstance; { return YES; } - - return NO; } return NO; @@ -279,13 +277,9 @@ static SlideNavigationController *singletonInstance; { if ([self shouldDisplayMenu:MenuLeft forViewController:viewController]) viewController.navigationItem.leftBarButtonItem = [self barButtonItemForMenu:MenuLeft]; - else - viewController.navigationItem.leftBarButtonItem = nil; if ([self shouldDisplayMenu:MenuRight forViewController:viewController]) viewController.navigationItem.rightBarButtonItem = [self barButtonItemForMenu:MenuRight]; - else - viewController.navigationItem.rightBarButtonItem = nil; } #pragma mark - IBActions - diff --git a/SlideMenu/en.lproj/MainStoryboard_iPhone.storyboard b/SlideMenu/en.lproj/MainStoryboard_iPhone.storyboard index c02762e..e64df1c 100644 --- a/SlideMenu/en.lproj/MainStoryboard_iPhone.storyboard +++ b/SlideMenu/en.lproj/MainStoryboard_iPhone.storyboard @@ -13,7 +13,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -63,7 +63,18 @@ - + + + + + + + + + + + + @@ -87,7 +98,7 @@ - +