From cf05a15b2fff751121f70d327d53257a1ec8eacd Mon Sep 17 00:00:00 2001 From: Aryan Date: Fri, 28 Nov 2014 12:23:23 -0800 Subject: [PATCH 1/5] A right bar button that is added in storyboard, and has nothing todo with slide functionality --- .../Helper Classes/FriendsViewController.m | 5 ---- .../en.lproj/MainStoryboard_iPhone.storyboard | 26 +++++++++++-------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/SlideMenu/Helper Classes/FriendsViewController.m b/SlideMenu/Helper Classes/FriendsViewController.m index ac1b1d7..cfb7614 100644 --- a/SlideMenu/Helper Classes/FriendsViewController.m +++ b/SlideMenu/Helper Classes/FriendsViewController.m @@ -20,11 +20,6 @@ - (BOOL)slideNavigationControllerShouldDisplayLeftMenu return YES; } -- (BOOL)slideNavigationControllerShouldDisplayRightMenu -{ - return NO; -} - - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { return 20; diff --git a/SlideMenu/en.lproj/MainStoryboard_iPhone.storyboard b/SlideMenu/en.lproj/MainStoryboard_iPhone.storyboard index e8d5d55..f941c10 100644 --- a/SlideMenu/en.lproj/MainStoryboard_iPhone.storyboard +++ b/SlideMenu/en.lproj/MainStoryboard_iPhone.storyboard @@ -1,8 +1,8 @@ - + - - + + @@ -70,7 +70,7 @@ - + @@ -227,7 +227,7 @@ - + @@ -253,7 +253,7 @@ - + @@ -289,13 +289,14 @@ + - + @@ -334,7 +335,7 @@ - + @@ -370,13 +371,16 @@ + + + - + @@ -401,7 +405,7 @@ - + @@ -473,4 +477,4 @@ - \ No newline at end of file + From f2d50da1f635ddc55b44d773850e58d1ea2d9612 Mon Sep 17 00:00:00 2001 From: Aryan Date: Fri, 28 Nov 2014 12:24:45 -0800 Subject: [PATCH 2/5] Fixed #93. Make sure that when the menu is changed the old view is removed --- SlideMenu/Source/SlideNavigationController.m | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/SlideMenu/Source/SlideNavigationController.m b/SlideMenu/Source/SlideNavigationController.m index 37089f8..091ea91 100644 --- a/SlideMenu/Source/SlideNavigationController.m +++ b/SlideMenu/Source/SlideNavigationController.m @@ -851,4 +851,18 @@ - (void)setMenuRevealAnimator:(id)menuRevealA _menuRevealAnimator = menuRevealAnimator; } +- (void)setLeftMenu:(UIViewController *)leftMenu +{ + [_leftMenu.view removeFromSuperview]; + + _leftMenu = leftMenu; +} + +- (void)setRightMenu:(UIViewController *)rightMenu +{ + [_rightMenu.view removeFromSuperview]; + + _rightMenu = rightMenu; +} + @end From 352a127909ec2cb9f867f83f00b87b377359542b Mon Sep 17 00:00:00 2001 From: Aryan Date: Fri, 28 Nov 2014 12:26:21 -0800 Subject: [PATCH 3/5] Fixed #89. Slide menu initially appears on the wrong side when using slide animation --- .../Source/Animations/SlideNavigationContorllerAnimatorSlide.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SlideMenu/Source/Animations/SlideNavigationContorllerAnimatorSlide.m b/SlideMenu/Source/Animations/SlideNavigationContorllerAnimatorSlide.m index 35439aa..9e2c0c3 100644 --- a/SlideMenu/Source/Animations/SlideNavigationContorllerAnimatorSlide.m +++ b/SlideMenu/Source/Animations/SlideNavigationContorllerAnimatorSlide.m @@ -63,7 +63,7 @@ - (void)prepareMenuForAnimation:(Menu)menu if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"8.0")) { - rect.origin.x = self.slideMovement; + rect.origin.x = (menu == MenuLeft) ? self.slideMovement*-1 : self.slideMovement; } else { From 7dba83b8320e9eb9dcf06295e04419d54af1efd1 Mon Sep 17 00:00:00 2001 From: Aryan Date: Fri, 28 Nov 2014 14:03:58 -0800 Subject: [PATCH 4/5] Changed podspec version to 1.4.4 --- iOS-Slide-Menu.podspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/iOS-Slide-Menu.podspec b/iOS-Slide-Menu.podspec index 7069ab7..413ff98 100644 --- a/iOS-Slide-Menu.podspec +++ b/iOS-Slide-Menu.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'iOS-Slide-Menu' - s.version = '1.4.3' + s.version = '1.4.4' s.summary = 'A Slide Menu for iOS' s.homepage = 'https://github.com/aryaxt/iOS-Slide-Menu' s.license = { @@ -8,7 +8,7 @@ Pod::Spec.new do |s| :file => 'License.txt' } s.author = {'Aryan Ghassemi' => 'https://github.com/aryaxt/iOS-Slide-Menu'} - s.source = {:git => 'https://github.com/aryaxt/iOS-Slide-Menu.git', :tag => '1.4.3'} + s.source = {:git => 'https://github.com/aryaxt/iOS-Slide-Menu.git', :tag => '1.4.4'} s.platform = :ios, '6.0' s.source_files = 'SlideMenu/Source/*.{h,m}', 'SlideMenu/Source/Animations/*.{h,m}', 'SlideMenu/Source/Assets/*.{png}' s.resources = ['SlideMenu/Source/Assets/**/*'] From 43f62e7321306d03da881ab1d58b96e942b5e63b Mon Sep 17 00:00:00 2001 From: Aryan Date: Fri, 28 Nov 2014 14:12:13 -0800 Subject: [PATCH 5/5] removed border from menus in the demo --- SlideMenu/Helper Classes/LeftMenuViewController.m | 3 --- SlideMenu/Helper Classes/RightMenuViewController.m | 3 --- 2 files changed, 6 deletions(-) diff --git a/SlideMenu/Helper Classes/LeftMenuViewController.m b/SlideMenu/Helper Classes/LeftMenuViewController.m index ec804cc..9370563 100755 --- a/SlideMenu/Helper Classes/LeftMenuViewController.m +++ b/SlideMenu/Helper Classes/LeftMenuViewController.m @@ -32,9 +32,6 @@ - (void)viewDidLoad UIImageView *imageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"leftMenu.jpg"]]; self.tableView.backgroundView = imageView; - - self.view.layer.borderWidth = .6; - self.view.layer.borderColor = [UIColor lightGrayColor].CGColor; } #pragma mark - UITableView Delegate & Datasrouce - diff --git a/SlideMenu/Helper Classes/RightMenuViewController.m b/SlideMenu/Helper Classes/RightMenuViewController.m index 3cb8daa..96a7767 100644 --- a/SlideMenu/Helper Classes/RightMenuViewController.m +++ b/SlideMenu/Helper Classes/RightMenuViewController.m @@ -20,9 +20,6 @@ - (void)viewDidLoad UIImageView *imageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"rightMenu.jpg"]]; self.tableView.backgroundView = imageView; - - self.view.layer.borderWidth = .6; - self.view.layer.borderColor = [UIColor lightGrayColor].CGColor; } #pragma mark - UITableView Delegate & Datasrouce -