fixer issues #86,#89

#86 #89
stefanoa · Aug 21, 2013 · 919717f · 919717f
1 parent 779b001
commit 919717f
Show file tree

Hide file tree

Showing 14 changed files with 168 additions and 86 deletions.
diff --git a/SASlideMenu.xcodeproj/project.pbxproj b/SASlideMenu.xcodeproj/project.pbxproj
@@ -10,6 +10,7 @@
 		7B27435A16D2820600F89C69 /* LightViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7B27435916D2820600F89C69 /* LightViewController.m */; };
 		7B27435C16D3638300F89C69 /* CHANGELOG.md in Resources */ = {isa = PBXBuildFile; fileRef = 7B27435B16D3638300F89C69 /* CHANGELOG.md */; };
 		7B27436B16D7801E00F89C69 /* FirstViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7B27436A16D7801E00F89C69 /* FirstViewController.m */; };
+		7B30325A17C516C00084BD15 /* SecondViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7B30325917C516C00084BD15 /* SecondViewController.m */; };
 		7B38FC1916F0797400B7DFC3 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B8C3FDE15D8D55800E42A41 /* UIKit.framework */; };
 		7B38FC1A16F0797400B7DFC3 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B8C3FE015D8D55800E42A41 /* Foundation.framework */; };
 		7B38FC1B16F0797400B7DFC3 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B8C3FE215D8D55800E42A41 /* CoreGraphics.framework */; };
@@ -200,6 +201,8 @@
 		7B28D2F51664E6FE000EE929 /* menuright@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "menuright@2x.png"; sourceTree = "<group>"; };
 		7B28D2F81664EE37000EE929 /* ColoredDetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ColoredDetailViewController.h; path = ../SASlideMenu/ColoredDetailViewController.h; sourceTree = "<group>"; };
 		7B28D2F91664EE39000EE929 /* ColoredDetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ColoredDetailViewController.m; path = ../SASlideMenu/ColoredDetailViewController.m; sourceTree = "<group>"; };
+		7B30325817C516C00084BD15 /* SecondViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecondViewController.h; sourceTree = "<group>"; };
+		7B30325917C516C00084BD15 /* SecondViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SecondViewController.m; sourceTree = "<group>"; };
 		7B38FC1816F0797400B7DFC3 /* SASlideMenuiPad.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SASlideMenuiPad.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		7B38FC1E16F0797400B7DFC3 /* SASlideMenuiPad-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "SASlideMenuiPad-Info.plist"; sourceTree = "<group>"; };
 		7B38FC2016F0797400B7DFC3 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
@@ -451,6 +454,8 @@
 				7B28D2F91664EE39000EE929 /* ColoredDetailViewController.m */,
 				7B27436916D7801E00F89C69 /* FirstViewController.h */,
 				7B27436A16D7801E00F89C69 /* FirstViewController.m */,
+				7B30325817C516C00084BD15 /* SecondViewController.h */,
+				7B30325917C516C00084BD15 /* SecondViewController.m */,
 				7B28D2A2165BF464000EE929 /* ExampleDynamicMenuViewController.h */,
 				7B28D2A3165BF464000EE929 /* ExampleDynamicMenuViewController.m */,
 				7BDBF430166CC79400FDA327 /* SASlideMenuAppDelegate.h */,
@@ -789,6 +794,7 @@
 				7BFEA28A16C1545000455A22 /* SASlideMenuRightMenuViewController.m in Sources */,
 				7BFEA28D16C2573F00455A22 /* SASlideMenuNavigationController.m in Sources */,
 				7B27436B16D7801E00F89C69 /* FirstViewController.m in Sources */,
+				7B30325A17C516C00084BD15 /* SecondViewController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -893,7 +899,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "SASlideMenuiPad/SASlideMenuiPad-Prefix.pch";
 				INFOPLIST_FILE = "SASlideMenuiPad/SASlideMenuiPad-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 5.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 6.1;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -910,7 +916,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "SASlideMenuiPad/SASlideMenuiPad-Prefix.pch";
 				INFOPLIST_FILE = "SASlideMenuiPad/SASlideMenuiPad-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 5.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 6.1;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = "1,2";
 				WRAPPER_EXTENSION = app;
@@ -942,7 +948,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 5.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 6.1;
 				SDKROOT = iphoneos;
 			};
 			name = Debug;
@@ -965,7 +971,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 5.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 6.1;
 				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
@@ -981,7 +987,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "SASlideMenuDynamic/SASlideMenuDynamic-Prefix.pch";
 				INFOPLIST_FILE = "SASlideMenuDynamic/SASlideMenuDynamic-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 5.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 6.1;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -998,7 +1004,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "SASlideMenuDynamic/SASlideMenuDynamic-Prefix.pch";
 				INFOPLIST_FILE = "SASlideMenuDynamic/SASlideMenuDynamic-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 5.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 6.1;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = "1,2";
 				WRAPPER_EXTENSION = app;
@@ -1014,7 +1020,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "SASlideMenuStatic/SASlideMenuStatic-Prefix.pch";
 				INFOPLIST_FILE = "SASlideMenuStatic/SASlideMenuStatic-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 5.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 6.1;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
@@ -1030,7 +1036,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "SASlideMenuStatic/SASlideMenuStatic-Prefix.pch";
 				INFOPLIST_FILE = "SASlideMenuStatic/SASlideMenuStatic-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 5.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 6.1;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
 			};

diff --git a/SASlideMenu/ExampleDynamicMenuViewController.m b/SASlideMenu/ExampleDynamicMenuViewController.m
@@ -181,28 +181,28 @@ -(void) tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
 #pragma mark -
 #pragma mark SASlideMenuDelegate
 
--(void) slideMenuWillSlideIn{
+-(void) slideMenuWillSlideIn:(UINavigationController *)selectedContent{
     NSLog(@"slideMenuWillSlideIn");
 }
--(void) slideMenuDidSlideIn{
+-(void) slideMenuDidSlideIn:(UINavigationController *)selectedContent{
     NSLog(@"slideMenuDidSlideIn");
 }
--(void) slideMenuWillSlideToSide{
+-(void) slideMenuWillSlideToSide:(UINavigationController *)selectedContent{
     NSLog(@"slideMenuWillSlideToSide");
 }
--(void) slideMenuDidSlideToSide{
+-(void) slideMenuDidSlideToSide:(UINavigationController *)selectedContent{
     NSLog(@"slideMenuDidSlideToSide");    
 }
--(void) slideMenuWillSlideOut{
+-(void) slideMenuWillSlideOut:(UINavigationController *)selectedContent{
     NSLog(@"slideMenuWillSlideOut");
 }
--(void) slideMenuDidSlideOut{
+-(void) slideMenuDidSlideOut:(UINavigationController *)selectedContent{
     NSLog(@"slideMenuDidSlideOut");
 }
--(void) slideMenuWillSlideToLeft{
+-(void) slideMenuWillSlideToLeft:(UINavigationController *)selectedContent{
     NSLog(@"slideMenuWillSlideToLeft");    
 }
--(void) slideMenuDidSlideToLeft{
+-(void) slideMenuDidSlideToLeft:(UINavigationController *)selectedContent{
     NSLog(@"slideMenuDidSlideToLeft");
 }
 @end
diff --git a/SASlideMenu/ExampleStaticMenuViewController.m b/SASlideMenu/ExampleStaticMenuViewController.m
@@ -85,25 +85,30 @@ -(void) prepareForSwitchToContentViewController:(UINavigationController *)conten
 #pragma mark -
 #pragma mark SASlideMenuDelegate
 
--(void) slideMenuWillSlideIn{
+
+-(void) slideMenuWillSlideIn:(UINavigationController *)selectedContent{
     NSLog(@"slideMenuWillSlideIn");
 }
--(void) slideMenuDidSlideIn{
+-(void) slideMenuDidSlideIn:(UINavigationController *)selectedContent{
     NSLog(@"slideMenuDidSlideIn");
 }
--(void) slideMenuWillSlideToSide{
-    NSLog(@"slideMenuWillSlideToSide");    
+-(void) slideMenuWillSlideToSide:(UINavigationController *)selectedContent{
+    NSLog(@"slideMenuWillSlideToSide");
 }
--(void) slideMenuDidSlideToSide{
+-(void) slideMenuDidSlideToSide:(UINavigationController *)selectedContent{
     NSLog(@"slideMenuDidSlideToSide");
-
 }
--(void) slideMenuWillSlideOut{
+-(void) slideMenuWillSlideOut:(UINavigationController *)selectedContent{
     NSLog(@"slideMenuWillSlideOut");
-
 }
--(void) slideMenuDidSlideOut{
+-(void) slideMenuDidSlideOut:(UINavigationController *)selectedContent{
     NSLog(@"slideMenuDidSlideOut");
 }
+-(void) slideMenuWillSlideToLeft:(UINavigationController *)selectedContent{
+    NSLog(@"slideMenuWillSlideToLeft");
+}
+-(void) slideMenuDidSlideToLeft:(UINavigationController *)selectedContent{
+    NSLog(@"slideMenuDidSlideToLeft");
+}
 
 @end
diff --git a/SASlideMenu/SASlideMenu/SASlideMenuDelegate.h b/SASlideMenu/SASlideMenu/SASlideMenuDelegate.h
@@ -12,16 +12,16 @@
 
 @optional
 
--(void)slideMenuWillSlideToSide;
--(void)slideMenuDidSlideToSide;
+-(void)slideMenuWillSlideToSide:(UINavigationController*) selectedContent;
+-(void)slideMenuDidSlideToSide:(UINavigationController*) selectedContent;
 
--(void)slideMenuWillSlideIn;
--(void)slideMenuDidSlideIn;
+-(void)slideMenuWillSlideIn:(UINavigationController*) selectedContent;
+-(void)slideMenuDidSlideIn:(UINavigationController*) selectedContent;
 
--(void)slideMenuWillSlideOut;
--(void)slideMenuDidSlideOut;
+-(void)slideMenuWillSlideOut:(UINavigationController*) selectedContent;
+-(void)slideMenuDidSlideOut:(UINavigationController*) selectedContent;
 
--(void) slideMenuWillSlideToLeft;
--(void) slideMenuDidSlideToLeft;
+-(void) slideMenuWillSlideToLeft:(UINavigationController*) selectedContent;
+-(void) slideMenuDidSlideToLeft:(UINavigationController*) selectedContent;
 
 @end
diff --git a/SASlideMenu/SASlideMenu/SASlideMenuNavigationController.m b/SASlideMenu/SASlideMenu/SASlideMenuNavigationController.m
@@ -22,4 +22,10 @@ -(UIViewController *)popViewControllerAnimated:(BOOL)animated{
         return [super popViewControllerAnimated:animated];
     }
 }
+
+-(NSArray*) popToRootViewControllerAnimated:(BOOL)animated{
+    NSArray* vcs = [super popToRootViewControllerAnimated:animated];
+    [self.rootController popRightNavigationController];
+    return vcs;
+}
 @end
diff --git a/SASlideMenu/SASlideMenu/SASlideMenuRootViewController.h b/SASlideMenu/SASlideMenu/SASlideMenuRootViewController.h
@@ -31,5 +31,5 @@
 -(void) rightMenuAction;
 
 
-
+-(void) panItem:(UIPanGestureRecognizer*)gesture;
 @end
diff --git a/SASlideMenu/SASlideMenu/SASlideMenuRootViewController.m b/SASlideMenu/SASlideMenu/SASlideMenuRootViewController.m
@@ -112,8 +112,8 @@ -(void) completeSlideToLeftSide:(UINavigationController*) controller{
 }
 
 -(void) doSlideToSide{
-    if ([self.leftMenu.slideMenuDelegate respondsToSelector:@selector(slideMenuWillSlideToSide)]){
-        [self.leftMenu.slideMenuDelegate slideMenuWillSlideToSide];
+    if ([self.leftMenu.slideMenuDelegate respondsToSelector:@selector(slideMenuWillSlideToSide:)]){
+        [self.leftMenu.slideMenuDelegate slideMenuWillSlideToSide:self.selectedContent];
     }
     [self disableGestureRecognizers];
     CGFloat duration = kSlideInInterval;
@@ -129,16 +129,16 @@ -(void) doSlideToSide{
                      }
                      completion:^(BOOL finished) {
                          [self completeSlideToSide:self.selectedContent];
-                         if ([self.leftMenu.slideMenuDelegate respondsToSelector:@selector(slideMenuDidSlideToSide)]){
-                             [self.leftMenu.slideMenuDelegate slideMenuDidSlideToSide];
+                         if ([self.leftMenu.slideMenuDelegate respondsToSelector:@selector(slideMenuDidSlideToSide:)]){
+                             [self.leftMenu.slideMenuDelegate slideMenuDidSlideToSide:self.selectedContent];
                          }
                          [self enableGestureRecognizers];
                      }];
 }
 
 -(void) doSlideToLeftSide{
-    if ([self.leftMenu.slideMenuDelegate respondsToSelector:@selector(slideMenuWillSlideToLeft)]){
-        [self.leftMenu.slideMenuDelegate slideMenuWillSlideToLeft];
+    if ([self.leftMenu.slideMenuDelegate respondsToSelector:@selector(slideMenuWillSlideToLeft:)]){
+        [self.leftMenu.slideMenuDelegate slideMenuWillSlideToLeft:self.selectedContent];
     }
     [self disableGestureRecognizers];
     CGFloat duration = kSlideInInterval;
@@ -154,16 +154,16 @@ -(void) doSlideToLeftSide{
                      }
                      completion:^(BOOL finished) {
                          [self completeSlideToLeftSide:self.selectedContent];
-                         if ([self.leftMenu.slideMenuDelegate respondsToSelector:@selector(slideMenuDidSlideToLeft)]){
-                             [self.leftMenu.slideMenuDelegate slideMenuDidSlideToLeft];
+                         if ([self.leftMenu.slideMenuDelegate respondsToSelector:@selector(slideMenuDidSlideToLeft:)]){
+                             [self.leftMenu.slideMenuDelegate slideMenuDidSlideToLeft:self.selectedContent];
                          }
                          [self enableGestureRecognizers];
                      }];
 }
 
 -(void) doSlideOut:(void (^)(BOOL completed))completion{
-    if ([self.leftMenu.slideMenuDelegate respondsToSelector:@selector(slideMenuWillSlideOut)]){
-        [self.leftMenu.slideMenuDelegate slideMenuWillSlideOut];
+    if ([self.leftMenu.slideMenuDelegate respondsToSelector:@selector(slideMenuWillSlideOut:)]){
+        [self.leftMenu.slideMenuDelegate slideMenuWillSlideOut:self.selectedContent];
     }
     [self disableGestureRecognizers];
     CGFloat duration = kSlideOutInterval;
@@ -177,16 +177,16 @@ -(void) doSlideOut:(void (^)(BOOL completed))completion{
         if (completion) {
             completion(finished);
         }
-        if ([self.leftMenu.slideMenuDelegate respondsToSelector:@selector(slideMenuDidSlideOut)]){
-            [self.leftMenu.slideMenuDelegate slideMenuDidSlideOut];
+        if ([self.leftMenu.slideMenuDelegate respondsToSelector:@selector(slideMenuDidSlideOut:)]){
+            [self.leftMenu.slideMenuDelegate slideMenuDidSlideOut:self.selectedContent];
         }
         [self enableGestureRecognizers];
     }];
 }
 
 -(void) doSlideIn:(void (^)(BOOL completed))completion{
-    if ([self.leftMenu.slideMenuDelegate respondsToSelector:@selector(slideMenuWillSlideIn)]){
-        [self.leftMenu.slideMenuDelegate slideMenuWillSlideIn];
+    if ([self.leftMenu.slideMenuDelegate respondsToSelector:@selector(slideMenuWillSlideIn:)]){
+        [self.leftMenu.slideMenuDelegate slideMenuWillSlideIn:self.selectedContent];
     }
     [self disableGestureRecognizers];
     CGFloat duration = kSlideInInterval;
@@ -205,8 +205,8 @@ -(void) doSlideIn:(void (^)(BOOL completed))completion{
             [self removeRightMenu];
         }
         [self completeSlideIn:self.selectedContent];
-        if ([self.leftMenu.slideMenuDelegate respondsToSelector:@selector(slideMenuDidSlideIn)]){
-            [self.leftMenu.slideMenuDelegate slideMenuDidSlideIn];
+        if ([self.leftMenu.slideMenuDelegate respondsToSelector:@selector(slideMenuDidSlideIn:)]){
+            [self.leftMenu.slideMenuDelegate slideMenuDidSlideIn:self.selectedContent];
         }
         [self enableGestureRecognizers];
     }];
@@ -391,8 +391,8 @@ -(void) switchToContentViewController:(UINavigationController*) content{
         [self addChildViewController:content];
         [self.view addSubview:content.view];
         self.selectedContent = content;
-        if ([self.leftMenu.slideMenuDelegate respondsToSelector:@selector(slideMenuWillSlideIn)]){
-            [self.leftMenu.slideMenuDelegate slideMenuWillSlideIn];
+        if ([self.leftMenu.slideMenuDelegate respondsToSelector:@selector(slideMenuWillSlideIn:)]){
+            [self.leftMenu.slideMenuDelegate slideMenuWillSlideIn:self.selectedContent];
         }
         [self slideIn:self.selectedContent];
         if (state == SASlideMenuStateRightMenu) {
@@ -401,8 +401,8 @@ -(void) switchToContentViewController:(UINavigationController*) content{
             [self.rightMenu removeFromParentViewController];
         }
         [self completeSlideIn:self.selectedContent];
-        if ([self.leftMenu.slideMenuDelegate respondsToSelector:@selector(slideMenuDidSlideIn)]){
-            [self.leftMenu.slideMenuDelegate slideMenuDidSlideIn];
+        if ([self.leftMenu.slideMenuDelegate respondsToSelector:@selector(slideMenuDidSlideIn:)]){
+            [self.leftMenu.slideMenuDelegate slideMenuDidSlideIn:self.selectedContent];
         }
         [content didMoveToParentViewController:self];
         self.view.userInteractionEnabled = YES;

diff --git a/SASlideMenuDynamic/FirstViewController.h b/SASlideMenuDynamic/FirstViewController.h
@@ -12,4 +12,6 @@
 
 @property (nonatomic,strong) IBOutlet UITapGestureRecognizer* tapGesture;
 
+-(IBAction)tap:(id)sender;
+
 @end
diff --git a/SASlideMenuDynamic/FirstViewController.m b/SASlideMenuDynamic/FirstViewController.m
@@ -35,4 +35,9 @@ - (void)didReceiveMemoryWarning
     // Dispose of any resources that can be recreated.
 }
 
+-(IBAction)tap:(id)sender{
+    UINavigationController* navController = self.navigationController;
+    [navController popViewControllerAnimated:YES];
+}
+
 @end
diff --git a/SASlideMenuDynamic/SecondViewController.h b/SASlideMenuDynamic/SecondViewController.h
@@ -0,0 +1,16 @@
+//
+//  SecondViewController.h
+//  SASlideMenu
+//
+//  Created by Stefano Antonelli on 8/21/13.
+//  Copyright (c) 2013 Stefano Antonelli. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface SecondViewController : UIViewController
+
+-(IBAction)tap:(id)sender;
+
+
+@end