Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added storyboard support and variables names to block declarations #79

Closed
wants to merge 2 commits into from
Closed

Added storyboard support and variables names to block declarations #79

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
23d7efb
Added variable names to block declarations to help in code completion
Aug 14, 2013
92b7bb4
Added InitWithCoder to support Storyboards
Aug 14, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 36 additions & 18 deletions MMDrawerController/MMDrawerController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,20 +133,35 @@ @implementation MMDrawerController

#pragma mark - Init

- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
if (self) {
[self setMaximumLeftDrawerWidth:MMDrawerDefaultWidth];
[self setMaximumRightDrawerWidth:MMDrawerDefaultWidth];
-(void)commomInit
{
[self setMaximumLeftDrawerWidth:MMDrawerDefaultWidth];
[self setMaximumRightDrawerWidth:MMDrawerDefaultWidth];

[self setAnimationVelocity:MMDrawerDefaultAnimationVelocity];

[self setShowsShadow:YES];
[self setShouldStretchDrawer:YES];

[self setOpenDrawerGestureModeMask:MMOpenDrawerGestureModeNone];
[self setCloseDrawerGestureModeMask:MMCloseDrawerGestureModeNone];
[self setCenterHiddenInteractionMode:MMDrawerOpenCenterInteractionModeNavigationBarOnly];

[self setAnimationVelocity:MMDrawerDefaultAnimationVelocity];
}

[self setShowsShadow:YES];
[self setShouldStretchDrawer:YES];
- (id)initWithCoder:(NSCoder *)aDecoder
{
self = [super initWithCoder:aDecoder];
if (self) {
[self commomInit];
}
return self;
}

[self setOpenDrawerGestureModeMask:MMOpenDrawerGestureModeNone];
[self setCloseDrawerGestureModeMask:MMCloseDrawerGestureModeNone];
[self setCenterHiddenInteractionMode:MMDrawerOpenCenterInteractionModeNavigationBarOnly];
- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
if (self) {
[self commomInit];
}
return self;
}
Expand All @@ -155,6 +170,9 @@ -(id)initWithCenterViewController:(UIViewController *)centerViewController leftD
NSParameterAssert(centerViewController);
self = [super init];
if(self){

[self commomInit];

[self setCenterViewController:centerViewController];
[self setLeftDrawerViewController:leftDrawerViewController];
[self setRightDrawerViewController:rightDrawerViewController];
Expand All @@ -171,7 +189,7 @@ -(id)initWithCenterViewController:(UIViewController *)centerViewController right
}

#pragma mark - Open/Close methods
-(void)toggleDrawerSide:(MMDrawerSide)drawerSide animated:(BOOL)animated completion:(void (^)(BOOL))completion{
-(void)toggleDrawerSide:(MMDrawerSide)drawerSide animated:(BOOL)animated completion:(void (^)(BOOL finished))completion{
NSParameterAssert(drawerSide!=MMDrawerSideNone);
if(self.openSide == MMDrawerSideNone){
[self openDrawerSide:drawerSide animated:animated completion:completion];
Expand All @@ -189,11 +207,11 @@ -(void)toggleDrawerSide:(MMDrawerSide)drawerSide animated:(BOOL)animated complet
}
}

-(void)closeDrawerAnimated:(BOOL)animated completion:(void (^)(BOOL))completion{
-(void)closeDrawerAnimated:(BOOL)animated completion:(void (^)(BOOL finished))completion{
[self closeDrawerAnimated:animated velocity:self.animationVelocity animationOptions:UIViewAnimationOptionCurveEaseInOut completion:completion];
}

-(void)closeDrawerAnimated:(BOOL)animated velocity:(CGFloat)velocity animationOptions:(UIViewAnimationOptions)options completion:(void (^)(BOOL))completion{
-(void)closeDrawerAnimated:(BOOL)animated velocity:(CGFloat)velocity animationOptions:(UIViewAnimationOptions)options completion:(void (^)(BOOL finished))completion{
if (self.isAnimatingDrawer) {
if(completion){
completion(NO);
Expand Down Expand Up @@ -249,13 +267,13 @@ -(void)closeDrawerAnimated:(BOOL)animated velocity:(CGFloat)velocity animationOp
}
}

-(void)openDrawerSide:(MMDrawerSide)drawerSide animated:(BOOL)animated completion:(void (^)(BOOL))completion{
-(void)openDrawerSide:(MMDrawerSide)drawerSide animated:(BOOL)animated completion:(void (^)(BOOL finished))completion{
NSParameterAssert(drawerSide != MMDrawerSideNone);

[self openDrawerSide:drawerSide animated:animated velocity:self.animationVelocity animationOptions:UIViewAnimationOptionCurveEaseInOut completion:completion];
}

-(void)openDrawerSide:(MMDrawerSide)drawerSide animated:(BOOL)animated velocity:(CGFloat)velocity animationOptions:(UIViewAnimationOptions)options completion:(void (^)(BOOL))completion{
-(void)openDrawerSide:(MMDrawerSide)drawerSide animated:(BOOL)animated velocity:(CGFloat)velocity animationOptions:(UIViewAnimationOptions)options completion:(void (^)(BOOL finished))completion{
NSParameterAssert(drawerSide != MMDrawerSideNone);
if(self.isAnimatingDrawer){
if(completion){
Expand Down Expand Up @@ -351,7 +369,7 @@ -(void)setCenterViewController:(UIViewController *)centerViewController animated
}
}

-(void)setCenterViewController:(UIViewController *)newCenterViewController withCloseAnimation:(BOOL)animated completion:(void(^)(BOOL))completion{
-(void)setCenterViewController:(UIViewController *)newCenterViewController withCloseAnimation:(BOOL)animated completion:(void(^)(BOOL finished))completion{
[self setCenterViewController:newCenterViewController animated:animated];

if(self.openSide != MMDrawerSideNone){
Expand All @@ -377,7 +395,7 @@ -(void)setCenterViewController:(UIViewController *)newCenterViewController withC
}
}

-(void)setCenterViewController:(UIViewController *)newCenterViewController withFullCloseAnimation:(BOOL)animated completion:(void(^)(BOOL))completion{
-(void)setCenterViewController:(UIViewController *)newCenterViewController withFullCloseAnimation:(BOOL)animated completion:(void(^)(BOOL finished))completion{
if(self.openSide != MMDrawerSideNone &&
animated){

Expand Down