From d8867cfb3e6a14078ffd5991b36158797b084f2f Mon Sep 17 00:00:00 2001 From: Aryan Gh Date: Sat, 27 Apr 2013 00:59:33 -0700 Subject: [PATCH] - Got rid of left and right bar button image - Allowing custom barbuttons to be passed, and used for both right and left bar buttons menu items --- SlideMenu.xcodeproj/project.pbxproj | 16 ++++++------ SlideMenu/Source/Assets/left-menu-button.png | Bin 9260 -> 0 bytes SlideMenu/Source/Assets/menu-button.png | Bin 0 -> 1118 bytes SlideMenu/Source/Assets/menu-button@2x.png | Bin 0 -> 1066 bytes SlideMenu/Source/Assets/right-menu-button.png | Bin 9260 -> 0 bytes SlideMenu/Source/SlideNavigationController.h | 2 ++ SlideMenu/Source/SlideNavigationController.m | 23 ++++++++---------- 7 files changed, 20 insertions(+), 21 deletions(-) delete mode 100644 SlideMenu/Source/Assets/left-menu-button.png create mode 100644 SlideMenu/Source/Assets/menu-button.png create mode 100644 SlideMenu/Source/Assets/menu-button@2x.png delete mode 100644 SlideMenu/Source/Assets/right-menu-button.png diff --git a/SlideMenu.xcodeproj/project.pbxproj b/SlideMenu.xcodeproj/project.pbxproj index 20fcb7a..9bac8d3 100644 --- a/SlideMenu.xcodeproj/project.pbxproj +++ b/SlideMenu.xcodeproj/project.pbxproj @@ -27,10 +27,10 @@ 15CBD67C172A15F900F0C53E /* HomeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 15CBD677172A15F900F0C53E /* HomeViewController.m */; }; 15CBD67D172A15F900F0C53E /* MenuViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 15CBD679172A15F900F0C53E /* MenuViewController.m */; }; 15CBD67E172A15F900F0C53E /* ProfileViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 15CBD67B172A15F900F0C53E /* ProfileViewController.m */; }; - 15CBD684172A20DA00F0C53E /* left-menu-button.png in Resources */ = {isa = PBXBuildFile; fileRef = 15CBD682172A20DA00F0C53E /* left-menu-button.png */; }; - 15CBD685172A20DA00F0C53E /* right-menu-button.png in Resources */ = {isa = PBXBuildFile; fileRef = 15CBD683172A20DA00F0C53E /* right-menu-button.png */; }; 15CBD689172A22B700F0C53E /* ProfileDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 15CBD688172A22B700F0C53E /* ProfileDetailViewController.m */; }; 15CBD699172A57F100F0C53E /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15CBD698172A57F100F0C53E /* QuartzCore.framework */; }; + 15CBD6BE172BBB3600F0C53E /* menu-button@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 15CBD6BD172BBB3600F0C53E /* menu-button@2x.png */; }; + 15CBD6C0172BBB7100F0C53E /* menu-button.png in Resources */ = {isa = PBXBuildFile; fileRef = 15CBD6BF172BBB7100F0C53E /* menu-button.png */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -73,11 +73,11 @@ 15CBD679172A15F900F0C53E /* MenuViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MenuViewController.m; sourceTree = ""; }; 15CBD67A172A15F900F0C53E /* ProfileViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProfileViewController.h; sourceTree = ""; }; 15CBD67B172A15F900F0C53E /* ProfileViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ProfileViewController.m; sourceTree = ""; }; - 15CBD682172A20DA00F0C53E /* left-menu-button.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "left-menu-button.png"; sourceTree = ""; }; - 15CBD683172A20DA00F0C53E /* right-menu-button.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "right-menu-button.png"; sourceTree = ""; }; 15CBD687172A22B600F0C53E /* ProfileDetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProfileDetailViewController.h; sourceTree = ""; }; 15CBD688172A22B700F0C53E /* ProfileDetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ProfileDetailViewController.m; sourceTree = ""; }; 15CBD698172A57F100F0C53E /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; + 15CBD6BD172BBB3600F0C53E /* menu-button@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "menu-button@2x.png"; sourceTree = ""; }; + 15CBD6BF172BBB7100F0C53E /* menu-button.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "menu-button.png"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -211,8 +211,8 @@ 15CBD681172A209500F0C53E /* Assets */ = { isa = PBXGroup; children = ( - 15CBD682172A20DA00F0C53E /* left-menu-button.png */, - 15CBD683172A20DA00F0C53E /* right-menu-button.png */, + 15CBD6BF172BBB7100F0C53E /* menu-button.png */, + 15CBD6BD172BBB3600F0C53E /* menu-button@2x.png */, ); path = Assets; sourceTree = ""; @@ -294,8 +294,8 @@ 15371EF91728E3B400A508F4 /* Default-568h@2x.png in Resources */, 15371EFC1728E3B400A508F4 /* MainStoryboard_iPhone.storyboard in Resources */, 15371EFF1728E3B400A508F4 /* MainStoryboard_iPad.storyboard in Resources */, - 15CBD684172A20DA00F0C53E /* left-menu-button.png in Resources */, - 15CBD685172A20DA00F0C53E /* right-menu-button.png in Resources */, + 15CBD6BE172BBB3600F0C53E /* menu-button@2x.png in Resources */, + 15CBD6C0172BBB7100F0C53E /* menu-button.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/SlideMenu/Source/Assets/left-menu-button.png b/SlideMenu/Source/Assets/left-menu-button.png deleted file mode 100644 index cf504cd7e61edfa56d5133f91acae0267ef65204..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9260 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 VDJvI`H2-|tWxgs(RErq|{vUkH=^g+8 diff --git a/SlideMenu/Source/Assets/menu-button.png b/SlideMenu/Source/Assets/menu-button.png new file mode 100644 index 0000000000000000000000000000000000000000..4a4d467a971aaf8a7f6fbc9c06a1a3fc2f9680a4 GIT binary patch literal 1118 zcmbVLO-K|`93Qiy1P?(7)}hB39;DrQGrR8W4!dr;vztq`Jqpo!jg9c{a$NYc4-~aPgy8BFh z-LX1~qUw{KVuq{@_`-}oEN*1Ep6(f&8Qj-Qz21!ck;u{pE zsM>;>&EZ_COOOrCE4emaM>7eUqQX(fl;mNAK^_gNdW2qmxkv+5iO~J6DVQ>2Xh`iG zvrykycUB%7mO~01Z3AIPAOsr15^%H;-4>h(y~!((y?f2jVABK-N9Zl5a;Y?k85RPq zUg(iw0D=JPWqp30=T89+vXFrs!*U*$7kr!mA=rLsqGl-tAtNTXwa6(#4`FNy3{xx? zy+xnbum%}66biW<9Ooex9=oJt$?@oRQAsr{h2u=QY6;%-uJfC1$-Vb>W27)XbOa!<%?@vGo{hu}R&=k}jjFu1a*bvA#XALd-%EHms~+j8r=y zJ!D|R9x_Z2>uUumNmh0D?3QOMS`k_5C8Q)QLj#-n71Uky{~h-hR{5WtF~k|hZH~X1 zrFum=(B1B|J~`|R57NoRSY$L#?tgfXjMZdPY|lC$^Ba{)wAMqt|ML3I`oxbb7xGi{ zw=3$3(mX!Cj+O&QmFA|Y$$fbS%srld(R0-~zBJGa<__fBS{gSF-#p>FAF^-EmdoX@ z>pxe!mf`Ho%-ZLL^NX)w`0}r(mFR5E(%W}g_HN6!`Ihf%YsKDA>8be#OJ{5H{h;B| f^oxZFhd(`0LviIwYY9AGaVI_*?-rkQ3|#vSeok*< literal 0 HcmV?d00001 diff --git a/SlideMenu/Source/Assets/menu-button@2x.png b/SlideMenu/Source/Assets/menu-button@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..08dc402d36592d39015c091c7c615097eee26b90 GIT binary patch literal 1066 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 VDJvI`H2-|tWxgs(RErq|{vUkH=^g+8 diff --git a/SlideMenu/Source/SlideNavigationController.h b/SlideMenu/Source/SlideNavigationController.h index c417617..0d66769 100644 --- a/SlideMenu/Source/SlideNavigationController.h +++ b/SlideMenu/Source/SlideNavigationController.h @@ -24,6 +24,8 @@ typedef enum{ @property (nonatomic, strong) UIViewController *righMenu; @property (nonatomic, strong) UIViewController *leftMenu; +@property (nonatomic, strong) UIBarButtonItem *leftbarButtonItem; +@property (nonatomic, strong) UIBarButtonItem *rightBarButtonItem; + (SlideNavigationController *)sharedInstance; - (void)switchViewController:(UIViewController *)viewController withCompletion:(void (^)())completion; diff --git a/SlideMenu/Source/SlideNavigationController.m b/SlideMenu/Source/SlideNavigationController.m index 06629b1..feee0dc 100644 --- a/SlideMenu/Source/SlideNavigationController.m +++ b/SlideMenu/Source/SlideNavigationController.m @@ -20,12 +20,13 @@ @synthesize tapRecognizer; @synthesize panRecognizer; @synthesize draggingPoint; +@synthesize leftbarButtonItem; +@synthesize rightBarButtonItem; #define MENU_OFFSET 60 #define MENU_SLIDE_ANIMATION_DURATION .3 #define MENU_QUICK_SLIDE_ANIMATION_DURATION .1 -#define MENU_LEFT_IMAGE @"left-menu-button" -#define MENU_RIGHT_IMAGE @"left-menu-button" +#define MENU_IMAGE @"menu-button" static SlideNavigationController *singletonInstance; @@ -116,22 +117,18 @@ static SlideNavigationController *singletonInstance; - (UIBarButtonItem *)barButtonItemForMenu:(Menu)menu { SEL selector = (menu == MenuLeft) ? @selector(leftMenuSelected:) : @selector(righttMenuSelected:); - UIImage *image = [UIImage imageNamed:(menu == MenuLeft) ? MENU_LEFT_IMAGE : MENU_RIGHT_IMAGE]; + UIBarButtonItem *customButton = (menu == MenuLeft) ? self.leftbarButtonItem : self.rightBarButtonItem; - if (image) + if (customButton) { - UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom]; - [button setImage:image forState:UIControlStateNormal]; - button.frame = CGRectMake(0, 0, image.size.width, image.size.height); - [button addTarget:self action:selector forControlEvents:UIControlEventTouchUpInside]; - - return [[UIBarButtonItem alloc] initWithCustomView:button]; + customButton.action = selector; + customButton.target = self; + return customButton; } else { - return [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemBookmarks - target:self - action:selector]; + UIImage *image = [UIImage imageNamed:MENU_IMAGE]; + return [[UIBarButtonItem alloc] initWithImage:image style:UIBarButtonItemStylePlain target:self action:selector]; } }