diff --git a/PLALaCarteSummaryViewController.h b/PLALaCarteSummaryViewController.h new file mode 100644 index 0000000..4755597 --- /dev/null +++ b/PLALaCarteSummaryViewController.h @@ -0,0 +1,14 @@ +// +// PLALaCarteSummaryViewController.h +// Plate +// +// Created by emileleon on 12/24/13. +// Copyright (c) 2013 Plate SF. All rights reserved. +// + +#import + +@interface PLALaCarteSummaryViewController : UIViewController +- (IBAction)addToBasket:(id)sender; + +@end diff --git a/PLALaCarteSummaryViewController.m b/PLALaCarteSummaryViewController.m new file mode 100644 index 0000000..e1c5afe --- /dev/null +++ b/PLALaCarteSummaryViewController.m @@ -0,0 +1,41 @@ +// +// PLALaCarteSummaryViewController.m +// Plate +// +// Created by emileleon on 12/24/13. +// Copyright (c) 2013 Plate SF. All rights reserved. +// + +#import "PLALaCarteSummaryViewController.h" + +@interface PLALaCarteSummaryViewController () + +@end + +@implementation PLALaCarteSummaryViewController + +- (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 from its nib. +} + +- (void)didReceiveMemoryWarning +{ + [super didReceiveMemoryWarning]; + // Dispose of any resources that can be recreated. +} + +- (IBAction)addToBasket:(id)sender { + [[self navigationController] popToRootViewControllerAnimated:YES]; +} +@end diff --git a/PLALaCarteSummaryViewController.xib b/PLALaCarteSummaryViewController.xib new file mode 100644 index 0000000..e98402f --- /dev/null +++ b/PLALaCarteSummaryViewController.xib @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/PLALaCarteViewController.h b/PLALaCarteViewController.h new file mode 100644 index 0000000..b96f998 --- /dev/null +++ b/PLALaCarteViewController.h @@ -0,0 +1,15 @@ +// +// PLALaCarteViewController.h +// Plate +// +// Created by emileleon on 12/23/13. +// Copyright (c) 2013 Plate SF. All rights reserved. +// + +#import + +@interface PLALaCarteViewController : UIViewController +@property (weak, nonatomic) IBOutlet UITableView *alaCarteMains; +@property (weak, nonatomic) IBOutlet UITableView *alaCarteSides; + +@end diff --git a/PLALaCarteViewController.m b/PLALaCarteViewController.m new file mode 100644 index 0000000..2ca29d8 --- /dev/null +++ b/PLALaCarteViewController.m @@ -0,0 +1,95 @@ +// +// PLALaCarteViewController.m +// Plate +// +// Created by emileleon on 12/23/13. +// Copyright (c) 2013 Plate SF. All rights reserved. +// + +#import "PLALaCarteViewController.h" +#import "PLALaCarteSummaryViewController.h" + +@interface PLALaCarteViewController () + +@end + +@implementation PLALaCarteViewController + +- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath +{ + UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"UITableViewCell"]; + if (cell == nil) { + cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleSubtitle reuseIdentifier:@"UITableViewCell"]; + } + + cell.layer.borderWidth = 1.0f; + cell.layer.borderColor = [[UIColor blackColor] CGColor]; + cell.layer.masksToBounds = YES; + cell.layer.cornerRadius = 12.0f; + cell.layer.backgroundColor = [[UIColor grayColor] CGColor]; + + if (tableView == [self alaCarteMains]) { + [[cell textLabel] setText:@"A La Carte Main Item"]; + } else if (tableView == [self alaCarteSides]) { + [[cell textLabel] setText:@"A La Carte Side Item"]; + } + + return cell; + +} + +- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section +{ + return 3; +} + +- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView +{ + return 1; +} + + + +- (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 from its nib. + // Setup the bottom toolbar + UIBarButtonItem *flexibleSpaceLeft = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace target:nil action:nil]; + UIBarButtonItem *barButton = [[UIBarButtonItem alloc] initWithTitle:@"Continue" style:UIBarButtonItemStylePlain target:self action:@selector(actionContinue:)]; + [barButton setTitleTextAttributes:@{ + NSFontAttributeName: [UIFont fontWithName:@"Helvetica" size:24.0], + NSForegroundColorAttributeName: [UIColor blackColor] + } forState:UIControlStateNormal]; + + self.toolbarItems = [NSArray arrayWithObjects: flexibleSpaceLeft, barButton, nil]; + + // Display the Continue button + self.navigationController.toolbarHidden = NO; + + // We don't want extra space above tables for scrolling + self.automaticallyAdjustsScrollViewInsets = NO; + self.alaCarteSides.backgroundColor = [UIColor clearColor]; + self.alaCarteMains.backgroundColor = [UIColor clearColor]; +} + +- (void)didReceiveMemoryWarning +{ + [super didReceiveMemoryWarning]; + // Dispose of any resources that can be recreated. +} + +- (IBAction)actionContinue:(id)sender { + [[self navigationController] pushViewController:[[PLALaCarteSummaryViewController alloc]init] animated:YES]; +} + +@end diff --git a/PLALaCarteViewController.xib b/PLALaCarteViewController.xib new file mode 100644 index 0000000..aebdc7b --- /dev/null +++ b/PLALaCarteViewController.xib @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/PLSettingsViewController.h b/PLAccountViewController.h similarity index 75% rename from PLSettingsViewController.h rename to PLAccountViewController.h index 235f3d3..045a2b7 100644 --- a/PLSettingsViewController.h +++ b/PLAccountViewController.h @@ -8,6 +8,6 @@ #import -@interface PLSettingsViewController : UIViewController +@interface PLAccountViewController : UIViewController @end diff --git a/PLSettingsViewController.m b/PLAccountViewController.m similarity index 86% rename from PLSettingsViewController.m rename to PLAccountViewController.m index 952845d..fd95faf 100644 --- a/PLSettingsViewController.m +++ b/PLAccountViewController.m @@ -6,13 +6,13 @@ // Copyright (c) 2013 Plate SF. All rights reserved. // -#import "PLSettingsViewController.h" +#import "PLAccountViewController.h" -@interface PLSettingsViewController () +@interface PLAccountViewController () @end -@implementation PLSettingsViewController +@implementation PLAccountViewController - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { diff --git a/PLAccountViewController.xib b/PLAccountViewController.xib new file mode 100644 index 0000000..95dd2e6 --- /dev/null +++ b/PLAccountViewController.xib @@ -0,0 +1,107 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/PLBaseSettingsViewController.h b/PLBaseAccountViewController.h similarity index 73% rename from PLBaseSettingsViewController.h rename to PLBaseAccountViewController.h index e38fada..a437e25 100644 --- a/PLBaseSettingsViewController.h +++ b/PLBaseAccountViewController.h @@ -8,6 +8,6 @@ #import -@interface PLBaseSettingsViewController : UINavigationController +@interface PLBaseAccountViewController : UINavigationController @end diff --git a/PLBaseSettingsViewController.m b/PLBaseAccountViewController.m similarity index 74% rename from PLBaseSettingsViewController.m rename to PLBaseAccountViewController.m index 2fa54cb..2a3f296 100644 --- a/PLBaseSettingsViewController.m +++ b/PLBaseAccountViewController.m @@ -6,14 +6,14 @@ // Copyright (c) 2013 Plate SF. All rights reserved. // -#import "PLBaseSettingsViewController.h" -#import "PLSettingsViewController.h" +#import "PLBaseAccountViewController.h" +#import "PLAccountViewController.h" -@interface PLBaseSettingsViewController () +@interface PLBaseAccountViewController () @end -@implementation PLBaseSettingsViewController +@implementation PLBaseAccountViewController - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { @@ -21,7 +21,7 @@ - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil if (self) { // Custom initialization UITabBarItem *tbi = [self tabBarItem]; - [tbi setTitle:@"Settings"]; + [tbi setTitle:@"Account"]; [[self view] setBackgroundColor:[UIColor purpleColor]]; } return self; @@ -31,7 +31,7 @@ - (void)viewDidLoad { [super viewDidLoad]; // Do any additional setup after loading the view. - [self pushViewController:[[PLSettingsViewController alloc] init] animated:YES]; + [self pushViewController:[[PLAccountViewController alloc] init] animated:YES]; self.navigationBar.barStyle = UIBarStyleBlackTranslucent; self.navigationBar.tintColor = [UIColor whiteColor]; } diff --git a/PLBasketStore.h b/PLBasketStore.h new file mode 100644 index 0000000..12c1dc8 --- /dev/null +++ b/PLBasketStore.h @@ -0,0 +1,16 @@ +// +// PLBasketStore.h +// Plate +// +// Created by emileleon on 12/23/13. +// Copyright (c) 2013 Plate SF. All rights reserved. +// + +#import + +@interface PLBasketStore : NSObject + ++ (PLBasketStore *)sharedStore; +//- (void)clearBasket; + +@end diff --git a/PLBasketStore.m b/PLBasketStore.m new file mode 100644 index 0000000..b3b91d6 --- /dev/null +++ b/PLBasketStore.m @@ -0,0 +1,27 @@ +// +// PLBasketStore.m +// Plate +// +// Created by emileleon on 12/23/13. +// Copyright (c) 2013 Plate SF. All rights reserved. +// + +#import "PLBasketStore.h" + +@implementation PLBasketStore + ++ (PLBasketStore *)sharedStore +{ + static PLBasketStore *sharedStore = nil; + if (!sharedStore) + sharedStore = [[super allocWithZone:nil] init]; + + return sharedStore; +} + ++ (id)allocWithZone:(struct _NSZone *)zone +{ + return [self sharedStore]; +} + +@end diff --git a/PLOrder.h b/PLOrder.h new file mode 100644 index 0000000..a59f3b9 --- /dev/null +++ b/PLOrder.h @@ -0,0 +1,23 @@ +// +// PLOrder.h +// Plate +// +// Created by emileleon on 12/16/13. +// Copyright (c) 2013 Plate SF. All rights reserved. +// + +#import + +#define CURBSIDE @"curbside"; +#define INSTORE @"instore"; + +@interface PLOrder : NSObject + +@property (nonatomic, strong) NSDate *pickupDate; +@property (nonatomic, strong) NSString *pickupOption; //curbside, instore +@property (nonatomic, strong) NSString *instructions; +@property (nonatomic, strong) NSString *location; +@property (nonatomic, strong) NSArray *orderItems; +@property (nonatomic, strong) NSString *userId; + +@end diff --git a/PLOrder.m b/PLOrder.m new file mode 100644 index 0000000..7640179 --- /dev/null +++ b/PLOrder.m @@ -0,0 +1,13 @@ +// +// PLOrder.m +// Plate +// +// Created by emileleon on 12/16/13. +// Copyright (c) 2013 Plate SF. All rights reserved. +// + +#import "PLOrder.h" + +@implementation PLOrder + +@end diff --git a/PLOrderItem.h b/PLOrderItem.h new file mode 100644 index 0000000..9d668d6 --- /dev/null +++ b/PLOrderItem.h @@ -0,0 +1,24 @@ +// +// PLOrderItem.h +// Plate +// +// Created by emileleon on 12/16/13. +// Copyright (c) 2013 Plate SF. All rights reserved. +// + +#import + +@interface PLOrderItem : NSObject + +#define ONEMAIN @"onemain" +#define FOURSIDES @"foursides" +#define ADDONS @"addons" +#define ALACARTE @"alacarte" +#define SIZEFIT @"fit" +#define SIZEULTRA @"ultra" + +@property (nonatomic, strong) NSNumber *quantity; +@property (nonatomic, strong) NSArray *itemIds; +@property (nonatomic, strong) NSString *type; //onemain, addons, foursides, alacarte +@property (nonatomic, strong) NSString *size; //fit, ultra +@end diff --git a/PLOrderItem.m b/PLOrderItem.m new file mode 100644 index 0000000..0502aef --- /dev/null +++ b/PLOrderItem.m @@ -0,0 +1,13 @@ +// +// PLOrderItem.m +// Plate +// +// Created by emileleon on 12/16/13. +// Copyright (c) 2013 Plate SF. All rights reserved. +// + +#import "PLOrderItem.h" + +@implementation PLOrderItem + +@end diff --git a/PLOrderSummaryViewController.h b/PLOrderSummaryViewController.h index 4153408..4f0154e 100644 --- a/PLOrderSummaryViewController.h +++ b/PLOrderSummaryViewController.h @@ -10,5 +10,6 @@ #import "PLBaseOrderViewController.h" @interface PLOrderSummaryViewController : PLBaseOrderViewController +- (IBAction)addToBasket:(id)sender; @end diff --git a/PLOrderSummaryViewController.m b/PLOrderSummaryViewController.m index 163b70c..34134a0 100644 --- a/PLOrderSummaryViewController.m +++ b/PLOrderSummaryViewController.m @@ -7,6 +7,8 @@ // #import "PLOrderSummaryViewController.h" +#import "PLBasketStore.h" +#import "PLStartOrderViewController.h" @interface PLOrderSummaryViewController () @@ -45,4 +47,8 @@ - (void)actionContinue:(id)sender NSLog(@"continue clicked from summary"); } +- (IBAction)addToBasket:(id)sender { + [[self navigationController] popToRootViewControllerAnimated:YES]; +// [[self navigationController] pushViewController:[[PLStartOrderViewController alloc] init] animated:YES]; +} @end diff --git a/PLOrderSummaryViewController.xib b/PLOrderSummaryViewController.xib index 59f096b..92eaa49 100644 --- a/PLOrderSummaryViewController.xib +++ b/PLOrderSummaryViewController.xib @@ -35,6 +35,16 @@ + diff --git a/PLRewardsViewController.xib b/PLRewardsViewController.xib index e1306d7..87d4c0e 100644 --- a/PLRewardsViewController.xib +++ b/PLRewardsViewController.xib @@ -13,6 +13,20 @@ + + + + diff --git a/PLSettingsViewController.xib b/PLSettingsViewController.xib deleted file mode 100644 index ca6d3a8..0000000 --- a/PLSettingsViewController.xib +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/PLStartOrderViewController.h b/PLStartOrderViewController.h index 1c52882..5c4a673 100644 --- a/PLStartOrderViewController.h +++ b/PLStartOrderViewController.h @@ -8,6 +8,7 @@ #import #import "PLBaseOrderViewController.h" +#import "PLALaCarteViewController.h" @class PLSelectPlateSizeViewController; @@ -15,6 +16,11 @@ { NSArray *startingOptions; } +@property (weak, nonatomic) IBOutlet UITableView *basketTableView; +@property (weak, nonatomic) IBOutlet UITableView *orderTypeTableView; +- (IBAction)checkout:(id)sender; + @property (nonatomic, strong) PLSelectPlateSizeViewController *selectSizeController; +@property (nonatomic, strong) PLALaCarteViewController *alaCarteViewController; @end diff --git a/PLStartOrderViewController.m b/PLStartOrderViewController.m index d8dd68f..9c1b002 100644 --- a/PLStartOrderViewController.m +++ b/PLStartOrderViewController.m @@ -8,6 +8,7 @@ #import "PLStartOrderViewController.h" #import "PLSelectPlateSizeViewController.h" +#import "PLALaCarteViewController.h" @interface PLStartOrderViewController () @@ -18,20 +19,27 @@ @implementation PLStartOrderViewController - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { + if (tableView == [self orderTypeTableView]) { - if ([indexPath row] == 0) { - [[self navigationController] pushViewController:[self selectSizeController] animated:YES]; - } else if ([indexPath row] == 1) { - - } else { - + if ([indexPath row] == 0) { + [[self navigationController] pushViewController:[self selectSizeController] animated:YES]; + } else if ([indexPath row] == 1) { + [[self navigationController] pushViewController:[self alaCarteViewController] animated:YES]; + } else { + + } + } else { // basket + } - } - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return [startingOptions count]; + if (tableView == [self orderTypeTableView]) { + return [startingOptions count]; + } else { + return 3; + } } - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath @@ -39,7 +47,6 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"UITableViewCell"]; if (cell == nil) { cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleSubtitle reuseIdentifier:@"UITableViewCell"]; - [cell setAccessoryType:UITableViewCellAccessoryDisclosureIndicator]; } cell.layer.borderWidth = 1.0f; @@ -48,7 +55,21 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N cell.layer.cornerRadius = 12.0f; cell.layer.backgroundColor = [[UIColor grayColor] CGColor]; - [[cell textLabel] setText:[startingOptions objectAtIndex:[indexPath row]]]; + if (tableView == [self orderTypeTableView]) { + [[cell textLabel] setText:[startingOptions objectAtIndex:[indexPath row]]]; + } else { + + UIFont *basketFont = [ UIFont fontWithName: @"Arial" size: 12.0 ]; + cell.textLabel.font = basketFont; + + if ([indexPath row] == 0) { + [[cell textLabel] setText:@"Basket is currently empty"]; + } else if ([indexPath row] == 1){ + [[cell textLabel] setText:@"Items ordered will appear here"]; + } else { + [[cell textLabel] setText:@"and can be removed from basket here"]; + } + } return cell; @@ -78,6 +99,12 @@ - (void)viewDidLoad PLSelectPlateSizeViewController *plpsvc = [[PLSelectPlateSizeViewController alloc]init]; plpsvc.hidesBottomBarWhenPushed = YES; [self setSelectSizeController:plpsvc]; + + PLALaCarteViewController *plalacartevc = [[PLALaCarteViewController alloc]init]; + plalacartevc.hidesBottomBarWhenPushed = YES; + [self setAlaCarteViewController:plalacartevc]; + + self.basketTableView.backgroundColor = [UIColor clearColor]; } - (void)viewDidAppear:(BOOL)animated @@ -91,4 +118,6 @@ - (void)didReceiveMemoryWarning // Dispose of any resources that can be recreated. } +- (IBAction)checkout:(id)sender { +} @end diff --git a/PLStartOrderViewController.xib b/PLStartOrderViewController.xib index 1146e9f..d8ffc57 100644 --- a/PLStartOrderViewController.xib +++ b/PLStartOrderViewController.xib @@ -6,6 +6,8 @@ + + @@ -15,14 +17,14 @@ - + @@ -30,6 +32,33 @@ + + + + + + + + + + + + diff --git a/Plate.xcodeproj/project.pbxproj b/Plate.xcodeproj/project.pbxproj index 94427fe..70e597e 100644 --- a/Plate.xcodeproj/project.pbxproj +++ b/Plate.xcodeproj/project.pbxproj @@ -11,8 +11,8 @@ 0A0D16941850FC9E0057F538 /* PLMenuViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 0A0D16921850FC9E0057F538 /* PLMenuViewController.xib */; }; 0A0D16981850FE750057F538 /* PLRewardsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0A0D16961850FE750057F538 /* PLRewardsViewController.m */; }; 0A0D16991850FE750057F538 /* PLRewardsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 0A0D16971850FE750057F538 /* PLRewardsViewController.xib */; }; - 0A0D169D185102140057F538 /* PLSettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0A0D169B185102140057F538 /* PLSettingsViewController.m */; }; - 0A0D169E185102140057F538 /* PLSettingsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 0A0D169C185102140057F538 /* PLSettingsViewController.xib */; }; + 0A0D169D185102140057F538 /* PLAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0A0D169B185102140057F538 /* PLAccountViewController.m */; }; + 0A0D169E185102140057F538 /* PLAccountViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 0A0D169C185102140057F538 /* PLAccountViewController.xib */; }; 0A0D16A3185105C10057F538 /* PLOrderNavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0A0D16A2185105C10057F538 /* PLOrderNavigationController.m */; }; 0A0D16A518510F790057F538 /* bg-tomatoes.png in Resources */ = {isa = PBXBuildFile; fileRef = 0A0D16A418510F790057F538 /* bg-tomatoes.png */; }; 0A0D16A71851114F0057F538 /* bg-grey.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 0A0D16A61851114F0057F538 /* bg-grey.jpg */; }; @@ -24,7 +24,12 @@ 0A495EF01852824800C14B03 /* bg-salmon.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 0A495EEE1852824800C14B03 /* bg-salmon.jpg */; }; 0A495EF31852905200C14B03 /* PLBaseMenuViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0A495EF21852905200C14B03 /* PLBaseMenuViewController.m */; }; 0A495EF61852925D00C14B03 /* PLBaseRewardsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0A495EF51852925D00C14B03 /* PLBaseRewardsViewController.m */; }; - 0A495EF91852931300C14B03 /* PLBaseSettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0A495EF81852931300C14B03 /* PLBaseSettingsViewController.m */; }; + 0A495EF91852931300C14B03 /* PLBaseAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0A495EF81852931300C14B03 /* PLBaseAccountViewController.m */; }; + 0A5FC5271868CE5600F69BA5 /* PLBasketStore.m in Sources */ = {isa = PBXBuildFile; fileRef = 0A5FC5261868CE5600F69BA5 /* PLBasketStore.m */; }; + 0A5FC52C1868D06B00F69BA5 /* PLALaCarteViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0A5FC52A1868D06B00F69BA5 /* PLALaCarteViewController.m */; }; + 0A5FC52D1868D06B00F69BA5 /* PLALaCarteViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 0A5FC52B1868D06B00F69BA5 /* PLALaCarteViewController.xib */; }; + 0A5FC531186A2EFB00F69BA5 /* PLALaCarteSummaryViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0A5FC52F186A2EFB00F69BA5 /* PLALaCarteSummaryViewController.m */; }; + 0A5FC532186A2EFB00F69BA5 /* PLALaCarteSummaryViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 0A5FC530186A2EFB00F69BA5 /* PLALaCarteSummaryViewController.xib */; }; 0A9D7DCE18470F5F00BAE38D /* PLSelectPlateSizeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0A9D7DCC18470F5F00BAE38D /* PLSelectPlateSizeViewController.m */; }; 0A9D7DCF18470F5F00BAE38D /* PLSelectPlateSizeViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 0A9D7DCD18470F5F00BAE38D /* PLSelectPlateSizeViewController.xib */; }; 0A9D7DDA184A93C800BAE38D /* PLSelectMainsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0A9D7DD8184A93C800BAE38D /* PLSelectMainsViewController.m */; }; @@ -52,6 +57,8 @@ 0ABBE40F1843D0390031D3E2 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0ABBE3F71843D0390031D3E2 /* UIKit.framework */; }; 0ABBE4171843D0390031D3E2 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 0ABBE4151843D0390031D3E2 /* InfoPlist.strings */; }; 0ABBE4191843D0390031D3E2 /* PlateTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0ABBE4181843D0390031D3E2 /* PlateTests.m */; }; + 0AC187F3185F872D00A0DD9F /* PLOrderItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 0AC187F2185F872D00A0DD9F /* PLOrderItem.m */; }; + 0AC187F6185F8D4D00A0DD9F /* PLOrder.m in Sources */ = {isa = PBXBuildFile; fileRef = 0AC187F5185F8D4D00A0DD9F /* PLOrder.m */; }; 0ADC532D185671A700258E1E /* PLMenuItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 0ADC532C185671A700258E1E /* PLMenuItem.m */; }; 0ADC53301856738400258E1E /* PLPlateStore.m in Sources */ = {isa = PBXBuildFile; fileRef = 0ADC532F1856738400258E1E /* PLPlateStore.m */; }; 0ADC53331856808F00258E1E /* PLConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 0ADC53321856808F00258E1E /* PLConnection.m */; }; @@ -75,9 +82,9 @@ 0A0D16951850FE750057F538 /* PLRewardsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PLRewardsViewController.h; sourceTree = ""; }; 0A0D16961850FE750057F538 /* PLRewardsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PLRewardsViewController.m; sourceTree = ""; }; 0A0D16971850FE750057F538 /* PLRewardsViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PLRewardsViewController.xib; sourceTree = ""; }; - 0A0D169A185102140057F538 /* PLSettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PLSettingsViewController.h; sourceTree = ""; }; - 0A0D169B185102140057F538 /* PLSettingsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PLSettingsViewController.m; sourceTree = ""; }; - 0A0D169C185102140057F538 /* PLSettingsViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PLSettingsViewController.xib; sourceTree = ""; }; + 0A0D169A185102140057F538 /* PLAccountViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PLAccountViewController.h; sourceTree = ""; }; + 0A0D169B185102140057F538 /* PLAccountViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PLAccountViewController.m; sourceTree = ""; }; + 0A0D169C185102140057F538 /* PLAccountViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PLAccountViewController.xib; sourceTree = ""; }; 0A0D16A1185105C10057F538 /* PLOrderNavigationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PLOrderNavigationController.h; sourceTree = ""; }; 0A0D16A2185105C10057F538 /* PLOrderNavigationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PLOrderNavigationController.m; sourceTree = ""; }; 0A0D16A418510F790057F538 /* bg-tomatoes.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "bg-tomatoes.png"; sourceTree = ""; }; @@ -94,8 +101,16 @@ 0A495EF21852905200C14B03 /* PLBaseMenuViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PLBaseMenuViewController.m; sourceTree = ""; }; 0A495EF41852925D00C14B03 /* PLBaseRewardsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PLBaseRewardsViewController.h; sourceTree = ""; }; 0A495EF51852925D00C14B03 /* PLBaseRewardsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PLBaseRewardsViewController.m; sourceTree = ""; }; - 0A495EF71852931300C14B03 /* PLBaseSettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PLBaseSettingsViewController.h; sourceTree = ""; }; - 0A495EF81852931300C14B03 /* PLBaseSettingsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PLBaseSettingsViewController.m; sourceTree = ""; }; + 0A495EF71852931300C14B03 /* PLBaseAccountViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PLBaseAccountViewController.h; sourceTree = ""; }; + 0A495EF81852931300C14B03 /* PLBaseAccountViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PLBaseAccountViewController.m; sourceTree = ""; }; + 0A5FC5251868CE5600F69BA5 /* PLBasketStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PLBasketStore.h; sourceTree = ""; }; + 0A5FC5261868CE5600F69BA5 /* PLBasketStore.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PLBasketStore.m; sourceTree = ""; }; + 0A5FC5291868D06B00F69BA5 /* PLALaCarteViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PLALaCarteViewController.h; sourceTree = ""; }; + 0A5FC52A1868D06B00F69BA5 /* PLALaCarteViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PLALaCarteViewController.m; sourceTree = ""; }; + 0A5FC52B1868D06B00F69BA5 /* PLALaCarteViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PLALaCarteViewController.xib; sourceTree = ""; }; + 0A5FC52E186A2EFB00F69BA5 /* PLALaCarteSummaryViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PLALaCarteSummaryViewController.h; sourceTree = ""; }; + 0A5FC52F186A2EFB00F69BA5 /* PLALaCarteSummaryViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PLALaCarteSummaryViewController.m; sourceTree = ""; }; + 0A5FC530186A2EFB00F69BA5 /* PLALaCarteSummaryViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PLALaCarteSummaryViewController.xib; sourceTree = ""; }; 0A9D7DCB18470F5E00BAE38D /* PLSelectPlateSizeViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PLSelectPlateSizeViewController.h; sourceTree = ""; }; 0A9D7DCC18470F5F00BAE38D /* PLSelectPlateSizeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PLSelectPlateSizeViewController.m; sourceTree = ""; }; 0A9D7DCD18470F5F00BAE38D /* PLSelectPlateSizeViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PLSelectPlateSizeViewController.xib; sourceTree = ""; }; @@ -135,6 +150,10 @@ 0ABBE4141843D0390031D3E2 /* PlateTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "PlateTests-Info.plist"; sourceTree = ""; }; 0ABBE4161843D0390031D3E2 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; 0ABBE4181843D0390031D3E2 /* PlateTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PlateTests.m; sourceTree = ""; }; + 0AC187F1185F872D00A0DD9F /* PLOrderItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PLOrderItem.h; sourceTree = ""; }; + 0AC187F2185F872D00A0DD9F /* PLOrderItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PLOrderItem.m; sourceTree = ""; }; + 0AC187F4185F8D4D00A0DD9F /* PLOrder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PLOrder.h; sourceTree = ""; }; + 0AC187F5185F8D4D00A0DD9F /* PLOrder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PLOrder.m; sourceTree = ""; }; 0ADC532B185671A700258E1E /* PLMenuItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PLMenuItem.h; sourceTree = ""; }; 0ADC532C185671A700258E1E /* PLMenuItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PLMenuItem.m; sourceTree = ""; }; 0ADC532E1856738400258E1E /* PLPlateStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PLPlateStore.h; sourceTree = ""; }; @@ -175,11 +194,11 @@ 0A0D169F185102890057F538 /* Settings */ = { isa = PBXGroup; children = ( - 0A495EF71852931300C14B03 /* PLBaseSettingsViewController.h */, - 0A495EF81852931300C14B03 /* PLBaseSettingsViewController.m */, - 0A0D169A185102140057F538 /* PLSettingsViewController.h */, - 0A0D169B185102140057F538 /* PLSettingsViewController.m */, - 0A0D169C185102140057F538 /* PLSettingsViewController.xib */, + 0A495EF71852931300C14B03 /* PLBaseAccountViewController.h */, + 0A495EF81852931300C14B03 /* PLBaseAccountViewController.m */, + 0A0D169A185102140057F538 /* PLAccountViewController.h */, + 0A0D169B185102140057F538 /* PLAccountViewController.m */, + 0A0D169C185102140057F538 /* PLAccountViewController.xib */, ); name = Settings; sourceTree = ""; @@ -207,6 +226,19 @@ name = assets; sourceTree = ""; }; + 0A5FC5281868D01C00F69BA5 /* A La Carte */ = { + isa = PBXGroup; + children = ( + 0A5FC5291868D06B00F69BA5 /* PLALaCarteViewController.h */, + 0A5FC52A1868D06B00F69BA5 /* PLALaCarteViewController.m */, + 0A5FC52B1868D06B00F69BA5 /* PLALaCarteViewController.xib */, + 0A5FC52E186A2EFB00F69BA5 /* PLALaCarteSummaryViewController.h */, + 0A5FC52F186A2EFB00F69BA5 /* PLALaCarteSummaryViewController.m */, + 0A5FC530186A2EFB00F69BA5 /* PLALaCarteSummaryViewController.xib */, + ); + name = "A La Carte"; + sourceTree = ""; + }; 0A9D7DD018470F8C00BAE38D /* Ordering */ = { isa = PBXGroup; children = ( @@ -273,6 +305,9 @@ 0ABBE3E71843D0390031D3E2 = { isa = PBXGroup; children = ( + 0A5FC5281868D01C00F69BA5 /* A La Carte */, + 0AC187FA185F934100A0DD9F /* Shopping Cart */, + 0AC187F0185F871100A0DD9F /* Models */, 0ADC533518579C6300258E1E /* PLMenu.h */, 0ADC533618579C6300258E1E /* PLMenu.m */, 0ADC533418568E3600258E1E /* JSONSerializable.h */, @@ -358,6 +393,26 @@ name = "Supporting Files"; sourceTree = ""; }; + 0AC187F0185F871100A0DD9F /* Models */ = { + isa = PBXGroup; + children = ( + 0AC187F1185F872D00A0DD9F /* PLOrderItem.h */, + 0AC187F2185F872D00A0DD9F /* PLOrderItem.m */, + 0AC187F4185F8D4D00A0DD9F /* PLOrder.h */, + 0AC187F5185F8D4D00A0DD9F /* PLOrder.m */, + ); + name = Models; + sourceTree = ""; + }; + 0AC187FA185F934100A0DD9F /* Shopping Cart */ = { + isa = PBXGroup; + children = ( + 0A5FC5251868CE5600F69BA5 /* PLBasketStore.h */, + 0A5FC5261868CE5600F69BA5 /* PLBasketStore.m */, + ); + name = "Shopping Cart"; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -406,6 +461,9 @@ LastUpgradeCheck = 0500; ORGANIZATIONNAME = "Plate SF"; TargetAttributes = { + 0ABBE3EF1843D0390031D3E2 = { + DevelopmentTeam = 8AL33R6B84; + }; 0ABBE40A1843D0390031D3E2 = { TestTargetID = 0ABBE3EF1843D0390031D3E2; }; @@ -435,10 +493,11 @@ buildActionMask = 2147483647; files = ( 0ABBE3FE1843D0390031D3E2 /* InfoPlist.strings in Resources */, + 0A5FC52D1868D06B00F69BA5 /* PLALaCarteViewController.xib in Resources */, 0A9D7DDB184A93C800BAE38D /* PLSelectMainsViewController.xib in Resources */, 0A9D7E07184D602500BAE38D /* README.md in Resources */, 0A495EF01852824800C14B03 /* bg-salmon.jpg in Resources */, - 0A0D169E185102140057F538 /* PLSettingsViewController.xib in Resources */, + 0A0D169E185102140057F538 /* PLAccountViewController.xib in Resources */, 0A9D7DE8184C5C6700BAE38D /* PlateStoryboard.storyboard in Resources */, 0A0D16AD185131680057F538 /* PLBaseOrderViewController.xib in Resources */, 0A0D16A518510F790057F538 /* bg-tomatoes.png in Resources */, @@ -448,6 +507,7 @@ 0A9D7DCF18470F5F00BAE38D /* PLSelectPlateSizeViewController.xib in Resources */, 0A318C64184532250023FFF5 /* PLStartOrderViewController.xib in Resources */, 0ABBE4061843D0390031D3E2 /* Images.xcassets in Resources */, + 0A5FC532186A2EFB00F69BA5 /* PLALaCarteSummaryViewController.xib in Resources */, 0A0D16991850FE750057F538 /* PLRewardsViewController.xib in Resources */, 0A0D16941850FC9E0057F538 /* PLMenuViewController.xib in Resources */, 0A9D7DF4184D19C400BAE38D /* PLOrderSummaryViewController.xib in Resources */, @@ -471,7 +531,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 0A495EF91852931300C14B03 /* PLBaseSettingsViewController.m in Sources */, + 0A495EF91852931300C14B03 /* PLBaseAccountViewController.m in Sources */, 0A495EF31852905200C14B03 /* PLBaseMenuViewController.m in Sources */, 0A0D16A3185105C10057F538 /* PLOrderNavigationController.m in Sources */, 0ADC532D185671A700258E1E /* PLMenuItem.m in Sources */, @@ -483,14 +543,19 @@ 0A318C63184532250023FFF5 /* PLStartOrderViewController.m in Sources */, 0A9D7DDA184A93C800BAE38D /* PLSelectMainsViewController.m in Sources */, 0A0D16981850FE750057F538 /* PLRewardsViewController.m in Sources */, + 0AC187F6185F8D4D00A0DD9F /* PLOrder.m in Sources */, 0ADC533718579C6300258E1E /* PLMenu.m in Sources */, - 0A0D169D185102140057F538 /* PLSettingsViewController.m in Sources */, + 0A0D169D185102140057F538 /* PLAccountViewController.m in Sources */, + 0A5FC531186A2EFB00F69BA5 /* PLALaCarteSummaryViewController.m in Sources */, 0ABBE4001843D0390031D3E2 /* main.m in Sources */, 0A9D7DEC184C62CA00BAE38D /* PLSelectSidesViewController.m in Sources */, 0A0D16AC185131680057F538 /* PLBaseOrderViewController.m in Sources */, 0A9D7DF3184D19C400BAE38D /* PLOrderSummaryViewController.m in Sources */, 0A9D7DCE18470F5F00BAE38D /* PLSelectPlateSizeViewController.m in Sources */, + 0A5FC5271868CE5600F69BA5 /* PLBasketStore.m in Sources */, + 0A5FC52C1868D06B00F69BA5 /* PLALaCarteViewController.m in Sources */, 0A495EF61852925D00C14B03 /* PLBaseRewardsViewController.m in Sources */, + 0AC187F3185F872D00A0DD9F /* PLOrderItem.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -549,7 +614,7 @@ CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; COPY_PHASE_STRIP = NO; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; @@ -612,6 +677,7 @@ ARCHS = "$(ARCHS_STANDARD)"; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; + CODE_SIGN_IDENTITY = "iPhone Developer"; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Plate/Plate-Prefix.pch"; INFOPLIST_FILE = "Plate/Plate-Info.plist"; @@ -621,7 +687,7 @@ "/Users/emileleon/Documents/workspace/ios/Plate/TestFlightSDK2.0.2\\ (1)", ); PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE = "666BC26F-1E3E-4862-A2D0-85539899FECD"; + PROVISIONING_PROFILE = ""; WRAPPER_EXTENSION = app; }; name = Debug; @@ -632,6 +698,8 @@ ARCHS = "$(ARCHS_STANDARD)"; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; + CODE_SIGN_IDENTITY = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Plate/Plate-Prefix.pch"; INFOPLIST_FILE = "Plate/Plate-Info.plist"; @@ -641,7 +709,7 @@ "/Users/emileleon/Documents/workspace/ios/Plate/TestFlightSDK2.0.2\\ (1)", ); PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE = "EB45C706-2056-46FA-AE27-42CEA3E5336C"; + PROVISIONING_PROFILE = "65C72D6A-D562-48E3-9167-117F32B40E7E"; WRAPPER_EXTENSION = app; }; name = Release; diff --git a/Plate.xcodeproj/xcuserdata/emileleon.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Plate.xcodeproj/xcuserdata/emileleon.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 05fa6f1..ab79bcd 100644 --- a/Plate.xcodeproj/xcuserdata/emileleon.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/Plate.xcodeproj/xcuserdata/emileleon.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -467,5 +467,37 @@ landmarkType = "5"> + + + + + + + + diff --git a/Plate/PLAppDelegate.m b/Plate/PLAppDelegate.m index 6725711..5d3427d 100644 --- a/Plate/PLAppDelegate.m +++ b/Plate/PLAppDelegate.m @@ -9,7 +9,7 @@ #import "PLAppDelegate.h" #import "PLOrderNavigationController.h" #import "PLBaseRewardsViewController.h" -#import "PLBaseSettingsViewController.h" +#import "PLBaseAccountViewController.h" #import "PLBaseMenuViewController.h" #import "TestFlight.h" @@ -26,7 +26,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:( PLOrderNavigationController *plhvc = [[PLOrderNavigationController alloc]initWithNibName:@"PLOrderNavigationController" bundle:nil]; PLBaseMenuViewController *plmvc = [[PLBaseMenuViewController alloc]init]; PLBaseRewardsViewController *plrvc = [[PLBaseRewardsViewController alloc]init]; - PLBaseSettingsViewController *plsvc = [[PLBaseSettingsViewController alloc]init]; + PLBaseAccountViewController *plsvc = [[PLBaseAccountViewController alloc]init]; UITabBarController *tabBarController = [[UITabBarController alloc]init];