From d80a2ba9cc51ed9ea911496f9b9c11e0f00cec4f Mon Sep 17 00:00:00 2001 From: elberdev Date: Fri, 9 Oct 2015 21:36:22 -0400 Subject: [PATCH 1/6] set up VCs --- MarsWater/MarsWater.xcodeproj/project.pbxproj | 36 +++++- MarsWater/MarsWater/AppDelegate.m | 19 ---- .../MarsWater/Base.lproj/Main.storyboard | 105 ++++++++++++++++-- .../MarsWater/ListsTableViewController.m | 15 ++- .../TaskCreationTableViewController.h | 13 +++ .../TaskCreationTableViewController.m | 65 +++++++++++ .../MarsWater/TasksTableViewController.h | 15 +++ .../MarsWater/TasksTableViewController.m | 69 ++++++++++++ 8 files changed, 303 insertions(+), 34 deletions(-) create mode 100644 MarsWater/MarsWater/TaskCreationTableViewController.h create mode 100644 MarsWater/MarsWater/TaskCreationTableViewController.m create mode 100644 MarsWater/MarsWater/TasksTableViewController.h create mode 100644 MarsWater/MarsWater/TasksTableViewController.m diff --git a/MarsWater/MarsWater.xcodeproj/project.pbxproj b/MarsWater/MarsWater.xcodeproj/project.pbxproj index a2f82e3..0eac819 100644 --- a/MarsWater/MarsWater.xcodeproj/project.pbxproj +++ b/MarsWater/MarsWater.xcodeproj/project.pbxproj @@ -7,6 +7,8 @@ objects = { /* Begin PBXBuildFile section */ + 3BC2FF7D1BC88FD1003A57F0 /* TasksTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3BC2FF7C1BC88FD1003A57F0 /* TasksTableViewController.m */; settings = {ASSET_TAGS = (); }; }; + 3BC2FF801BC89009003A57F0 /* TaskCreationTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3BC2FF7F1BC89009003A57F0 /* TaskCreationTableViewController.m */; settings = {ASSET_TAGS = (); }; }; 8DA86CA91BC1AE57006C50BC /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 8DA86CA81BC1AE57006C50BC /* main.m */; }; 8DA86CAC1BC1AE57006C50BC /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 8DA86CAB1BC1AE57006C50BC /* AppDelegate.m */; }; 8DA86CB21BC1AE57006C50BC /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8DA86CB01BC1AE57006C50BC /* Main.storyboard */; }; @@ -22,6 +24,10 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 3BC2FF7B1BC88FD1003A57F0 /* TasksTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TasksTableViewController.h; sourceTree = ""; }; + 3BC2FF7C1BC88FD1003A57F0 /* TasksTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TasksTableViewController.m; sourceTree = ""; }; + 3BC2FF7E1BC89009003A57F0 /* TaskCreationTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TaskCreationTableViewController.h; sourceTree = ""; }; + 3BC2FF7F1BC89009003A57F0 /* TaskCreationTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TaskCreationTableViewController.m; sourceTree = ""; }; 8DA86CA41BC1AE57006C50BC /* MarsWater.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MarsWater.app; sourceTree = BUILT_PRODUCTS_DIR; }; 8DA86CA81BC1AE57006C50BC /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; 8DA86CAA1BC1AE57006C50BC /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; @@ -56,6 +62,28 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 3BC2FF811BC892B6003A57F0 /* List */ = { + isa = PBXGroup; + children = ( + 8DA86CD21BC1B8E4006C50BC /* ListsTableViewController.h */, + 8DA86CD31BC1B8E4006C50BC /* ListsTableViewController.m */, + 8DA86CD51BC1B904006C50BC /* ListCreationTableViewController.h */, + 8DA86CD61BC1B904006C50BC /* ListCreationTableViewController.m */, + ); + name = List; + sourceTree = ""; + }; + 3BC2FF821BC892BF003A57F0 /* Task */ = { + isa = PBXGroup; + children = ( + 3BC2FF7B1BC88FD1003A57F0 /* TasksTableViewController.h */, + 3BC2FF7C1BC88FD1003A57F0 /* TasksTableViewController.m */, + 3BC2FF7E1BC89009003A57F0 /* TaskCreationTableViewController.h */, + 3BC2FF7F1BC89009003A57F0 /* TaskCreationTableViewController.m */, + ); + name = Task; + sourceTree = ""; + }; 8DA86C9B1BC1AE57006C50BC = { isa = PBXGroup; children = ( @@ -78,10 +106,8 @@ 8DA86CD11BC1B329006C50BC /* Model */, 8DA86CAA1BC1AE57006C50BC /* AppDelegate.h */, 8DA86CAB1BC1AE57006C50BC /* AppDelegate.m */, - 8DA86CD21BC1B8E4006C50BC /* ListsTableViewController.h */, - 8DA86CD31BC1B8E4006C50BC /* ListsTableViewController.m */, - 8DA86CD51BC1B904006C50BC /* ListCreationTableViewController.h */, - 8DA86CD61BC1B904006C50BC /* ListCreationTableViewController.m */, + 3BC2FF811BC892B6003A57F0 /* List */, + 3BC2FF821BC892BF003A57F0 /* Task */, 8DA86CB01BC1AE57006C50BC /* Main.storyboard */, 8DA86CB61BC1AE57006C50BC /* Assets.xcassets */, 8DA86CB81BC1AE57006C50BC /* LaunchScreen.storyboard */, @@ -187,10 +213,12 @@ files = ( 8DA86CB51BC1AE57006C50BC /* MarsWater.xcdatamodeld in Sources */, 8DA86CAC1BC1AE57006C50BC /* AppDelegate.m in Sources */, + 3BC2FF801BC89009003A57F0 /* TaskCreationTableViewController.m in Sources */, 8DB2F6EA1BC1E75500E58E65 /* Task+CoreDataProperties.m in Sources */, 8DA86CD41BC1B8E4006C50BC /* ListsTableViewController.m in Sources */, 8DB2F6E71BC1E75500E58E65 /* List.m in Sources */, 8DB2F6E91BC1E75500E58E65 /* Task.m in Sources */, + 3BC2FF7D1BC88FD1003A57F0 /* TasksTableViewController.m in Sources */, 8DA86CD71BC1B904006C50BC /* ListCreationTableViewController.m in Sources */, 8DA86CA91BC1AE57006C50BC /* main.m in Sources */, 8DB2F6E81BC1E75500E58E65 /* List+CoreDataProperties.m in Sources */, diff --git a/MarsWater/MarsWater/AppDelegate.m b/MarsWater/MarsWater/AppDelegate.m index 8e592d7..fd8db43 100644 --- a/MarsWater/MarsWater/AppDelegate.m +++ b/MarsWater/MarsWater/AppDelegate.m @@ -20,26 +20,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:( return YES; } -- (void)applicationWillResignActive:(UIApplication *)application { - // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state. - // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game. -} - -- (void)applicationDidEnterBackground:(UIApplication *)application { - // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. - // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits. -} - -- (void)applicationWillEnterForeground:(UIApplication *)application { - // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background. -} - -- (void)applicationDidBecomeActive:(UIApplication *)application { - // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface. -} - - (void)applicationWillTerminate:(UIApplication *)application { - // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:. // Saves changes in the application's managed object context before the application terminates. [self saveContext]; } diff --git a/MarsWater/MarsWater/Base.lproj/Main.storyboard b/MarsWater/MarsWater/Base.lproj/Main.storyboard index 13ead89..ece3d86 100644 --- a/MarsWater/MarsWater/Base.lproj/Main.storyboard +++ b/MarsWater/MarsWater/Base.lproj/Main.storyboard @@ -26,7 +26,7 @@ - + @@ -77,6 +77,93 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -85,7 +172,7 @@ - + @@ -100,7 +187,7 @@ - + @@ -129,7 +216,7 @@ - - - -