From 89d598fdbfe01d0df892ea2d9c2c7a76b41150e0 Mon Sep 17 00:00:00 2001
From: Aryan Gh <aryaxt@aryan-ghs-MacBook-Pro.local>
Date: Sat, 11 May 2013 23:06:27 -0700
Subject: [PATCH] - Fixed typo in delegate methods of SlideNavigationController
 ("slideNavigationControllerShouldSisplay" to
 "slideNavigationControllerShouldDisplay") - Renamed SwitchViewController
 method to switchToViewController - Fixed the bug where Navigation Items added
 in storyboard were being removed by the SlideMenu

---
 SlideMenu/Helper Classes/MenuViewController.m |  2 +-
 .../ProfileDetailViewController.m             |  2 +-
 SlideMenu/Source/SlideNavigationController.h  |  2 +-
 SlideMenu/Source/SlideNavigationController.m  |  8 +-------
 .../en.lproj/MainStoryboard_iPhone.storyboard | 19 +++++++++++++++----
 5 files changed, 19 insertions(+), 14 deletions(-)

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 @@
                     </navigationBar>
                     <connections>
                         <segue destination="mAB-md-uek" kind="relationship" relationship="rootViewController" id="z8d-Ml-dpq"/>
-                        <segue destination="nrg-5w-bbF" kind="push" id="VVC-UO-FWZ"/>
+                        <segue destination="nrg-5w-bbF" kind="push" identifier="ProfileSegue" id="VVC-UO-FWZ"/>
                     </connections>
                 </navigationController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="3Qg-wo-U2C" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -38,7 +38,7 @@
                                     <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 </state>
                                 <connections>
-                                    <segue destination="Tha-f2-JWx" kind="push" id="jGs-V7-na4"/>
+                                    <segue destination="Tha-f2-JWx" kind="push" identifier="NoMenuSegue" id="jGs-V7-na4"/>
                                 </connections>
                             </button>
                         </subviews>
@@ -63,7 +63,18 @@
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
                     </view>
-                    <navigationItem key="navigationItem" title="No Menu" id="k71-Cl-mOP"/>
+                    <navigationItem key="navigationItem" title="No Menu" id="k71-Cl-mOP">
+                        <barButtonItem key="rightBarButtonItem" id="NgO-HE-8LY">
+                            <segmentedControl key="customView" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="bar" selectedSegmentIndex="0" id="nE8-Dp-UZR">
+                                <rect key="frame" x="220" y="6" width="95" height="32"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <segments>
+                                    <segment title="Seg 1"/>
+                                    <segment title="Seg 2"/>
+                                </segments>
+                            </segmentedControl>
+                        </barButtonItem>
+                    </navigationItem>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="LfU-9k-SWv" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
@@ -87,7 +98,7 @@
                                     <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 </state>
                                 <connections>
-                                    <segue destination="BLR-mt-TZ9" kind="push" id="yr9-GK-Pwl"/>
+                                    <segue destination="BLR-mt-TZ9" kind="push" identifier="RightMenuOnlySegue" id="yr9-GK-Pwl"/>
                                 </connections>
                             </button>
                             <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="liN-HX-4nb">