From da0f143b7c254fdf7b8a0e70de724710a38cec21 Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 14 Aug 2015 21:19:22 -0400 Subject: [PATCH 1/4] could not finish --- OptionSelector.xcodeproj/project.pbxproj | 26 +++-- OptionSelector/Base.lproj/Main.storyboard | 85 ++++++++++++--- OptionSelector/CQCategory.h | 21 ++++ OptionSelector/CQCategory.m | 66 ++++++++++++ .../CQCategoryTableViewController.h | 13 +++ .../CQCategoryTableViewController.m | 79 ++++++++++++++ OptionSelector/DetailTableViewController.h | 15 +++ OptionSelector/DetailTableViewController.m | 101 ++++++++++++++++++ OptionSelector/ViewController.h | 15 --- OptionSelector/ViewController.m | 27 ----- 10 files changed, 385 insertions(+), 63 deletions(-) create mode 100644 OptionSelector/CQCategory.h create mode 100644 OptionSelector/CQCategory.m create mode 100644 OptionSelector/CQCategoryTableViewController.h create mode 100644 OptionSelector/CQCategoryTableViewController.m create mode 100644 OptionSelector/DetailTableViewController.h create mode 100644 OptionSelector/DetailTableViewController.m delete mode 100644 OptionSelector/ViewController.h delete mode 100644 OptionSelector/ViewController.m diff --git a/OptionSelector.xcodeproj/project.pbxproj b/OptionSelector.xcodeproj/project.pbxproj index 1788504..5142007 100644 --- a/OptionSelector.xcodeproj/project.pbxproj +++ b/OptionSelector.xcodeproj/project.pbxproj @@ -9,11 +9,13 @@ /* Begin PBXBuildFile section */ 8DECE7921B78082B0064D760 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 8DECE7911B78082B0064D760 /* main.m */; }; 8DECE7951B78082B0064D760 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 8DECE7941B78082B0064D760 /* AppDelegate.m */; }; - 8DECE7981B78082B0064D760 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8DECE7971B78082B0064D760 /* ViewController.m */; }; 8DECE79B1B78082B0064D760 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8DECE7991B78082B0064D760 /* Main.storyboard */; }; 8DECE79D1B78082B0064D760 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8DECE79C1B78082B0064D760 /* Images.xcassets */; }; 8DECE7A01B78082B0064D760 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8DECE79E1B78082B0064D760 /* LaunchScreen.xib */; }; 8DECE7AC1B78082B0064D760 /* OptionSelectorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8DECE7AB1B78082B0064D760 /* OptionSelectorTests.m */; }; + EBF9A0D71B7AAD0D007A58B1 /* CQCategoryTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = EBF9A0D61B7AAD0D007A58B1 /* CQCategoryTableViewController.m */; }; + EBF9A10C1B7AD5E0007A58B1 /* CQCategory.m in Sources */ = {isa = PBXBuildFile; fileRef = EBF9A10B1B7AD5E0007A58B1 /* CQCategory.m */; }; + EBF9A10F1B7AD953007A58B1 /* DetailTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = EBF9A10E1B7AD953007A58B1 /* DetailTableViewController.m */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -32,14 +34,18 @@ 8DECE7911B78082B0064D760 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; 8DECE7931B78082B0064D760 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; 8DECE7941B78082B0064D760 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; - 8DECE7961B78082B0064D760 /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = ""; }; - 8DECE7971B78082B0064D760 /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = ""; }; 8DECE79A1B78082B0064D760 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 8DECE79C1B78082B0064D760 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; 8DECE79F1B78082B0064D760 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = ""; }; 8DECE7A51B78082B0064D760 /* OptionSelectorTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = OptionSelectorTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 8DECE7AA1B78082B0064D760 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 8DECE7AB1B78082B0064D760 /* OptionSelectorTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OptionSelectorTests.m; sourceTree = ""; }; + EBF9A0D51B7AAD0D007A58B1 /* CQCategoryTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CQCategoryTableViewController.h; sourceTree = ""; }; + EBF9A0D61B7AAD0D007A58B1 /* CQCategoryTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CQCategoryTableViewController.m; sourceTree = ""; }; + EBF9A10A1B7AD5E0007A58B1 /* CQCategory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CQCategory.h; sourceTree = ""; }; + EBF9A10B1B7AD5E0007A58B1 /* CQCategory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CQCategory.m; sourceTree = ""; }; + EBF9A10D1B7AD953007A58B1 /* DetailTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DetailTableViewController.h; sourceTree = ""; }; + EBF9A10E1B7AD953007A58B1 /* DetailTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DetailTableViewController.m; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -83,9 +89,13 @@ children = ( 8DECE7931B78082B0064D760 /* AppDelegate.h */, 8DECE7941B78082B0064D760 /* AppDelegate.m */, - 8DECE7961B78082B0064D760 /* ViewController.h */, - 8DECE7971B78082B0064D760 /* ViewController.m */, 8DECE7991B78082B0064D760 /* Main.storyboard */, + EBF9A0D51B7AAD0D007A58B1 /* CQCategoryTableViewController.h */, + EBF9A0D61B7AAD0D007A58B1 /* CQCategoryTableViewController.m */, + EBF9A10A1B7AD5E0007A58B1 /* CQCategory.h */, + EBF9A10B1B7AD5E0007A58B1 /* CQCategory.m */, + EBF9A10D1B7AD953007A58B1 /* DetailTableViewController.h */, + EBF9A10E1B7AD953007A58B1 /* DetailTableViewController.m */, 8DECE79C1B78082B0064D760 /* Images.xcassets */, 8DECE79E1B78082B0064D760 /* LaunchScreen.xib */, 8DECE78F1B78082B0064D760 /* Supporting Files */, @@ -219,8 +229,10 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 8DECE7981B78082B0064D760 /* ViewController.m in Sources */, + EBF9A10F1B7AD953007A58B1 /* DetailTableViewController.m in Sources */, 8DECE7951B78082B0064D760 /* AppDelegate.m in Sources */, + EBF9A10C1B7AD5E0007A58B1 /* CQCategory.m in Sources */, + EBF9A0D71B7AAD0D007A58B1 /* CQCategoryTableViewController.m in Sources */, 8DECE7921B78082B0064D760 /* main.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -418,6 +430,7 @@ 8DECE7B11B78082B0064D760 /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; 8DECE7B21B78082B0064D760 /* Build configuration list for PBXNativeTarget "OptionSelectorTests" */ = { isa = XCConfigurationList; @@ -426,6 +439,7 @@ 8DECE7B41B78082B0064D760 /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; diff --git a/OptionSelector/Base.lproj/Main.storyboard b/OptionSelector/Base.lproj/Main.storyboard index d912f9d..c2c2925 100644 --- a/OptionSelector/Base.lproj/Main.storyboard +++ b/OptionSelector/Base.lproj/Main.storyboard @@ -1,25 +1,80 @@ - + - + - - + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + diff --git a/OptionSelector/CQCategory.h b/OptionSelector/CQCategory.h new file mode 100644 index 0000000..2f0e6f4 --- /dev/null +++ b/OptionSelector/CQCategory.h @@ -0,0 +1,21 @@ +// +// CQCategory.h +// OptionSelector +// +// Created by Christian Maldonado on 8/11/15. +// Copyright (c) 2015 Mike Kavouras. All rights reserved. +// + +#import + +@interface CQCategory : NSObject + +@property (nonatomic) NSDictionary *options; + +@property (nonatomic) NSString *name; + +@property (nonatomic) NSString *selection; + +-(void)intializeData; + +@end diff --git a/OptionSelector/CQCategory.m b/OptionSelector/CQCategory.m new file mode 100644 index 0000000..82769a6 --- /dev/null +++ b/OptionSelector/CQCategory.m @@ -0,0 +1,66 @@ +// +// CQCategory.m +// OptionSelector +// +// Created by Christian Maldonado on 8/11/15. +// Copyright (c) 2015 Mike Kavouras. All rights reserved. +// + +#import "CQCategory.h" + +@implementation CQCategory + +-(void)intializeData { + + + [self intializeOptions]; + [self intializeName]; + [self intializeSelection]; + +} + + +-(void)intializeSelection{ + +} + + +-(void)intializeName{ + +} + + + +-(void)intializeOptions{ + + NSArray *fender = @[ + @"Stratocaster", + @"Telecaster", + @"Mustang", + @"Jaguar", + @"Jazz Master", + ]; + NSArray *gibson = @[ + @"Explorer", + @"Les Paul", + @"Thunderbird", + @"SG", + ]; + NSArray *ibanez = @[ + @"Iceman", + @"Artstar", + @"Destroyer", + @"Artcore", + ]; + NSArray *turner = @[ + @"Model 1", + @"Model T", + @"Renaissance RN-6h", + @"Renaissance RS-6", + ]; + + + +} + +@end diff --git a/OptionSelector/CQCategoryTableViewController.h b/OptionSelector/CQCategoryTableViewController.h new file mode 100644 index 0000000..0b978f5 --- /dev/null +++ b/OptionSelector/CQCategoryTableViewController.h @@ -0,0 +1,13 @@ +// +// CQCategoryTableViewController.h +// OptionSelector +// +// Created by Christian Maldonado on 8/11/15. +// Copyright (c) 2015 Mike Kavouras. All rights reserved. +// + +#import + +@interface CQCategoryTableViewController : UITableViewController + +@end diff --git a/OptionSelector/CQCategoryTableViewController.m b/OptionSelector/CQCategoryTableViewController.m new file mode 100644 index 0000000..e84a4bd --- /dev/null +++ b/OptionSelector/CQCategoryTableViewController.m @@ -0,0 +1,79 @@ +// +// CQCategoryTableViewController.m +// OptionSelector +// +// Created by Christian Maldonado on 8/11/15. +// Copyright (c) 2015 Mike Kavouras. All rights reserved. +// + +#import "CQCategoryTableViewController.h" +#import "DetailTableViewController.h" +#import "CQCategory.h" + +@interface CQCategoryTableViewController () + +@property (nonatomic) CQCategory *guitar; +@property (nonatomic) NSArray *objects; + + +@end + +@implementation CQCategoryTableViewController + +#pragma mark - life cycle method + + +- (void)viewDidLoad { + [super viewDidLoad]; + + self.guitar = [[CQCategory alloc]init]; + [self.guitar intializeData]; + + self.navigationItem.title = @"Guitars"; + } + + +#pragma mark - Table view data source + +- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { + + + return [self.guitar.options allKeys].count; +} + +- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { + NSArray *keys = [self.guitar.options allKeys]; + NSString *key = [keys objectAtIndex:section]; + NSArray *values = [self.guitar.options objectForKey:key]; + + return values.count; +} + + +- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { + UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"selectorIdentifier" forIndexPath:indexPath]; + + + NSString *selection = [options objectForIndexPath:indexPath]; + + + + return cell; +} + +-(void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender{ + DetailTableViewController *detailView = segue.destinationViewController; + detailView.objects = self.objects; +} + + + + + + + + + + + +@end diff --git a/OptionSelector/DetailTableViewController.h b/OptionSelector/DetailTableViewController.h new file mode 100644 index 0000000..9151bdb --- /dev/null +++ b/OptionSelector/DetailTableViewController.h @@ -0,0 +1,15 @@ +// +// DetailTableViewController.h +// OptionSelector +// +// Created by Christian Maldonado on 8/11/15. +// Copyright (c) 2015 Mike Kavouras. All rights reserved. +// + +#import + +@interface DetailTableViewController : UITableViewController + +@property (nonatomic)NSArray *objects; + +@end diff --git a/OptionSelector/DetailTableViewController.m b/OptionSelector/DetailTableViewController.m new file mode 100644 index 0000000..ebbd7a8 --- /dev/null +++ b/OptionSelector/DetailTableViewController.m @@ -0,0 +1,101 @@ +// +// DetailTableViewController.m +// OptionSelector +// +// Created by Christian Maldonado on 8/11/15. +// Copyright (c) 2015 Mike Kavouras. All rights reserved. +// + +#import "DetailTableViewController.h" +#import "CQCategory.h" + +@interface DetailTableViewController () + +@end + +@implementation DetailTableViewController + +- (void)viewDidLoad { + [super viewDidLoad]; + + // Uncomment the following line to preserve selection between presentations. + // self.clearsSelectionOnViewWillAppear = NO; + + // Uncomment the following line to display an Edit button in the navigation bar for this view controller. + // self.navigationItem.rightBarButtonItem = self.editButtonItem; +} + +- (void)didReceiveMemoryWarning { + [super didReceiveMemoryWarning]; + // Dispose of any resources that can be recreated. +} + +#pragma mark - Table view data source + +- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { +#warning Potentially incomplete method implementation. + // Return the number of sections. + return 0; +} + +- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { +#warning Incomplete method implementation. + // Return the number of rows in the section. + return 0; +} + +/* +- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { + UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:<#@"reuseIdentifier"#> forIndexPath:indexPath]; + + // Configure the cell... + + return cell; +} +*/ + +/* +// Override to support conditional editing of the table view. +- (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath { + // Return NO if you do not want the specified item to be editable. + return YES; +} +*/ + +/* +// Override to support editing the table view. +- (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath { + if (editingStyle == UITableViewCellEditingStyleDelete) { + // Delete the row from the data source + [tableView deleteRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationFade]; + } else if (editingStyle == UITableViewCellEditingStyleInsert) { + // Create a new instance of the appropriate class, insert it into the array, and add a new row to the table view + } +} +*/ + +/* +// Override to support rearranging the table view. +- (void)tableView:(UITableView *)tableView moveRowAtIndexPath:(NSIndexPath *)fromIndexPath toIndexPath:(NSIndexPath *)toIndexPath { +} +*/ + +/* +// Override to support conditional rearranging of the table view. +- (BOOL)tableView:(UITableView *)tableView canMoveRowAtIndexPath:(NSIndexPath *)indexPath { + // Return NO if you do not want the item to be re-orderable. + return YES; +} +*/ + +/* +#pragma mark - Navigation + +// In a storyboard-based application, you will often want to do a little preparation before navigation +- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { + // Get the new view controller using [segue destinationViewController]. + // Pass the selected object to the new view controller. +} +*/ + +@end diff --git a/OptionSelector/ViewController.h b/OptionSelector/ViewController.h deleted file mode 100644 index 6b5159f..0000000 --- a/OptionSelector/ViewController.h +++ /dev/null @@ -1,15 +0,0 @@ -// -// ViewController.h -// OptionSelector -// -// Created by Michael Kavouras on 8/9/15. -// Copyright (c) 2015 Mike Kavouras. All rights reserved. -// - -#import - -@interface ViewController : UIViewController - - -@end - diff --git a/OptionSelector/ViewController.m b/OptionSelector/ViewController.m deleted file mode 100644 index 8c74bbb..0000000 --- a/OptionSelector/ViewController.m +++ /dev/null @@ -1,27 +0,0 @@ -// -// ViewController.m -// OptionSelector -// -// Created by Michael Kavouras on 8/9/15. -// Copyright (c) 2015 Mike Kavouras. All rights reserved. -// - -#import "ViewController.h" - -@interface ViewController () - -@end - -@implementation ViewController - -- (void)viewDidLoad { - [super viewDidLoad]; - // Do any additional setup after loading the view, typically from a nib. -} - -- (void)didReceiveMemoryWarning { - [super didReceiveMemoryWarning]; - // Dispose of any resources that can be recreated. -} - -@end From 91fe36c5a1b187f88d6dcfb607ba0f371c8f052c Mon Sep 17 00:00:00 2001 From: Christian Date: Wed, 30 Sep 2015 12:38:13 -0400 Subject: [PATCH 2/4] update --- OptionSelector.xcodeproj/project.pbxproj | 10 +- OptionSelector/Base.lproj/LaunchScreen.xib | 5 +- OptionSelector/Base.lproj/Main.storyboard | 29 ++++- OptionSelector/CQCategory.h | 5 +- OptionSelector/CQCategory.m | 104 ++++++++-------- .../CQCategoryTableViewController.h | 4 + .../CQCategoryTableViewController.m | 116 +++++++++++++----- OptionSelector/CategoryModel.h | 19 +++ OptionSelector/CategoryModel.m | 86 +++++++++++++ OptionSelector/DetailTableViewController.h | 3 +- OptionSelector/DetailTableViewController.m | 77 ++++++++++-- OptionSelector/FirstTableViewController.h | 17 +++ OptionSelector/FirstTableViewController.m | 74 +++++++++++ OptionSelector/ModelCategory.h | 19 +++ OptionSelector/ModelCategory.m | 86 +++++++++++++ 15 files changed, 547 insertions(+), 107 deletions(-) create mode 100644 OptionSelector/CategoryModel.h create mode 100644 OptionSelector/CategoryModel.m create mode 100644 OptionSelector/FirstTableViewController.h create mode 100644 OptionSelector/FirstTableViewController.m create mode 100644 OptionSelector/ModelCategory.h create mode 100644 OptionSelector/ModelCategory.m diff --git a/OptionSelector.xcodeproj/project.pbxproj b/OptionSelector.xcodeproj/project.pbxproj index 5142007..e81ecc4 100644 --- a/OptionSelector.xcodeproj/project.pbxproj +++ b/OptionSelector.xcodeproj/project.pbxproj @@ -13,6 +13,7 @@ 8DECE79D1B78082B0064D760 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8DECE79C1B78082B0064D760 /* Images.xcassets */; }; 8DECE7A01B78082B0064D760 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8DECE79E1B78082B0064D760 /* LaunchScreen.xib */; }; 8DECE7AC1B78082B0064D760 /* OptionSelectorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8DECE7AB1B78082B0064D760 /* OptionSelectorTests.m */; }; + EBEC5F581BBC361F00186ACB /* ModelCategory.m in Sources */ = {isa = PBXBuildFile; fileRef = EBEC5F571BBC361F00186ACB /* ModelCategory.m */; settings = {ASSET_TAGS = (); }; }; EBF9A0D71B7AAD0D007A58B1 /* CQCategoryTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = EBF9A0D61B7AAD0D007A58B1 /* CQCategoryTableViewController.m */; }; EBF9A10C1B7AD5E0007A58B1 /* CQCategory.m in Sources */ = {isa = PBXBuildFile; fileRef = EBF9A10B1B7AD5E0007A58B1 /* CQCategory.m */; }; EBF9A10F1B7AD953007A58B1 /* DetailTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = EBF9A10E1B7AD953007A58B1 /* DetailTableViewController.m */; }; @@ -40,6 +41,8 @@ 8DECE7A51B78082B0064D760 /* OptionSelectorTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = OptionSelectorTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 8DECE7AA1B78082B0064D760 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 8DECE7AB1B78082B0064D760 /* OptionSelectorTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OptionSelectorTests.m; sourceTree = ""; }; + EBEC5F561BBC361F00186ACB /* ModelCategory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ModelCategory.h; sourceTree = ""; }; + EBEC5F571BBC361F00186ACB /* ModelCategory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ModelCategory.m; sourceTree = ""; }; EBF9A0D51B7AAD0D007A58B1 /* CQCategoryTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CQCategoryTableViewController.h; sourceTree = ""; }; EBF9A0D61B7AAD0D007A58B1 /* CQCategoryTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CQCategoryTableViewController.m; sourceTree = ""; }; EBF9A10A1B7AD5E0007A58B1 /* CQCategory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CQCategory.h; sourceTree = ""; }; @@ -90,10 +93,12 @@ 8DECE7931B78082B0064D760 /* AppDelegate.h */, 8DECE7941B78082B0064D760 /* AppDelegate.m */, 8DECE7991B78082B0064D760 /* Main.storyboard */, - EBF9A0D51B7AAD0D007A58B1 /* CQCategoryTableViewController.h */, - EBF9A0D61B7AAD0D007A58B1 /* CQCategoryTableViewController.m */, EBF9A10A1B7AD5E0007A58B1 /* CQCategory.h */, EBF9A10B1B7AD5E0007A58B1 /* CQCategory.m */, + EBEC5F561BBC361F00186ACB /* ModelCategory.h */, + EBEC5F571BBC361F00186ACB /* ModelCategory.m */, + EBF9A0D51B7AAD0D007A58B1 /* CQCategoryTableViewController.h */, + EBF9A0D61B7AAD0D007A58B1 /* CQCategoryTableViewController.m */, EBF9A10D1B7AD953007A58B1 /* DetailTableViewController.h */, EBF9A10E1B7AD953007A58B1 /* DetailTableViewController.m */, 8DECE79C1B78082B0064D760 /* Images.xcassets */, @@ -230,6 +235,7 @@ buildActionMask = 2147483647; files = ( EBF9A10F1B7AD953007A58B1 /* DetailTableViewController.m in Sources */, + EBEC5F581BBC361F00186ACB /* ModelCategory.m in Sources */, 8DECE7951B78082B0064D760 /* AppDelegate.m in Sources */, EBF9A10C1B7AD5E0007A58B1 /* CQCategory.m in Sources */, EBF9A0D71B7AAD0D007A58B1 /* CQCategoryTableViewController.m in Sources */, diff --git a/OptionSelector/Base.lproj/LaunchScreen.xib b/OptionSelector/Base.lproj/LaunchScreen.xib index 5df6182..ad6ab9f 100644 --- a/OptionSelector/Base.lproj/LaunchScreen.xib +++ b/OptionSelector/Base.lproj/LaunchScreen.xib @@ -1,7 +1,8 @@ - + - + + diff --git a/OptionSelector/Base.lproj/Main.storyboard b/OptionSelector/Base.lproj/Main.storyboard index c2c2925..1ab84b2 100644 --- a/OptionSelector/Base.lproj/Main.storyboard +++ b/OptionSelector/Base.lproj/Main.storyboard @@ -1,7 +1,8 @@ - + - + + @@ -29,10 +30,28 @@ - + + + + + + + @@ -59,9 +78,11 @@ - + + + diff --git a/OptionSelector/CQCategory.h b/OptionSelector/CQCategory.h index 2f0e6f4..1859866 100644 --- a/OptionSelector/CQCategory.h +++ b/OptionSelector/CQCategory.h @@ -10,11 +10,10 @@ @interface CQCategory : NSObject -@property (nonatomic) NSDictionary *options; - +@property (nonatomic) NSArray *options; @property (nonatomic) NSString *name; - @property (nonatomic) NSString *selection; +@property (nonatomic) NSUInteger index; -(void)intializeData; diff --git a/OptionSelector/CQCategory.m b/OptionSelector/CQCategory.m index 82769a6..88aec6d 100644 --- a/OptionSelector/CQCategory.m +++ b/OptionSelector/CQCategory.m @@ -10,57 +10,57 @@ @implementation CQCategory --(void)intializeData { - - - [self intializeOptions]; - [self intializeName]; - [self intializeSelection]; - -} - - --(void)intializeSelection{ - -} - - --(void)intializeName{ - -} - - - --(void)intializeOptions{ - - NSArray *fender = @[ - @"Stratocaster", - @"Telecaster", - @"Mustang", - @"Jaguar", - @"Jazz Master", - ]; - NSArray *gibson = @[ - @"Explorer", - @"Les Paul", - @"Thunderbird", - @"SG", - ]; - NSArray *ibanez = @[ - @"Iceman", - @"Artstar", - @"Destroyer", - @"Artcore", - ]; - NSArray *turner = @[ - @"Model 1", - @"Model T", - @"Renaissance RN-6h", - @"Renaissance RS-6", - ]; - - - -} +//-(void)intializeData { +// +// +// [self intializeOptions]; +// [self intializeName]; +// [self intializeSelection]; +// +//} +// +// +//-(void)intializeSelection{ +// +//} +// +// +//-(void)intializeName{ +// +//} +// +// +// +//-(void)intializeOptions{ +// +// NSArray *fender = @[ +// @"Fender Stratocaster", +// @"Telecaster", +// @"Mustang", +// @"Jaguar", +// @"Jazz Master", +// ]; +// NSArray *gibson = @[ +// @"Gibson Explorer", +// @"Les Paul", +// @"Thunderbird", +// @"SG", +// ]; +// NSArray *ibanez = @[ +// @"Iceman", +// @"Artstar", +// @"Destroyer", +// @"Artcore", +// ]; +// NSArray *turner = @[ +// @"Model 1", +// @"Model T", +// @"Renaissance RN-6h", +// @"Renaissance RS-6", +// ]; +// +// +// +//} @end diff --git a/OptionSelector/CQCategoryTableViewController.h b/OptionSelector/CQCategoryTableViewController.h index 0b978f5..c1c6e0a 100644 --- a/OptionSelector/CQCategoryTableViewController.h +++ b/OptionSelector/CQCategoryTableViewController.h @@ -7,7 +7,11 @@ // #import +#import "CQCategory.h" +#import "ModelCategory.h" @interface CQCategoryTableViewController : UITableViewController +@property (nonatomic) ModelCategory *model; + @end diff --git a/OptionSelector/CQCategoryTableViewController.m b/OptionSelector/CQCategoryTableViewController.m index e84a4bd..66772fb 100644 --- a/OptionSelector/CQCategoryTableViewController.m +++ b/OptionSelector/CQCategoryTableViewController.m @@ -8,72 +8,128 @@ #import "CQCategoryTableViewController.h" #import "DetailTableViewController.h" -#import "CQCategory.h" -@interface CQCategoryTableViewController () - -@property (nonatomic) CQCategory *guitar; -@property (nonatomic) NSArray *objects; +@interface CQCategoryTableViewController () @end @implementation CQCategoryTableViewController -#pragma mark - life cycle method - - (void)viewDidLoad { [super viewDidLoad]; - self.guitar = [[CQCategory alloc]init]; - [self.guitar intializeData]; + self.model = [ModelCategory sharedInstance]; + [self.model initializeModel]; - self.navigationItem.title = @"Guitars"; - } +} + +- (void)viewWillAppear:(BOOL)animated { + [super viewWillAppear:animated]; + + [self.tableView reloadData]; +} + +- (void)didReceiveMemoryWarning { + [super didReceiveMemoryWarning]; +} #pragma mark - Table view data source - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { - - - return [self.guitar.options allKeys].count; + return 1; } - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - NSArray *keys = [self.guitar.options allKeys]; - NSString *key = [keys objectAtIndex:section]; - NSArray *values = [self.guitar.options objectForKey:key]; - - return values.count; + return [self.model.categories count]; } - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"selectorIdentifier" forIndexPath:indexPath]; - + UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"iGotMyDoodlyCell" forIndexPath:indexPath]; - NSString *selection = [options objectForIndexPath:indexPath]; - - + CQCategory *category = [self.model.categories objectAtIndex:indexPath.row]; + cell.textLabel.text = category.name; + cell.detailTextLabel.text = category.selection; + [cell layoutIfNeeded]; return cell; } --(void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender{ - DetailTableViewController *detailView = segue.destinationViewController; - detailView.objects = self.objects; -} - - +#pragma mark - Navigation +// In a storyboard-based application, you will often want to do a little preparation before navigation +- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { + NSIndexPath *indexPath = [self.tableView indexPathForSelectedRow]; + CQCategory *currentCategory = [self.model.categories objectAtIndex:indexPath.row]; + DetailTableViewController *detailVC = segue.destinationViewController; + detailVC.category = currentCategory; + +} +// +//#pragma mark - life cycle method +// +// +//- (void)viewDidLoad { +// [super viewDidLoad]; +// +// self.guitar = [[CQCategory alloc]init]; +// [self.guitar intializeData]; +// +// self.navigationItem.title = @"Guitars"; +// } +// +// +//#pragma mark - Table view data source +// +//- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { +// +// +// return [self.guitar.options allKeys].count; +//} +// +//- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { +// NSArray *keys = [self.guitar.options allKeys]; +// NSString *key = [keys objectAtIndex:section]; +// NSArray *values = [self.guitar.options objectForKey:key]; +// +// return values.count; +//} +// +// +//- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { +// UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"selectorIdentifier" forIndexPath:indexPath]; +// +// +// NSString *selection = [options objectForIndexPath:indexPath]; +// +// +// +// return cell; +//} +// +//-(void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender{ +// DetailTableViewController *detailView = segue.destinationViewController; +// detailView.objects = self.objects; +//} +// +// +// +// +// +// +// +// +// +// @end diff --git a/OptionSelector/CategoryModel.h b/OptionSelector/CategoryModel.h new file mode 100644 index 0000000..0321d3c --- /dev/null +++ b/OptionSelector/CategoryModel.h @@ -0,0 +1,19 @@ +// +// CategoryModel.h +// OptionSelector +// +// Created by Xiulan Shi on 8/14/15. +// Copyright (c) 2015 Mike Kavouras. All rights reserved. +// + +#import + +@interface CategoryModel : NSObject + +@property (nonatomic) NSMutableArray *categories; + ++ (instancetype)sharedInstance; + +- (void)initializeModel; + +@end diff --git a/OptionSelector/CategoryModel.m b/OptionSelector/CategoryModel.m new file mode 100644 index 0000000..cd3b7dd --- /dev/null +++ b/OptionSelector/CategoryModel.m @@ -0,0 +1,86 @@ +// +// CategoryModel.m +// OptionSelector +// +// Created by Xiulan Shi on 8/14/15. +// Copyright (c) 2015 Mike Kavouras. All rights reserved. +// + +#import "CategoryModel.h" +#import "CQCategory.h" + +@implementation CategoryModel + + ++ (instancetype)sharedInstance +{ + static CategoryModel *sharedInstance = nil; + static dispatch_once_t onceToken; + dispatch_once(&onceToken, ^{ + sharedInstance = [[CategoryModel alloc] init]; + // Do any other initialisation stuff here + }); + return sharedInstance; + +} + +- (void)initializeModel { + + self.categories = [[NSMutableArray alloc] init]; + + CQCategory *dogs = [[CQCategory alloc] init]; + dogs.name = @"Dogs"; + dogs.options = @[ + @"Labrador Retriever", + @"German Shepherd", + @"Golden Retriever ", + @"Bulldog", + @"Yorksire Terrier", + @"Poodle", + @"Beagle", + @"Chihuahua", + @"Dachshund" + ]; + dogs.selection = @""; + dogs.index = 0; + [self.categories addObject:dogs]; + + CQCategory *cars = [[CQCategory alloc] init]; + cars.name = @"Cars"; + cars.options = @[ + @"Ford", + @"Honda", + @"Toyota", + @"Mazda", + @"BMW", + @"Audi", + @"Ferari", + @"Porsche", + @"Lamborghini" + ]; + cars.selection = @""; + cars.index = 1; + [self.categories addObject:cars]; + + CQCategory *candies = [[CQCategory alloc] init]; + candies.name = @"Candies"; + candies.options = @[ + @"chocolate bar", + @"chocolate chip", + @"chocolate", + @"lollipop", + @"candy cane", + @"jaw breaker", + @"caramel", + @"sour chew", + @"peanut butter cup", + @"gummi bear" + ]; + candies.selection = @""; + candies.index = 2; + [self.categories addObject:candies]; + +} + + +@end diff --git a/OptionSelector/DetailTableViewController.h b/OptionSelector/DetailTableViewController.h index 9151bdb..f5e314e 100644 --- a/OptionSelector/DetailTableViewController.h +++ b/OptionSelector/DetailTableViewController.h @@ -7,9 +7,10 @@ // #import +#import "CQCategory.h" @interface DetailTableViewController : UITableViewController -@property (nonatomic)NSArray *objects; +@property (nonatomic)CQCategory *category; @end diff --git a/OptionSelector/DetailTableViewController.m b/OptionSelector/DetailTableViewController.m index ebbd7a8..d924acd 100644 --- a/OptionSelector/DetailTableViewController.m +++ b/OptionSelector/DetailTableViewController.m @@ -8,6 +8,7 @@ #import "DetailTableViewController.h" #import "CQCategory.h" +#import "ModelCategory.h" @interface DetailTableViewController () @@ -17,33 +18,83 @@ @implementation DetailTableViewController - (void)viewDidLoad { [super viewDidLoad]; - - // Uncomment the following line to preserve selection between presentations. - // self.clearsSelectionOnViewWillAppear = NO; - - // Uncomment the following line to display an Edit button in the navigation bar for this view controller. - // self.navigationItem.rightBarButtonItem = self.editButtonItem; } - (void)didReceiveMemoryWarning { [super didReceiveMemoryWarning]; - // Dispose of any resources that can be recreated. } #pragma mark - Table view data source - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { -#warning Potentially incomplete method implementation. - // Return the number of sections. - return 0; + return 1; } - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { -#warning Incomplete method implementation. - // Return the number of rows in the section. - return 0; + return [self.category.options count]; +} + + +- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { + UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"poopyIdentifier" forIndexPath:indexPath]; + + cell.textLabel.text = [self.category.options objectAtIndex:indexPath.row]; + + return cell; +} + +#pragma mark - Table view delegate + +- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { + + [tableView cellForRowAtIndexPath:indexPath].accessoryType = UITableViewCellAccessoryCheckmark; + + NSString *selected = [self.category.options objectAtIndex:indexPath.row]; + + self.category.selection = selected; + +} + + +- (void)tableView:(UITableView *)tableView didDeselectRowAtIndexPath:(NSIndexPath *)indexPath { + + [tableView cellForRowAtIndexPath:indexPath].accessoryType = UITableViewCellAccessoryNone; + } + + + + +//- (void)viewDidLoad { +// [super viewDidLoad]; +// +// // Uncomment the following line to preserve selection between presentations. +// // self.clearsSelectionOnViewWillAppear = NO; +// +// // Uncomment the following line to display an Edit button in the navigation bar for this view controller. +// // self.navigationItem.rightBarButtonItem = self.editButtonItem; +//} +// +//- (void)didReceiveMemoryWarning { +// [super didReceiveMemoryWarning]; +// // Dispose of any resources that can be recreated. +//} +// +//#pragma mark - Table view data source +// +//- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { +//#warning Potentially incomplete method implementation. +// // Return the number of sections. +// return 0; +//} +// +//- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { +//#warning Incomplete method implementation. +// // Return the number of rows in the section. +// return 0; +//} + /* - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:<#@"reuseIdentifier"#> forIndexPath:indexPath]; diff --git a/OptionSelector/FirstTableViewController.h b/OptionSelector/FirstTableViewController.h new file mode 100644 index 0000000..df5553a --- /dev/null +++ b/OptionSelector/FirstTableViewController.h @@ -0,0 +1,17 @@ +// +// FirstTableViewController.h +// OptionSelector +// +// Created by Xiulan Shi on 8/11/15. +// Copyright (c) 2015 Mike Kavouras. All rights reserved. +// + +#import +#import "CQCategory.h" +#import "CategoryModel.h" + +@interface FirstTableViewController : UITableViewController + +@property (nonatomic) CategoryModel *model; + +@end diff --git a/OptionSelector/FirstTableViewController.m b/OptionSelector/FirstTableViewController.m new file mode 100644 index 0000000..39cb56b --- /dev/null +++ b/OptionSelector/FirstTableViewController.m @@ -0,0 +1,74 @@ +// +// FirstTableViewController.m +// OptionSelector +// +// Created by Xiulan Shi on 8/11/15. +// Copyright (c) 2015 Mike Kavouras. All rights reserved. +// + +#import "FirstTableViewController.h" +#import "SecondTableViewController.h" + +@interface FirstTableViewController () + +@end + +@implementation FirstTableViewController + + +- (void)viewDidLoad { + [super viewDidLoad]; + + self.model = [CategoryModel sharedInstance]; + [self.model initializeModel]; + +} + +- (void)viewWillAppear:(BOOL)animated { + [super viewWillAppear:animated]; + + [self.tableView reloadData]; +} + +- (void)didReceiveMemoryWarning { + [super didReceiveMemoryWarning]; +} + + +#pragma mark - Table view data source + +- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { + return 1; +} + +- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { + return [self.model.categories count]; +} + + +- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { + UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"ListPrototypeCell" forIndexPath:indexPath]; + + CQCategory *category = [self.model.categories objectAtIndex:indexPath.row]; + + cell.textLabel.text = category.name; + cell.detailTextLabel.text = category.selection; + [cell layoutIfNeeded]; + return cell; +} + + + +#pragma mark - Navigation + +// In a storyboard-based application, you will often want to do a little preparation before navigation + +- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { + NSIndexPath *indexPath = [self.tableView indexPathForSelectedRow]; + CQCategory *currentCategory = [self.model.categories objectAtIndex:indexPath.row]; + SecondTableViewController *detailVC = segue.destinationViewController; + detailVC.category = currentCategory; + +} + +@end diff --git a/OptionSelector/ModelCategory.h b/OptionSelector/ModelCategory.h new file mode 100644 index 0000000..bec1e6a --- /dev/null +++ b/OptionSelector/ModelCategory.h @@ -0,0 +1,19 @@ +// +// ModelCategory.h +// OptionSelector +// +// Created by Christian Maldonado on 9/30/15. +// Copyright © 2015 Mike Kavouras. All rights reserved. +// + +#import + +@interface ModelCategory : NSObject + +@property (nonatomic) NSMutableArray *categories; + ++(instancetype)sharedInstance; + +-(void)initializeModel; + +@end diff --git a/OptionSelector/ModelCategory.m b/OptionSelector/ModelCategory.m new file mode 100644 index 0000000..95cb8e5 --- /dev/null +++ b/OptionSelector/ModelCategory.m @@ -0,0 +1,86 @@ +// +// ModelCategory.m +// OptionSelector +// +// Created by Christian Maldonado on 9/30/15. +// Copyright © 2015 Mike Kavouras. All rights reserved. +// + +#import "ModelCategory.h" +#import "CQCategory.h" + +@implementation ModelCategory + ++(instancetype)sharedInstance{ + + +static ModelCategory *sharedInstance = nil; +static dispatch_once_t onceToken; +dispatch_once(&onceToken, ^{ + sharedInstance = [[ModelCategory alloc] init]; + // Do any other initialisation stuff here +}); +return sharedInstance; + +} + +- (void)initializeModel { + + self.categories = [[NSMutableArray alloc] init]; + + CQCategory *guitars = [[CQCategory alloc] init]; + guitars.name = @"Guitars"; + guitars.options = @[ + @"Fender Stratocaster", + @"Steven Connor", + @"Fender Mustang ", + @"Gibson Explorer", + @"Gibson Les Paul", + @"Paul Languadoc", + @"Turner Model 1", + @"Turner Renaissance RN-6h", + @"Robert Ruck Classical" + ]; + guitars.selection = @""; + guitars.index = 0; + [self.categories addObject:guitars]; + + CQCategory *bass = [[CQCategory alloc] init]; + bass.name = @"Basses"; + bass.options = @[ + @"Fender Jazz ", + @"Fender Percision", + @"Gibson Thunderbird", + @"Rickenbacker 4001", + @"Fodera Monarch", + @"Hofner 5001 ", + @"Ernie Ball Stingray", + @"Carl Thopson Rainbow", + @"Modulus Aboriginal" + ]; + bass.selection = @""; + bass.index = 1; + [self.categories addObject:bass]; + + CQCategory *drums = [[CQCategory alloc] init]; + drums.name = @"Drums"; + drums.options = @[ + @"DW", + @"Tama", + @"Pearl", + @"Premier", + @"Ludwig", + @"Gretsch", + @"Yamaha", + @"Slingerland", + @"LP", + @"Remo" + ]; + drums.selection = @""; + drums.index = 2; + [self.categories addObject:drums]; + +} + + +@end From 226de0c5bc59cd9f20b1bd680346d3fc54962c23 Mon Sep 17 00:00:00 2001 From: Christian Date: Wed, 30 Sep 2015 12:47:42 -0400 Subject: [PATCH 3/4] update again --- OptionSelector/CQCategory.m | 56 +----------- .../CQCategoryTableViewController.m | 59 ------------- OptionSelector/DetailTableViewController.m | 86 ------------------- 3 files changed, 4 insertions(+), 197 deletions(-) diff --git a/OptionSelector/CQCategory.m b/OptionSelector/CQCategory.m index 88aec6d..d07b4ae 100644 --- a/OptionSelector/CQCategory.m +++ b/OptionSelector/CQCategory.m @@ -10,57 +10,9 @@ @implementation CQCategory -//-(void)intializeData { -// -// -// [self intializeOptions]; -// [self intializeName]; -// [self intializeSelection]; -// -//} -// -// -//-(void)intializeSelection{ -// -//} -// -// -//-(void)intializeName{ -// -//} -// -// -// -//-(void)intializeOptions{ -// -// NSArray *fender = @[ -// @"Fender Stratocaster", -// @"Telecaster", -// @"Mustang", -// @"Jaguar", -// @"Jazz Master", -// ]; -// NSArray *gibson = @[ -// @"Gibson Explorer", -// @"Les Paul", -// @"Thunderbird", -// @"SG", -// ]; -// NSArray *ibanez = @[ -// @"Iceman", -// @"Artstar", -// @"Destroyer", -// @"Artcore", -// ]; -// NSArray *turner = @[ -// @"Model 1", -// @"Model T", -// @"Renaissance RN-6h", -// @"Renaissance RS-6", -// ]; -// -// -// -//} +-(void)intializeData{ + +} + @end diff --git a/OptionSelector/CQCategoryTableViewController.m b/OptionSelector/CQCategoryTableViewController.m index 66772fb..5f82ff8 100644 --- a/OptionSelector/CQCategoryTableViewController.m +++ b/OptionSelector/CQCategoryTableViewController.m @@ -73,63 +73,4 @@ - (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { } - - -// -//#pragma mark - life cycle method -// -// -//- (void)viewDidLoad { -// [super viewDidLoad]; -// -// self.guitar = [[CQCategory alloc]init]; -// [self.guitar intializeData]; -// -// self.navigationItem.title = @"Guitars"; -// } -// -// -//#pragma mark - Table view data source -// -//- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { -// -// -// return [self.guitar.options allKeys].count; -//} -// -//- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { -// NSArray *keys = [self.guitar.options allKeys]; -// NSString *key = [keys objectAtIndex:section]; -// NSArray *values = [self.guitar.options objectForKey:key]; -// -// return values.count; -//} -// -// -//- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { -// UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"selectorIdentifier" forIndexPath:indexPath]; -// -// -// NSString *selection = [options objectForIndexPath:indexPath]; -// -// -// -// return cell; -//} -// -//-(void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender{ -// DetailTableViewController *detailView = segue.destinationViewController; -// detailView.objects = self.objects; -//} -// -// -// -// -// -// -// -// -// -// - @end diff --git a/OptionSelector/DetailTableViewController.m b/OptionSelector/DetailTableViewController.m index d924acd..c29a483 100644 --- a/OptionSelector/DetailTableViewController.m +++ b/OptionSelector/DetailTableViewController.m @@ -63,90 +63,4 @@ - (void)tableView:(UITableView *)tableView didDeselectRowAtIndexPath:(NSIndexPat } - - - -//- (void)viewDidLoad { -// [super viewDidLoad]; -// -// // Uncomment the following line to preserve selection between presentations. -// // self.clearsSelectionOnViewWillAppear = NO; -// -// // Uncomment the following line to display an Edit button in the navigation bar for this view controller. -// // self.navigationItem.rightBarButtonItem = self.editButtonItem; -//} -// -//- (void)didReceiveMemoryWarning { -// [super didReceiveMemoryWarning]; -// // Dispose of any resources that can be recreated. -//} -// -//#pragma mark - Table view data source -// -//- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { -//#warning Potentially incomplete method implementation. -// // Return the number of sections. -// return 0; -//} -// -//- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { -//#warning Incomplete method implementation. -// // Return the number of rows in the section. -// return 0; -//} - -/* -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:<#@"reuseIdentifier"#> forIndexPath:indexPath]; - - // Configure the cell... - - return cell; -} -*/ - -/* -// Override to support conditional editing of the table view. -- (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath { - // Return NO if you do not want the specified item to be editable. - return YES; -} -*/ - -/* -// Override to support editing the table view. -- (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath { - if (editingStyle == UITableViewCellEditingStyleDelete) { - // Delete the row from the data source - [tableView deleteRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationFade]; - } else if (editingStyle == UITableViewCellEditingStyleInsert) { - // Create a new instance of the appropriate class, insert it into the array, and add a new row to the table view - } -} -*/ - -/* -// Override to support rearranging the table view. -- (void)tableView:(UITableView *)tableView moveRowAtIndexPath:(NSIndexPath *)fromIndexPath toIndexPath:(NSIndexPath *)toIndexPath { -} -*/ - -/* -// Override to support conditional rearranging of the table view. -- (BOOL)tableView:(UITableView *)tableView canMoveRowAtIndexPath:(NSIndexPath *)indexPath { - // Return NO if you do not want the item to be re-orderable. - return YES; -} -*/ - -/* -#pragma mark - Navigation - -// In a storyboard-based application, you will often want to do a little preparation before navigation -- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { - // Get the new view controller using [segue destinationViewController]. - // Pass the selected object to the new view controller. -} -*/ - @end From 581e2bff69344678165ff06c1c950271131301cc Mon Sep 17 00:00:00 2001 From: Christian Date: Wed, 30 Sep 2015 12:58:51 -0400 Subject: [PATCH 4/4] update again1 --- OptionSelector/ModelCategory.h | 2 +- OptionSelector/ModelCategory.m | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OptionSelector/ModelCategory.h b/OptionSelector/ModelCategory.h index bec1e6a..47d334f 100644 --- a/OptionSelector/ModelCategory.h +++ b/OptionSelector/ModelCategory.h @@ -2,7 +2,7 @@ // ModelCategory.h // OptionSelector // -// Created by Christian Maldonado on 9/30/15. +// Created by Christian Maldonado on 8/15/15. // Copyright © 2015 Mike Kavouras. All rights reserved. // diff --git a/OptionSelector/ModelCategory.m b/OptionSelector/ModelCategory.m index 95cb8e5..5f99ec1 100644 --- a/OptionSelector/ModelCategory.m +++ b/OptionSelector/ModelCategory.m @@ -2,7 +2,7 @@ // ModelCategory.m // OptionSelector // -// Created by Christian Maldonado on 9/30/15. +// Created by Christian Maldonado on 8/15/15. // Copyright © 2015 Mike Kavouras. All rights reserved. //