diff --git a/Doc/lefthidden.png b/Doc/lefthidden.png index 166171a..87830ed 100644 Binary files a/Doc/lefthidden.png and b/Doc/lefthidden.png differ diff --git a/Doc/leftrevealed.png b/Doc/leftrevealed.png index 609111a..3567eeb 100644 Binary files a/Doc/leftrevealed.png and b/Doc/leftrevealed.png differ diff --git a/ViewDeckStoryboardExample/AppDelegate.h b/ViewDeckStoryboardExample/AppDelegate.h old mode 100644 new mode 100755 diff --git a/ViewDeckStoryboardExample/AppDelegate.m b/ViewDeckStoryboardExample/AppDelegate.m old mode 100644 new mode 100755 diff --git a/ViewDeckStoryboardExample/Default-568h@2x.png b/ViewDeckStoryboardExample/Default-568h@2x.png old mode 100644 new mode 100755 diff --git a/ViewDeckStoryboardExample/Default.png b/ViewDeckStoryboardExample/Default.png old mode 100644 new mode 100755 diff --git a/ViewDeckStoryboardExample/Default@2x.png b/ViewDeckStoryboardExample/Default@2x.png old mode 100644 new mode 100755 diff --git a/ViewDeckStoryboardExample/FirstViewController.h b/ViewDeckStoryboardExample/FirstViewController.h new file mode 100644 index 0000000..56524a2 --- /dev/null +++ b/ViewDeckStoryboardExample/FirstViewController.h @@ -0,0 +1,5 @@ +#import + +@interface FirstViewController : UIViewController + +@end diff --git a/ViewDeckStoryboardExample/FirstViewController.m b/ViewDeckStoryboardExample/FirstViewController.m new file mode 100644 index 0000000..3b8bf67 --- /dev/null +++ b/ViewDeckStoryboardExample/FirstViewController.m @@ -0,0 +1,45 @@ +#import "FirstViewController.h" +#import + +@interface FirstViewController () + +@end + +@implementation FirstViewController + +- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil +{ + self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]; + if (self) { + // Custom initialization + } + return self; +} + +- (void)viewDidLoad +{ + [super viewDidLoad]; + // Do any additional setup after loading the view. +} + + +- (void)viewDidAppear:(BOOL)animated +{ + [super viewDidAppear:YES]; + // Do any additional setup after loading the view. +} + + + +- (void)didReceiveMemoryWarning +{ + [super didReceiveMemoryWarning]; + // Dispose of any resources that can be recreated. +} + +- (IBAction)revealSidebar:(UIBarButtonItem *)sender { + // Open menu + [self.viewDeckController toggleLeftViewAnimated:YES]; +} + +@end diff --git a/ViewDeckStoryboardExample/InitialViewController.h b/ViewDeckStoryboardExample/InitialViewController.h old mode 100644 new mode 100755 diff --git a/ViewDeckStoryboardExample/InitialViewController.m b/ViewDeckStoryboardExample/InitialViewController.m old mode 100644 new mode 100755 index 7f0d271..8664c14 --- a/ViewDeckStoryboardExample/InitialViewController.m +++ b/ViewDeckStoryboardExample/InitialViewController.m @@ -22,13 +22,15 @@ @implementation InitialViewController - (id)initWithCoder:(NSCoder *)aDecoder { UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"MainStoryboard" bundle:nil]; - self = [super initWithCenterViewController:[storyboard instantiateViewControllerWithIdentifier:@"middleViewController"] + self = [super initWithCenterViewController:[storyboard instantiateViewControllerWithIdentifier:@"firstViewController"] leftViewController:[storyboard instantiateViewControllerWithIdentifier:@"leftViewController"]]; if (self) { - // Add any extra init code here + + // Put your settings for ViewDeck here + self.openSlideAnimationDuration = 0.3f; // In seconds + self.closeSlideAnimationDuration = 0.3f; } return self; } - @end diff --git a/ViewDeckStoryboardExample/MenuViewController.h b/ViewDeckStoryboardExample/MenuViewController.h new file mode 100644 index 0000000..fde8ae6 --- /dev/null +++ b/ViewDeckStoryboardExample/MenuViewController.h @@ -0,0 +1,8 @@ +#import + +@interface MenuViewController : UITableViewController + +@property (nonatomic, retain) UIViewController *firstview; + + +@end diff --git a/ViewDeckStoryboardExample/MenuViewController.m b/ViewDeckStoryboardExample/MenuViewController.m new file mode 100644 index 0000000..50dc36f --- /dev/null +++ b/ViewDeckStoryboardExample/MenuViewController.m @@ -0,0 +1,65 @@ +#import "MenuViewController.h" +#import + +@interface MenuViewController () + +@end + + +@implementation MenuViewController + +@synthesize firstview; + +- (id)initWithStyle:(UITableViewStyle)style +{ + self = [super initWithStyle:style]; + if (self) { + // Custom initialization + } + return self; +} + +- (void)viewDidLoad +{ + [super viewDidLoad]; +} + +- (void)didReceiveMemoryWarning +{ + [super didReceiveMemoryWarning]; + // Dispose of any resources that can be recreated. +} + +#pragma mark - Table view delegate + +- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath +{ + /*Change view*/ + switch (indexPath.row) { + case 0: + { + // This way we save the state of the navigation controller + if (!self.firstview) { + self.firstview = (UINavigationController*) [self.storyboard instantiateViewControllerWithIdentifier:@"firstViewController"]; + } + + [self.viewDeckController setCenterController:self.firstview]; + [self.viewDeckController closeLeftViewAnimated:YES]; + + break; + } + case 1: + { + // Add a closing bounce effect + // Will create a new instance of the navigation controller each time it is called + [self.viewDeckController closeLeftViewBouncing:^(IIViewDeckController *controller) { + controller.closeSlideAnimationDuration = 0.1f; + controller.openSlideAnimationDuration = 0.2f; + [controller setCenterController:[self.storyboard instantiateViewControllerWithIdentifier:@"secondViewController"]]; + }]; + break; + } + } +} + +@end diff --git a/ViewDeckStoryboardExample/MiddleViewController.h b/ViewDeckStoryboardExample/MiddleViewController.h deleted file mode 100644 index 5a1e8a0..0000000 --- a/ViewDeckStoryboardExample/MiddleViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -/* - * ---------------------------------------------------------------------------- - * "THE BOOZE-WARE LICENSE" - * Simon Rice wrote this file. As long as you retain this notice you - * can do whatever you want with this stuff. If we meet some day, and you think - * this stuff is worth it, you can buy me an alcoholic beverage in return. - * - * Simon Rice - * ---------------------------------------------------------------------------- - */ - -#import - -@interface MiddleViewController : UIViewController - -@end diff --git a/ViewDeckStoryboardExample/MiddleViewController.m b/ViewDeckStoryboardExample/MiddleViewController.m deleted file mode 100644 index 6582d34..0000000 --- a/ViewDeckStoryboardExample/MiddleViewController.m +++ /dev/null @@ -1,37 +0,0 @@ -/* - * ---------------------------------------------------------------------------- - * "THE BOOZE-WARE LICENSE" - * Simon Rice wrote this file. As long as you retain this notice you - * can do whatever you want with this stuff. If we meet some day, and you think - * this stuff is worth it, you can buy me an alcoholic beverage in return. - * - * Simon Rice - * ---------------------------------------------------------------------------- - */ - -#import "MiddleViewController.h" -#import - -@interface MiddleViewController () - -@end - -@implementation MiddleViewController - -- (void)viewDidLoad -{ - [super viewDidLoad]; - // Do any additional setup after loading the view. -} - -- (void)didReceiveMemoryWarning -{ - [super didReceiveMemoryWarning]; - // Dispose of any resources that can be recreated. -} - -- (IBAction)revealSidebar:(UIBarButtonItem *)sender { - [self.viewDeckController toggleLeftViewAnimated:YES]; -} - -@end diff --git a/ViewDeckStoryboardExample/SecondViewController.h b/ViewDeckStoryboardExample/SecondViewController.h new file mode 100644 index 0000000..7936a3c --- /dev/null +++ b/ViewDeckStoryboardExample/SecondViewController.h @@ -0,0 +1,5 @@ +#import + +@interface SecondViewController : UIViewController + +@end diff --git a/ViewDeckStoryboardExample/SecondViewController.m b/ViewDeckStoryboardExample/SecondViewController.m new file mode 100644 index 0000000..d665110 --- /dev/null +++ b/ViewDeckStoryboardExample/SecondViewController.m @@ -0,0 +1,41 @@ +#import "SecondViewController.h" +#import + +@interface SecondViewController () + +@end + +@implementation SecondViewController + +- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil +{ + self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]; + if (self) { + // Custom initialization + } + return self; +} + +- (void)viewDidLoad +{ + [super viewDidLoad]; + // Do any additional setup after loading the view. +} + +- (void)didReceiveMemoryWarning +{ + [super didReceiveMemoryWarning]; + // Dispose of any resources that can be recreated. +} +- (void)viewDidAppear:(BOOL)animated +{ + [super viewDidAppear:YES]; + // Do any additional setup after loading the view. +} + +- (IBAction)revealSidebar:(UIBarButtonItem *)sender { + // Open menu + [self.viewDeckController toggleLeftViewAnimated:YES]; +} + +@end diff --git a/ViewDeckStoryboardExample/ViewDeckStoryboardExample-Info.plist b/ViewDeckStoryboardExample/ViewDeckStoryboardExample-Info.plist old mode 100644 new mode 100755 diff --git a/ViewDeckStoryboardExample/ViewDeckStoryboardExample-Prefix.pch b/ViewDeckStoryboardExample/ViewDeckStoryboardExample-Prefix.pch old mode 100644 new mode 100755 diff --git a/ViewDeckStoryboardExample/en.lproj/InfoPlist.strings b/ViewDeckStoryboardExample/en.lproj/InfoPlist.strings old mode 100644 new mode 100755 diff --git a/ViewDeckStoryboardExample/en.lproj/MainStoryboard.storyboard b/ViewDeckStoryboardExample/en.lproj/MainStoryboard.storyboard old mode 100644 new mode 100755 index 64b20ef..bb47899 --- a/ViewDeckStoryboardExample/en.lproj/MainStoryboard.storyboard +++ b/ViewDeckStoryboardExample/en.lproj/MainStoryboard.storyboard @@ -1,13 +1,13 @@ - + - + - + @@ -19,15 +19,15 @@ - + - + - - + - - + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -100,33 +139,89 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + diff --git a/ViewDeckStoryboardExample/main.m b/ViewDeckStoryboardExample/main.m old mode 100644 new mode 100755