From bb0c4a834840138da3ec05f64ae35e88aeac1856 Mon Sep 17 00:00:00 2001 From: JovannyEspinal Date: Sun, 4 Oct 2015 17:38:03 -0400 Subject: [PATCH 1/3] First commit --- MarsWater/MarsWater.xcodeproj/project.pbxproj | 578 ++++++++++++++++++ .../contents.xcworkspacedata | 2 +- .../MarsWater}/AppDelegate.h | 6 +- .../MarsWater}/AppDelegate.m | 12 +- .../AppIcon.appiconset/Contents.json | 0 .../Base.lproj/LaunchScreen.storyboard | 4 +- .../MarsWater/Base.lproj/Main.storyboard | 210 +++++++ .../MarsWater}/Info.plist | 0 MarsWater/MarsWater/List+CoreDataProperties.h | 25 + MarsWater/MarsWater/List+CoreDataProperties.m | 21 + MarsWater/MarsWater/List.h | 22 + MarsWater/MarsWater/List.m | 15 + .../ListCreationTableViewController.h | 13 + .../ListCreationTableViewController.m | 65 ++ MarsWater/MarsWater/ListTableViewController.h | 13 + MarsWater/MarsWater/ListTableViewController.m | 81 +++ .../MarsWater.xcdatamodeld}/.xccurrentversion | 2 +- .../MarsWater.xcdatamodel/contents | 22 + MarsWater/MarsWater/Task+CoreDataProperties.h | 28 + MarsWater/MarsWater/Task+CoreDataProperties.m | 24 + MarsWater/MarsWater/Task.h | 22 + MarsWater/MarsWater/Task.m | 15 + .../MarsWater}/main.m | 6 +- MarsWater/MarsWaterTests/Info.plist | 24 + MarsWater/MarsWaterTests/MarsWaterTests.m | 39 ++ MarsWater/MarsWaterUITests/Info.plist | 24 + MarsWater/MarsWaterUITests/MarsWaterUITests.m | 40 ++ .../SavingForever.xcodeproj/project.pbxproj | 322 ---------- .../SavingForever/Base.lproj/Main.storyboard | 25 - .../SavingForever.xcdatamodel/contents | 4 - SavingForever/SavingForever/ViewController.h | 15 - SavingForever/SavingForever/ViewController.m | 27 - 32 files changed, 1297 insertions(+), 409 deletions(-) create mode 100644 MarsWater/MarsWater.xcodeproj/project.pbxproj rename {SavingForever/SavingForever.xcodeproj => MarsWater/MarsWater.xcodeproj}/project.xcworkspace/contents.xcworkspacedata (68%) rename {SavingForever/SavingForever => MarsWater/MarsWater}/AppDelegate.h (81%) rename {SavingForever/SavingForever => MarsWater/MarsWater}/AppDelegate.m (93%) rename {SavingForever/SavingForever => MarsWater/MarsWater}/Assets.xcassets/AppIcon.appiconset/Contents.json (100%) rename {SavingForever/SavingForever => MarsWater/MarsWater}/Base.lproj/LaunchScreen.storyboard (84%) create mode 100644 MarsWater/MarsWater/Base.lproj/Main.storyboard rename {SavingForever/SavingForever => MarsWater/MarsWater}/Info.plist (100%) create mode 100644 MarsWater/MarsWater/List+CoreDataProperties.h create mode 100644 MarsWater/MarsWater/List+CoreDataProperties.m create mode 100644 MarsWater/MarsWater/List.h create mode 100644 MarsWater/MarsWater/List.m create mode 100644 MarsWater/MarsWater/ListCreationTableViewController.h create mode 100644 MarsWater/MarsWater/ListCreationTableViewController.m create mode 100644 MarsWater/MarsWater/ListTableViewController.h create mode 100644 MarsWater/MarsWater/ListTableViewController.m rename {SavingForever/SavingForever/SavingForever.xcdatamodeld => MarsWater/MarsWater/MarsWater.xcdatamodeld}/.xccurrentversion (83%) create mode 100644 MarsWater/MarsWater/MarsWater.xcdatamodeld/MarsWater.xcdatamodel/contents create mode 100644 MarsWater/MarsWater/Task+CoreDataProperties.h create mode 100644 MarsWater/MarsWater/Task+CoreDataProperties.m create mode 100644 MarsWater/MarsWater/Task.h create mode 100644 MarsWater/MarsWater/Task.m rename {SavingForever/SavingForever => MarsWater/MarsWater}/main.m (64%) create mode 100644 MarsWater/MarsWaterTests/Info.plist create mode 100644 MarsWater/MarsWaterTests/MarsWaterTests.m create mode 100644 MarsWater/MarsWaterUITests/Info.plist create mode 100644 MarsWater/MarsWaterUITests/MarsWaterUITests.m delete mode 100644 SavingForever/SavingForever.xcodeproj/project.pbxproj delete mode 100644 SavingForever/SavingForever/Base.lproj/Main.storyboard delete mode 100644 SavingForever/SavingForever/SavingForever.xcdatamodeld/SavingForever.xcdatamodel/contents delete mode 100644 SavingForever/SavingForever/ViewController.h delete mode 100644 SavingForever/SavingForever/ViewController.m diff --git a/MarsWater/MarsWater.xcodeproj/project.pbxproj b/MarsWater/MarsWater.xcodeproj/project.pbxproj new file mode 100644 index 0000000..94b5b59 --- /dev/null +++ b/MarsWater/MarsWater.xcodeproj/project.pbxproj @@ -0,0 +1,578 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + 50B4EB221BC1AE940068BF21 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 50B4EB211BC1AE940068BF21 /* main.m */; }; + 50B4EB251BC1AE940068BF21 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 50B4EB241BC1AE940068BF21 /* AppDelegate.m */; }; + 50B4EB2B1BC1AE940068BF21 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50B4EB291BC1AE940068BF21 /* Main.storyboard */; }; + 50B4EB2E1BC1AE940068BF21 /* MarsWater.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 50B4EB2C1BC1AE940068BF21 /* MarsWater.xcdatamodeld */; }; + 50B4EB301BC1AE940068BF21 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 50B4EB2F1BC1AE940068BF21 /* Assets.xcassets */; }; + 50B4EB331BC1AE940068BF21 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50B4EB311BC1AE940068BF21 /* LaunchScreen.storyboard */; }; + 50B4EB3E1BC1AE950068BF21 /* MarsWaterTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 50B4EB3D1BC1AE950068BF21 /* MarsWaterTests.m */; }; + 50B4EB491BC1AE950068BF21 /* MarsWaterUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = 50B4EB481BC1AE950068BF21 /* MarsWaterUITests.m */; }; + 50B4EB621BC1B3200068BF21 /* List+CoreDataProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = 50B4EB5B1BC1B3200068BF21 /* List+CoreDataProperties.m */; settings = {ASSET_TAGS = (); }; }; + 50B4EB631BC1B3200068BF21 /* List.m in Sources */ = {isa = PBXBuildFile; fileRef = 50B4EB5D1BC1B3200068BF21 /* List.m */; settings = {ASSET_TAGS = (); }; }; + 50B4EB641BC1B3200068BF21 /* Task+CoreDataProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = 50B4EB5F1BC1B3200068BF21 /* Task+CoreDataProperties.m */; settings = {ASSET_TAGS = (); }; }; + 50B4EB651BC1B3200068BF21 /* Task.m in Sources */ = {isa = PBXBuildFile; fileRef = 50B4EB611BC1B3200068BF21 /* Task.m */; settings = {ASSET_TAGS = (); }; }; + 50B4EB681BC1B90A0068BF21 /* ListTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 50B4EB671BC1B90A0068BF21 /* ListTableViewController.m */; settings = {ASSET_TAGS = (); }; }; + 50B4EB6B1BC1B92C0068BF21 /* ListCreationTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 50B4EB6A1BC1B92C0068BF21 /* ListCreationTableViewController.m */; settings = {ASSET_TAGS = (); }; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 50B4EB3A1BC1AE950068BF21 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 50B4EB151BC1AE940068BF21 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 50B4EB1C1BC1AE940068BF21; + remoteInfo = MarsWater; + }; + 50B4EB451BC1AE950068BF21 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 50B4EB151BC1AE940068BF21 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 50B4EB1C1BC1AE940068BF21; + remoteInfo = MarsWater; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXFileReference section */ + 50B4EB1D1BC1AE940068BF21 /* MarsWater.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MarsWater.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 50B4EB211BC1AE940068BF21 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; + 50B4EB231BC1AE940068BF21 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; + 50B4EB241BC1AE940068BF21 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; + 50B4EB2A1BC1AE940068BF21 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + 50B4EB2D1BC1AE940068BF21 /* MarsWater.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = MarsWater.xcdatamodel; sourceTree = ""; }; + 50B4EB2F1BC1AE940068BF21 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 50B4EB321BC1AE940068BF21 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; + 50B4EB341BC1AE940068BF21 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 50B4EB391BC1AE950068BF21 /* MarsWaterTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MarsWaterTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 50B4EB3D1BC1AE950068BF21 /* MarsWaterTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MarsWaterTests.m; sourceTree = ""; }; + 50B4EB3F1BC1AE950068BF21 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 50B4EB441BC1AE950068BF21 /* MarsWaterUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MarsWaterUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 50B4EB481BC1AE950068BF21 /* MarsWaterUITests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MarsWaterUITests.m; sourceTree = ""; }; + 50B4EB4A1BC1AE950068BF21 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 50B4EB5A1BC1B3200068BF21 /* List+CoreDataProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "List+CoreDataProperties.h"; path = "MarsWater/List+CoreDataProperties.h"; sourceTree = ""; }; + 50B4EB5B1BC1B3200068BF21 /* List+CoreDataProperties.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "List+CoreDataProperties.m"; path = "MarsWater/List+CoreDataProperties.m"; sourceTree = ""; }; + 50B4EB5C1BC1B3200068BF21 /* List.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = List.h; path = MarsWater/List.h; sourceTree = ""; }; + 50B4EB5D1BC1B3200068BF21 /* List.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = List.m; path = MarsWater/List.m; sourceTree = ""; }; + 50B4EB5E1BC1B3200068BF21 /* Task+CoreDataProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "Task+CoreDataProperties.h"; path = "MarsWater/Task+CoreDataProperties.h"; sourceTree = ""; }; + 50B4EB5F1BC1B3200068BF21 /* Task+CoreDataProperties.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "Task+CoreDataProperties.m"; path = "MarsWater/Task+CoreDataProperties.m"; sourceTree = ""; }; + 50B4EB601BC1B3200068BF21 /* Task.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Task.h; path = MarsWater/Task.h; sourceTree = ""; }; + 50B4EB611BC1B3200068BF21 /* Task.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Task.m; path = MarsWater/Task.m; sourceTree = ""; }; + 50B4EB661BC1B90A0068BF21 /* ListTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ListTableViewController.h; sourceTree = ""; }; + 50B4EB671BC1B90A0068BF21 /* ListTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ListTableViewController.m; sourceTree = ""; }; + 50B4EB691BC1B92C0068BF21 /* ListCreationTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ListCreationTableViewController.h; sourceTree = ""; }; + 50B4EB6A1BC1B92C0068BF21 /* ListCreationTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ListCreationTableViewController.m; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 50B4EB1A1BC1AE940068BF21 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 50B4EB361BC1AE950068BF21 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 50B4EB411BC1AE950068BF21 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 50B4EB141BC1AE940068BF21 = { + isa = PBXGroup; + children = ( + 50B4EB1F1BC1AE940068BF21 /* MarsWater */, + 50B4EB3C1BC1AE950068BF21 /* MarsWaterTests */, + 50B4EB471BC1AE950068BF21 /* MarsWaterUITests */, + 50B4EB1E1BC1AE940068BF21 /* Products */, + ); + sourceTree = ""; + }; + 50B4EB1E1BC1AE940068BF21 /* Products */ = { + isa = PBXGroup; + children = ( + 50B4EB1D1BC1AE940068BF21 /* MarsWater.app */, + 50B4EB391BC1AE950068BF21 /* MarsWaterTests.xctest */, + 50B4EB441BC1AE950068BF21 /* MarsWaterUITests.xctest */, + ); + name = Products; + sourceTree = ""; + }; + 50B4EB1F1BC1AE940068BF21 /* MarsWater */ = { + isa = PBXGroup; + children = ( + 50B4EB561BC1B2890068BF21 /* Model */, + 50B4EB231BC1AE940068BF21 /* AppDelegate.h */, + 50B4EB241BC1AE940068BF21 /* AppDelegate.m */, + 50B4EB661BC1B90A0068BF21 /* ListTableViewController.h */, + 50B4EB671BC1B90A0068BF21 /* ListTableViewController.m */, + 50B4EB691BC1B92C0068BF21 /* ListCreationTableViewController.h */, + 50B4EB6A1BC1B92C0068BF21 /* ListCreationTableViewController.m */, + 50B4EB291BC1AE940068BF21 /* Main.storyboard */, + 50B4EB2F1BC1AE940068BF21 /* Assets.xcassets */, + 50B4EB311BC1AE940068BF21 /* LaunchScreen.storyboard */, + 50B4EB341BC1AE940068BF21 /* Info.plist */, + 50B4EB2C1BC1AE940068BF21 /* MarsWater.xcdatamodeld */, + 50B4EB201BC1AE940068BF21 /* Supporting Files */, + ); + path = MarsWater; + sourceTree = ""; + }; + 50B4EB201BC1AE940068BF21 /* Supporting Files */ = { + isa = PBXGroup; + children = ( + 50B4EB211BC1AE940068BF21 /* main.m */, + ); + name = "Supporting Files"; + sourceTree = ""; + }; + 50B4EB3C1BC1AE950068BF21 /* MarsWaterTests */ = { + isa = PBXGroup; + children = ( + 50B4EB3D1BC1AE950068BF21 /* MarsWaterTests.m */, + 50B4EB3F1BC1AE950068BF21 /* Info.plist */, + ); + path = MarsWaterTests; + sourceTree = ""; + }; + 50B4EB471BC1AE950068BF21 /* MarsWaterUITests */ = { + isa = PBXGroup; + children = ( + 50B4EB481BC1AE950068BF21 /* MarsWaterUITests.m */, + 50B4EB4A1BC1AE950068BF21 /* Info.plist */, + ); + path = MarsWaterUITests; + sourceTree = ""; + }; + 50B4EB561BC1B2890068BF21 /* Model */ = { + isa = PBXGroup; + children = ( + 50B4EB5A1BC1B3200068BF21 /* List+CoreDataProperties.h */, + 50B4EB5B1BC1B3200068BF21 /* List+CoreDataProperties.m */, + 50B4EB5C1BC1B3200068BF21 /* List.h */, + 50B4EB5D1BC1B3200068BF21 /* List.m */, + 50B4EB5E1BC1B3200068BF21 /* Task+CoreDataProperties.h */, + 50B4EB5F1BC1B3200068BF21 /* Task+CoreDataProperties.m */, + 50B4EB601BC1B3200068BF21 /* Task.h */, + 50B4EB611BC1B3200068BF21 /* Task.m */, + ); + name = Model; + path = ..; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 50B4EB1C1BC1AE940068BF21 /* MarsWater */ = { + isa = PBXNativeTarget; + buildConfigurationList = 50B4EB4D1BC1AE950068BF21 /* Build configuration list for PBXNativeTarget "MarsWater" */; + buildPhases = ( + 50B4EB191BC1AE940068BF21 /* Sources */, + 50B4EB1A1BC1AE940068BF21 /* Frameworks */, + 50B4EB1B1BC1AE940068BF21 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = MarsWater; + productName = MarsWater; + productReference = 50B4EB1D1BC1AE940068BF21 /* MarsWater.app */; + productType = "com.apple.product-type.application"; + }; + 50B4EB381BC1AE950068BF21 /* MarsWaterTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 50B4EB501BC1AE950068BF21 /* Build configuration list for PBXNativeTarget "MarsWaterTests" */; + buildPhases = ( + 50B4EB351BC1AE950068BF21 /* Sources */, + 50B4EB361BC1AE950068BF21 /* Frameworks */, + 50B4EB371BC1AE950068BF21 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 50B4EB3B1BC1AE950068BF21 /* PBXTargetDependency */, + ); + name = MarsWaterTests; + productName = MarsWaterTests; + productReference = 50B4EB391BC1AE950068BF21 /* MarsWaterTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; + 50B4EB431BC1AE950068BF21 /* MarsWaterUITests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 50B4EB531BC1AE950068BF21 /* Build configuration list for PBXNativeTarget "MarsWaterUITests" */; + buildPhases = ( + 50B4EB401BC1AE950068BF21 /* Sources */, + 50B4EB411BC1AE950068BF21 /* Frameworks */, + 50B4EB421BC1AE950068BF21 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 50B4EB461BC1AE950068BF21 /* PBXTargetDependency */, + ); + name = MarsWaterUITests; + productName = MarsWaterUITests; + productReference = 50B4EB441BC1AE950068BF21 /* MarsWaterUITests.xctest */; + productType = "com.apple.product-type.bundle.ui-testing"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 50B4EB151BC1AE940068BF21 /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 0700; + ORGANIZATIONNAME = "Jovanny Espinal"; + TargetAttributes = { + 50B4EB1C1BC1AE940068BF21 = { + CreatedOnToolsVersion = 7.0.1; + DevelopmentTeam = B4G65K7YME; + }; + 50B4EB381BC1AE950068BF21 = { + CreatedOnToolsVersion = 7.0.1; + DevelopmentTeam = B4G65K7YME; + TestTargetID = 50B4EB1C1BC1AE940068BF21; + }; + 50B4EB431BC1AE950068BF21 = { + CreatedOnToolsVersion = 7.0.1; + DevelopmentTeam = B4G65K7YME; + TestTargetID = 50B4EB1C1BC1AE940068BF21; + }; + }; + }; + buildConfigurationList = 50B4EB181BC1AE940068BF21 /* Build configuration list for PBXProject "MarsWater" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 50B4EB141BC1AE940068BF21; + productRefGroup = 50B4EB1E1BC1AE940068BF21 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 50B4EB1C1BC1AE940068BF21 /* MarsWater */, + 50B4EB381BC1AE950068BF21 /* MarsWaterTests */, + 50B4EB431BC1AE950068BF21 /* MarsWaterUITests */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 50B4EB1B1BC1AE940068BF21 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 50B4EB331BC1AE940068BF21 /* LaunchScreen.storyboard in Resources */, + 50B4EB301BC1AE940068BF21 /* Assets.xcassets in Resources */, + 50B4EB2B1BC1AE940068BF21 /* Main.storyboard in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 50B4EB371BC1AE950068BF21 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 50B4EB421BC1AE950068BF21 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 50B4EB191BC1AE940068BF21 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 50B4EB2E1BC1AE940068BF21 /* MarsWater.xcdatamodeld in Sources */, + 50B4EB641BC1B3200068BF21 /* Task+CoreDataProperties.m in Sources */, + 50B4EB251BC1AE940068BF21 /* AppDelegate.m in Sources */, + 50B4EB651BC1B3200068BF21 /* Task.m in Sources */, + 50B4EB631BC1B3200068BF21 /* List.m in Sources */, + 50B4EB621BC1B3200068BF21 /* List+CoreDataProperties.m in Sources */, + 50B4EB6B1BC1B92C0068BF21 /* ListCreationTableViewController.m in Sources */, + 50B4EB221BC1AE940068BF21 /* main.m in Sources */, + 50B4EB681BC1B90A0068BF21 /* ListTableViewController.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 50B4EB351BC1AE950068BF21 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 50B4EB3E1BC1AE950068BF21 /* MarsWaterTests.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 50B4EB401BC1AE950068BF21 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 50B4EB491BC1AE950068BF21 /* MarsWaterUITests.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + 50B4EB3B1BC1AE950068BF21 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 50B4EB1C1BC1AE940068BF21 /* MarsWater */; + targetProxy = 50B4EB3A1BC1AE950068BF21 /* PBXContainerItemProxy */; + }; + 50B4EB461BC1AE950068BF21 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 50B4EB1C1BC1AE940068BF21 /* MarsWater */; + targetProxy = 50B4EB451BC1AE950068BF21 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin PBXVariantGroup section */ + 50B4EB291BC1AE940068BF21 /* Main.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 50B4EB2A1BC1AE940068BF21 /* Base */, + ); + name = Main.storyboard; + sourceTree = ""; + }; + 50B4EB311BC1AE940068BF21 /* LaunchScreen.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 50B4EB321BC1AE940068BF21 /* Base */, + ); + name = LaunchScreen.storyboard; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 50B4EB4B1BC1AE950068BF21 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + }; + name = Debug; + }; + 50B4EB4C1BC1AE950068BF21 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 50B4EB4E1BC1AE950068BF21 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + INFOPLIST_FILE = MarsWater/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = jovannyespinal.MarsWater; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 50B4EB4F1BC1AE950068BF21 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + INFOPLIST_FILE = MarsWater/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = jovannyespinal.MarsWater; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; + 50B4EB511BC1AE950068BF21 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + INFOPLIST_FILE = MarsWaterTests/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = jovannyespinal.MarsWaterTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MarsWater.app/MarsWater"; + }; + name = Debug; + }; + 50B4EB521BC1AE950068BF21 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + INFOPLIST_FILE = MarsWaterTests/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = jovannyespinal.MarsWaterTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MarsWater.app/MarsWater"; + }; + name = Release; + }; + 50B4EB541BC1AE950068BF21 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + INFOPLIST_FILE = MarsWaterUITests/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = jovannyespinal.MarsWaterUITests; + PRODUCT_NAME = "$(TARGET_NAME)"; + TEST_TARGET_NAME = MarsWater; + USES_XCTRUNNER = YES; + }; + name = Debug; + }; + 50B4EB551BC1AE950068BF21 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + INFOPLIST_FILE = MarsWaterUITests/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = jovannyespinal.MarsWaterUITests; + PRODUCT_NAME = "$(TARGET_NAME)"; + TEST_TARGET_NAME = MarsWater; + USES_XCTRUNNER = YES; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 50B4EB181BC1AE940068BF21 /* Build configuration list for PBXProject "MarsWater" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 50B4EB4B1BC1AE950068BF21 /* Debug */, + 50B4EB4C1BC1AE950068BF21 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 50B4EB4D1BC1AE950068BF21 /* Build configuration list for PBXNativeTarget "MarsWater" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 50B4EB4E1BC1AE950068BF21 /* Debug */, + 50B4EB4F1BC1AE950068BF21 /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; + 50B4EB501BC1AE950068BF21 /* Build configuration list for PBXNativeTarget "MarsWaterTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 50B4EB511BC1AE950068BF21 /* Debug */, + 50B4EB521BC1AE950068BF21 /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; + 50B4EB531BC1AE950068BF21 /* Build configuration list for PBXNativeTarget "MarsWaterUITests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 50B4EB541BC1AE950068BF21 /* Debug */, + 50B4EB551BC1AE950068BF21 /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; +/* End XCConfigurationList section */ + +/* Begin XCVersionGroup section */ + 50B4EB2C1BC1AE940068BF21 /* MarsWater.xcdatamodeld */ = { + isa = XCVersionGroup; + children = ( + 50B4EB2D1BC1AE940068BF21 /* MarsWater.xcdatamodel */, + ); + currentVersion = 50B4EB2D1BC1AE940068BF21 /* MarsWater.xcdatamodel */; + path = MarsWater.xcdatamodeld; + sourceTree = ""; + versionGroupType = wrapper.xcdatamodel; + }; +/* End XCVersionGroup section */ + }; + rootObject = 50B4EB151BC1AE940068BF21 /* Project object */; +} diff --git a/SavingForever/SavingForever.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/MarsWater/MarsWater.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 68% rename from SavingForever/SavingForever.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to MarsWater/MarsWater.xcodeproj/project.xcworkspace/contents.xcworkspacedata index 43eb427..4acdfe2 100644 --- a/SavingForever/SavingForever.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/MarsWater/MarsWater.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:MarsWater.xcodeproj"> diff --git a/SavingForever/SavingForever/AppDelegate.h b/MarsWater/MarsWater/AppDelegate.h similarity index 81% rename from SavingForever/SavingForever/AppDelegate.h rename to MarsWater/MarsWater/AppDelegate.h index 6657831..e2a048a 100644 --- a/SavingForever/SavingForever/AppDelegate.h +++ b/MarsWater/MarsWater/AppDelegate.h @@ -1,9 +1,9 @@ // // AppDelegate.h -// SavingForever +// MarsWater // -// Created by Michael Kavouras on 10/4/15. -// Copyright © 2015 Michael Kavouras. All rights reserved. +// Created by Jovanny Espinal on 10/4/15. +// Copyright © 2015 Jovanny Espinal. All rights reserved. // #import diff --git a/SavingForever/SavingForever/AppDelegate.m b/MarsWater/MarsWater/AppDelegate.m similarity index 93% rename from SavingForever/SavingForever/AppDelegate.m rename to MarsWater/MarsWater/AppDelegate.m index 29b2305..1c58daf 100644 --- a/SavingForever/SavingForever/AppDelegate.m +++ b/MarsWater/MarsWater/AppDelegate.m @@ -1,9 +1,9 @@ // // AppDelegate.m -// SavingForever +// MarsWater // -// Created by Michael Kavouras on 10/4/15. -// Copyright © 2015 Michael Kavouras. All rights reserved. +// Created by Jovanny Espinal on 10/4/15. +// Copyright © 2015 Jovanny Espinal. All rights reserved. // #import "AppDelegate.h" @@ -51,7 +51,7 @@ - (void)applicationWillTerminate:(UIApplication *)application { @synthesize persistentStoreCoordinator = _persistentStoreCoordinator; - (NSURL *)applicationDocumentsDirectory { - // The directory the application uses to store the Core Data store file. This code uses a directory named "com.mikekavouras.SavingForever" in the application's documents directory. + // The directory the application uses to store the Core Data store file. This code uses a directory named "jovannyespinal.MarsWater" in the application's documents directory. return [[[NSFileManager defaultManager] URLsForDirectory:NSDocumentDirectory inDomains:NSUserDomainMask] lastObject]; } @@ -60,7 +60,7 @@ - (NSManagedObjectModel *)managedObjectModel { if (_managedObjectModel != nil) { return _managedObjectModel; } - NSURL *modelURL = [[NSBundle mainBundle] URLForResource:@"SavingForever" withExtension:@"momd"]; + NSURL *modelURL = [[NSBundle mainBundle] URLForResource:@"MarsWater" withExtension:@"momd"]; _managedObjectModel = [[NSManagedObjectModel alloc] initWithContentsOfURL:modelURL]; return _managedObjectModel; } @@ -74,7 +74,7 @@ - (NSPersistentStoreCoordinator *)persistentStoreCoordinator { // Create the coordinator and store _persistentStoreCoordinator = [[NSPersistentStoreCoordinator alloc] initWithManagedObjectModel:[self managedObjectModel]]; - NSURL *storeURL = [[self applicationDocumentsDirectory] URLByAppendingPathComponent:@"SavingForever.sqlite"]; + NSURL *storeURL = [[self applicationDocumentsDirectory] URLByAppendingPathComponent:@"MarsWater.sqlite"]; NSError *error = nil; NSString *failureReason = @"There was an error creating or loading the application's saved data."; if (![_persistentStoreCoordinator addPersistentStoreWithType:NSSQLiteStoreType configuration:nil URL:storeURL options:nil error:&error]) { diff --git a/SavingForever/SavingForever/Assets.xcassets/AppIcon.appiconset/Contents.json b/MarsWater/MarsWater/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from SavingForever/SavingForever/Assets.xcassets/AppIcon.appiconset/Contents.json rename to MarsWater/MarsWater/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/SavingForever/SavingForever/Base.lproj/LaunchScreen.storyboard b/MarsWater/MarsWater/Base.lproj/LaunchScreen.storyboard similarity index 84% rename from SavingForever/SavingForever/Base.lproj/LaunchScreen.storyboard rename to MarsWater/MarsWater/Base.lproj/LaunchScreen.storyboard index 2e721e1..900bc17 100644 --- a/SavingForever/SavingForever/Base.lproj/LaunchScreen.storyboard +++ b/MarsWater/MarsWater/Base.lproj/LaunchScreen.storyboard @@ -1,7 +1,7 @@ - + - + diff --git a/MarsWater/MarsWater/Base.lproj/Main.storyboard b/MarsWater/MarsWater/Base.lproj/Main.storyboard new file mode 100644 index 0000000..34714b4 --- /dev/null +++ b/MarsWater/MarsWater/Base.lproj/Main.storyboard @@ -0,0 +1,210 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SavingForever/SavingForever/Info.plist b/MarsWater/MarsWater/Info.plist similarity index 100% rename from SavingForever/SavingForever/Info.plist rename to MarsWater/MarsWater/Info.plist diff --git a/MarsWater/MarsWater/List+CoreDataProperties.h b/MarsWater/MarsWater/List+CoreDataProperties.h new file mode 100644 index 0000000..7288053 --- /dev/null +++ b/MarsWater/MarsWater/List+CoreDataProperties.h @@ -0,0 +1,25 @@ +// +// List+CoreDataProperties.h +// MarsWater +// +// Created by Jovanny Espinal on 10/4/15. +// Copyright © 2015 Jovanny Espinal. All rights reserved. +// +// Choose "Create NSManagedObject Subclass…" from the Core Data editor menu +// to delete and recreate this implementation file for your updated model. +// + +#import "List.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface List (CoreDataProperties) + +@property (nullable, nonatomic, retain) NSString *title; +@property (nullable, nonatomic, retain) id color; +@property (nullable, nonatomic, retain) NSDate *createdAt; +@property (nullable, nonatomic, retain) NSArray *task; + +@end + +NS_ASSUME_NONNULL_END diff --git a/MarsWater/MarsWater/List+CoreDataProperties.m b/MarsWater/MarsWater/List+CoreDataProperties.m new file mode 100644 index 0000000..90014b6 --- /dev/null +++ b/MarsWater/MarsWater/List+CoreDataProperties.m @@ -0,0 +1,21 @@ +// +// List+CoreDataProperties.m +// MarsWater +// +// Created by Jovanny Espinal on 10/4/15. +// Copyright © 2015 Jovanny Espinal. All rights reserved. +// +// Choose "Create NSManagedObject Subclass…" from the Core Data editor menu +// to delete and recreate this implementation file for your updated model. +// + +#import "List+CoreDataProperties.h" + +@implementation List (CoreDataProperties) + +@dynamic title; +@dynamic color; +@dynamic createdAt; +@dynamic task; + +@end diff --git a/MarsWater/MarsWater/List.h b/MarsWater/MarsWater/List.h new file mode 100644 index 0000000..4c4be41 --- /dev/null +++ b/MarsWater/MarsWater/List.h @@ -0,0 +1,22 @@ +// +// List.h +// MarsWater +// +// Created by Jovanny Espinal on 10/4/15. +// Copyright © 2015 Jovanny Espinal. All rights reserved. +// + +#import +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface List : NSManagedObject + +// Insert code here to declare functionality of your managed object subclass + +@end + +NS_ASSUME_NONNULL_END + +#import "List+CoreDataProperties.h" diff --git a/MarsWater/MarsWater/List.m b/MarsWater/MarsWater/List.m new file mode 100644 index 0000000..2adb547 --- /dev/null +++ b/MarsWater/MarsWater/List.m @@ -0,0 +1,15 @@ +// +// List.m +// MarsWater +// +// Created by Jovanny Espinal on 10/4/15. +// Copyright © 2015 Jovanny Espinal. All rights reserved. +// + +#import "List.h" + +@implementation List + +// Insert code here to add functionality to your managed object subclass + +@end diff --git a/MarsWater/MarsWater/ListCreationTableViewController.h b/MarsWater/MarsWater/ListCreationTableViewController.h new file mode 100644 index 0000000..1a146ab --- /dev/null +++ b/MarsWater/MarsWater/ListCreationTableViewController.h @@ -0,0 +1,13 @@ +// +// ListCreationTableViewController.h +// MarsWater +// +// Created by Jovanny Espinal on 10/4/15. +// Copyright © 2015 Jovanny Espinal. All rights reserved. +// + +#import + +@interface ListCreationTableViewController : UITableViewController + +@end diff --git a/MarsWater/MarsWater/ListCreationTableViewController.m b/MarsWater/MarsWater/ListCreationTableViewController.m new file mode 100644 index 0000000..aa8d6d3 --- /dev/null +++ b/MarsWater/MarsWater/ListCreationTableViewController.m @@ -0,0 +1,65 @@ +// +// ListCreationTableViewController.m +// MarsWater +// +// Created by Jovanny Espinal on 10/4/15. +// Copyright © 2015 Jovanny Espinal. All rights reserved. +// + +#import +#import "ListCreationTableViewController.h" +#import "List.h" +#import "AppDelegate.h" + +@interface ListCreationTableViewController () +@property (weak, nonatomic) IBOutlet UITextField *titleTextField; +@property (nonatomic)List *list; + +@end + +@implementation ListCreationTableViewController + +-(void)viewDidLoad{ + [super viewDidLoad]; + + [self setupNavigationBar]; + + AppDelegate *delegate = [UIApplication sharedApplication].delegate; + + self.list = [NSEntityDescription insertNewObjectForEntityForName:@"List" inManagedObjectContext:delegate.managedObjectContext]; + + NSLog(@"%@", self.list); +} + +-(void)setupNavigationBar{ + //Set the title + self.navigationController.title = @"Create New List"; + + //Set the left bar to cancel + self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel target:self action:@selector(cancel)]; + + //Set the right button to save + self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemSave target:self action:@selector(save)]; +} + +-(void)save{ + self.list.title = self.titleTextField.text; + self.list.createdAt = [NSDate date]; + + + AppDelegate *delegate = [UIApplication sharedApplication].delegate; + [delegate.managedObjectContext save:nil]; + [self cancel]; + NSLog(@"%@", self.list); + + +} + +-(void)cancel{ + [self dismissViewControllerAnimated:true completion:nil]; +} +- (IBAction)colorButtonTapped:(UIButton *)sender{ + self.list.color = sender.backgroundColor; +} + +@end diff --git a/MarsWater/MarsWater/ListTableViewController.h b/MarsWater/MarsWater/ListTableViewController.h new file mode 100644 index 0000000..27620af --- /dev/null +++ b/MarsWater/MarsWater/ListTableViewController.h @@ -0,0 +1,13 @@ +// +// ListTableViewController.h +// MarsWater +// +// Created by Jovanny Espinal on 10/4/15. +// Copyright © 2015 Jovanny Espinal. All rights reserved. +// + +#import + +@interface ListTableViewController : UITableViewController + +@end diff --git a/MarsWater/MarsWater/ListTableViewController.m b/MarsWater/MarsWater/ListTableViewController.m new file mode 100644 index 0000000..fd476e1 --- /dev/null +++ b/MarsWater/MarsWater/ListTableViewController.m @@ -0,0 +1,81 @@ +// +// ListTableViewController.m +// MarsWater +// +// Created by Jovanny Espinal on 10/4/15. +// Copyright © 2015 Jovanny Espinal. All rights reserved. +// + +#import +#import "ListTableViewController.h" +#import "AppDelegate.h" +#import "List.h" + +@interface ListTableViewController () + +@property (nonatomic) NSFetchedResultsController *fetchedResultsController; + +@end + +@implementation ListTableViewController + +- (void)viewDidLoad { + [super viewDidLoad]; + + + + AppDelegate *delegate = [UIApplication sharedApplication].delegate; + + NSFetchRequest *fetchRequest = [[NSFetchRequest alloc] initWithEntityName:@"List"]; + NSSortDescriptor *sort = [[NSSortDescriptor alloc]initWithKey:@"createdAt" ascending:NO]; + + fetchRequest.sortDescriptors = @[sort]; + + self.fetchedResultsController = [[NSFetchedResultsController alloc] initWithFetchRequest:fetchRequest managedObjectContext:delegate.managedObjectContext sectionNameKeyPath:nil cacheName:nil]; + + self.fetchedResultsController.delegate = self; + + [self.fetchedResultsController performFetch:nil]; + + + + [self.tableView reloadData]; + +} + +- (void)didReceiveMemoryWarning { + [super didReceiveMemoryWarning]; + // Dispose of any resources that can be recreated. +} + +#pragma mark - Table view data source + +- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { + + return 1; +} + +- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { + + return self.fetchedResultsController.fetchedObjects.count; +} + +- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{ + + UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"ListCellIdentifier" forIndexPath:indexPath]; + + List *list = self.fetchedResultsController.fetchedObjects[indexPath.row]; + + cell.textLabel.text = list.title; + cell.textLabel.textColor = (UIColor *)list.color; + cell.detailTextLabel.text = [list.createdAt description]; + + return cell; +} + +- (void)controller:(NSFetchedResultsController *)controller didChangeObject:(id)anObject atIndexPath:(NSIndexPath *)indexPath forChangeType:(NSFetchedResultsChangeType)type newIndexPath:(NSIndexPath *)newIndexPath{ + + [self.tableView reloadData]; +} + +@end diff --git a/SavingForever/SavingForever/SavingForever.xcdatamodeld/.xccurrentversion b/MarsWater/MarsWater/MarsWater.xcdatamodeld/.xccurrentversion similarity index 83% rename from SavingForever/SavingForever/SavingForever.xcdatamodeld/.xccurrentversion rename to MarsWater/MarsWater/MarsWater.xcdatamodeld/.xccurrentversion index 352ed15..5c0cbd5 100644 --- a/SavingForever/SavingForever/SavingForever.xcdatamodeld/.xccurrentversion +++ b/MarsWater/MarsWater/MarsWater.xcdatamodeld/.xccurrentversion @@ -3,6 +3,6 @@ _XCCurrentVersionName - SavingForever.xcdatamodel + MarsWater.xcdatamodel diff --git a/MarsWater/MarsWater/MarsWater.xcdatamodeld/MarsWater.xcdatamodel/contents b/MarsWater/MarsWater/MarsWater.xcdatamodeld/MarsWater.xcdatamodel/contents new file mode 100644 index 0000000..5dc6d1c --- /dev/null +++ b/MarsWater/MarsWater/MarsWater.xcdatamodeld/MarsWater.xcdatamodel/contents @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MarsWater/MarsWater/Task+CoreDataProperties.h b/MarsWater/MarsWater/Task+CoreDataProperties.h new file mode 100644 index 0000000..f9ce5ea --- /dev/null +++ b/MarsWater/MarsWater/Task+CoreDataProperties.h @@ -0,0 +1,28 @@ +// +// Task+CoreDataProperties.h +// MarsWater +// +// Created by Jovanny Espinal on 10/4/15. +// Copyright © 2015 Jovanny Espinal. All rights reserved. +// +// Choose "Create NSManagedObject Subclass…" from the Core Data editor menu +// to delete and recreate this implementation file for your updated model. +// + +#import "Task.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface Task (CoreDataProperties) + +@property (nullable, nonatomic, retain) NSString *taskDescription; +@property (nullable, nonatomic, retain) NSDate *createdAt; +@property (nullable, nonatomic, retain) NSDate *dueAt; +@property (nullable, nonatomic, retain) NSDate *updatedAt; +@property (nullable, nonatomic, retain) NSNumber *priority; +@property (nullable, nonatomic, retain) NSDate *completedAt; +@property (nullable, nonatomic, retain) Task *list; + +@end + +NS_ASSUME_NONNULL_END diff --git a/MarsWater/MarsWater/Task+CoreDataProperties.m b/MarsWater/MarsWater/Task+CoreDataProperties.m new file mode 100644 index 0000000..cf1b1ef --- /dev/null +++ b/MarsWater/MarsWater/Task+CoreDataProperties.m @@ -0,0 +1,24 @@ +// +// Task+CoreDataProperties.m +// MarsWater +// +// Created by Jovanny Espinal on 10/4/15. +// Copyright © 2015 Jovanny Espinal. All rights reserved. +// +// Choose "Create NSManagedObject Subclass…" from the Core Data editor menu +// to delete and recreate this implementation file for your updated model. +// + +#import "Task+CoreDataProperties.h" + +@implementation Task (CoreDataProperties) + +@dynamic taskDescription; +@dynamic createdAt; +@dynamic dueAt; +@dynamic updatedAt; +@dynamic priority; +@dynamic completedAt; +@dynamic list; + +@end diff --git a/MarsWater/MarsWater/Task.h b/MarsWater/MarsWater/Task.h new file mode 100644 index 0000000..9c3eb50 --- /dev/null +++ b/MarsWater/MarsWater/Task.h @@ -0,0 +1,22 @@ +// +// Task.h +// MarsWater +// +// Created by Jovanny Espinal on 10/4/15. +// Copyright © 2015 Jovanny Espinal. All rights reserved. +// + +#import +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface Task : NSManagedObject + +// Insert code here to declare functionality of your managed object subclass + +@end + +NS_ASSUME_NONNULL_END + +#import "Task+CoreDataProperties.h" diff --git a/MarsWater/MarsWater/Task.m b/MarsWater/MarsWater/Task.m new file mode 100644 index 0000000..a43d6a1 --- /dev/null +++ b/MarsWater/MarsWater/Task.m @@ -0,0 +1,15 @@ +// +// Task.m +// MarsWater +// +// Created by Jovanny Espinal on 10/4/15. +// Copyright © 2015 Jovanny Espinal. All rights reserved. +// + +#import "Task.h" + +@implementation Task + +// Insert code here to add functionality to your managed object subclass + +@end diff --git a/SavingForever/SavingForever/main.m b/MarsWater/MarsWater/main.m similarity index 64% rename from SavingForever/SavingForever/main.m rename to MarsWater/MarsWater/main.m index 0d1314d..675b2ee 100644 --- a/SavingForever/SavingForever/main.m +++ b/MarsWater/MarsWater/main.m @@ -1,9 +1,9 @@ // // main.m -// SavingForever +// MarsWater // -// Created by Michael Kavouras on 10/4/15. -// Copyright © 2015 Michael Kavouras. All rights reserved. +// Created by Jovanny Espinal on 10/4/15. +// Copyright © 2015 Jovanny Espinal. All rights reserved. // #import diff --git a/MarsWater/MarsWaterTests/Info.plist b/MarsWater/MarsWaterTests/Info.plist new file mode 100644 index 0000000..ba72822 --- /dev/null +++ b/MarsWater/MarsWaterTests/Info.plist @@ -0,0 +1,24 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + BNDL + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1 + + diff --git a/MarsWater/MarsWaterTests/MarsWaterTests.m b/MarsWater/MarsWaterTests/MarsWaterTests.m new file mode 100644 index 0000000..53f08e0 --- /dev/null +++ b/MarsWater/MarsWaterTests/MarsWaterTests.m @@ -0,0 +1,39 @@ +// +// MarsWaterTests.m +// MarsWaterTests +// +// Created by Jovanny Espinal on 10/4/15. +// Copyright © 2015 Jovanny Espinal. All rights reserved. +// + +#import + +@interface MarsWaterTests : XCTestCase + +@end + +@implementation MarsWaterTests + +- (void)setUp { + [super setUp]; + // Put setup code here. This method is called before the invocation of each test method in the class. +} + +- (void)tearDown { + // Put teardown code here. This method is called after the invocation of each test method in the class. + [super tearDown]; +} + +- (void)testExample { + // This is an example of a functional test case. + // Use XCTAssert and related functions to verify your tests produce the correct results. +} + +- (void)testPerformanceExample { + // This is an example of a performance test case. + [self measureBlock:^{ + // Put the code you want to measure the time of here. + }]; +} + +@end diff --git a/MarsWater/MarsWaterUITests/Info.plist b/MarsWater/MarsWaterUITests/Info.plist new file mode 100644 index 0000000..ba72822 --- /dev/null +++ b/MarsWater/MarsWaterUITests/Info.plist @@ -0,0 +1,24 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + BNDL + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1 + + diff --git a/MarsWater/MarsWaterUITests/MarsWaterUITests.m b/MarsWater/MarsWaterUITests/MarsWaterUITests.m new file mode 100644 index 0000000..b1acedf --- /dev/null +++ b/MarsWater/MarsWaterUITests/MarsWaterUITests.m @@ -0,0 +1,40 @@ +// +// MarsWaterUITests.m +// MarsWaterUITests +// +// Created by Jovanny Espinal on 10/4/15. +// Copyright © 2015 Jovanny Espinal. All rights reserved. +// + +#import + +@interface MarsWaterUITests : XCTestCase + +@end + +@implementation MarsWaterUITests + +- (void)setUp { + [super setUp]; + + // Put setup code here. This method is called before the invocation of each test method in the class. + + // In UI tests it is usually best to stop immediately when a failure occurs. + self.continueAfterFailure = NO; + // UI tests must launch the application that they test. Doing this in setup will make sure it happens for each test method. + [[[XCUIApplication alloc] init] launch]; + + // In UI tests it’s important to set the initial state - such as interface orientation - required for your tests before they run. The setUp method is a good place to do this. +} + +- (void)tearDown { + // Put teardown code here. This method is called after the invocation of each test method in the class. + [super tearDown]; +} + +- (void)testExample { + // Use recording to get started writing UI tests. + // Use XCTAssert and related functions to verify your tests produce the correct results. +} + +@end diff --git a/SavingForever/SavingForever.xcodeproj/project.pbxproj b/SavingForever/SavingForever.xcodeproj/project.pbxproj deleted file mode 100644 index cbf89e2..0000000 --- a/SavingForever/SavingForever.xcodeproj/project.pbxproj +++ /dev/null @@ -1,322 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 46; - objects = { - -/* Begin PBXBuildFile section */ - 8D2949671BC1D06E00FDC81F /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D2949661BC1D06E00FDC81F /* main.m */; }; - 8D29496A1BC1D06E00FDC81F /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D2949691BC1D06E00FDC81F /* AppDelegate.m */; }; - 8D29496D1BC1D06E00FDC81F /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D29496C1BC1D06E00FDC81F /* ViewController.m */; }; - 8D2949701BC1D06E00FDC81F /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8D29496E1BC1D06E00FDC81F /* Main.storyboard */; }; - 8D2949731BC1D06E00FDC81F /* SavingForever.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 8D2949711BC1D06E00FDC81F /* SavingForever.xcdatamodeld */; }; - 8D2949751BC1D06E00FDC81F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8D2949741BC1D06E00FDC81F /* Assets.xcassets */; }; - 8D2949781BC1D06E00FDC81F /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8D2949761BC1D06E00FDC81F /* LaunchScreen.storyboard */; }; -/* End PBXBuildFile section */ - -/* Begin PBXFileReference section */ - 8D2949621BC1D06E00FDC81F /* SavingForever.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SavingForever.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 8D2949661BC1D06E00FDC81F /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; - 8D2949681BC1D06E00FDC81F /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; - 8D2949691BC1D06E00FDC81F /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; - 8D29496B1BC1D06E00FDC81F /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = ""; }; - 8D29496C1BC1D06E00FDC81F /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = ""; }; - 8D29496F1BC1D06E00FDC81F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; - 8D2949721BC1D06E00FDC81F /* SavingForever.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = SavingForever.xcdatamodel; sourceTree = ""; }; - 8D2949741BC1D06E00FDC81F /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - 8D2949771BC1D06E00FDC81F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; - 8D2949791BC1D06E00FDC81F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 8D29495F1BC1D06E00FDC81F /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 8D2949591BC1D06D00FDC81F = { - isa = PBXGroup; - children = ( - 8D2949641BC1D06E00FDC81F /* SavingForever */, - 8D2949631BC1D06E00FDC81F /* Products */, - ); - sourceTree = ""; - }; - 8D2949631BC1D06E00FDC81F /* Products */ = { - isa = PBXGroup; - children = ( - 8D2949621BC1D06E00FDC81F /* SavingForever.app */, - ); - name = Products; - sourceTree = ""; - }; - 8D2949641BC1D06E00FDC81F /* SavingForever */ = { - isa = PBXGroup; - children = ( - 8D2949681BC1D06E00FDC81F /* AppDelegate.h */, - 8D2949691BC1D06E00FDC81F /* AppDelegate.m */, - 8D29496B1BC1D06E00FDC81F /* ViewController.h */, - 8D29496C1BC1D06E00FDC81F /* ViewController.m */, - 8D29496E1BC1D06E00FDC81F /* Main.storyboard */, - 8D2949741BC1D06E00FDC81F /* Assets.xcassets */, - 8D2949761BC1D06E00FDC81F /* LaunchScreen.storyboard */, - 8D2949791BC1D06E00FDC81F /* Info.plist */, - 8D2949711BC1D06E00FDC81F /* SavingForever.xcdatamodeld */, - 8D2949651BC1D06E00FDC81F /* Supporting Files */, - ); - path = SavingForever; - sourceTree = ""; - }; - 8D2949651BC1D06E00FDC81F /* Supporting Files */ = { - isa = PBXGroup; - children = ( - 8D2949661BC1D06E00FDC81F /* main.m */, - ); - name = "Supporting Files"; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 8D2949611BC1D06E00FDC81F /* SavingForever */ = { - isa = PBXNativeTarget; - buildConfigurationList = 8D29497C1BC1D06E00FDC81F /* Build configuration list for PBXNativeTarget "SavingForever" */; - buildPhases = ( - 8D29495E1BC1D06E00FDC81F /* Sources */, - 8D29495F1BC1D06E00FDC81F /* Frameworks */, - 8D2949601BC1D06E00FDC81F /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = SavingForever; - productName = SavingForever; - productReference = 8D2949621BC1D06E00FDC81F /* SavingForever.app */; - productType = "com.apple.product-type.application"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 8D29495A1BC1D06D00FDC81F /* Project object */ = { - isa = PBXProject; - attributes = { - LastUpgradeCheck = 0700; - ORGANIZATIONNAME = "Michael Kavouras"; - TargetAttributes = { - 8D2949611BC1D06E00FDC81F = { - CreatedOnToolsVersion = 7.0.1; - }; - }; - }; - buildConfigurationList = 8D29495D1BC1D06D00FDC81F /* Build configuration list for PBXProject "SavingForever" */; - compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; - hasScannedForEncodings = 0; - knownRegions = ( - en, - Base, - ); - mainGroup = 8D2949591BC1D06D00FDC81F; - productRefGroup = 8D2949631BC1D06E00FDC81F /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 8D2949611BC1D06E00FDC81F /* SavingForever */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 8D2949601BC1D06E00FDC81F /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 8D2949781BC1D06E00FDC81F /* LaunchScreen.storyboard in Resources */, - 8D2949751BC1D06E00FDC81F /* Assets.xcassets in Resources */, - 8D2949701BC1D06E00FDC81F /* Main.storyboard in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 8D29495E1BC1D06E00FDC81F /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 8D29496D1BC1D06E00FDC81F /* ViewController.m in Sources */, - 8D29496A1BC1D06E00FDC81F /* AppDelegate.m in Sources */, - 8D2949671BC1D06E00FDC81F /* main.m in Sources */, - 8D2949731BC1D06E00FDC81F /* SavingForever.xcdatamodeld in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXVariantGroup section */ - 8D29496E1BC1D06E00FDC81F /* Main.storyboard */ = { - isa = PBXVariantGroup; - children = ( - 8D29496F1BC1D06E00FDC81F /* Base */, - ); - name = Main.storyboard; - sourceTree = ""; - }; - 8D2949761BC1D06E00FDC81F /* LaunchScreen.storyboard */ = { - isa = PBXVariantGroup; - children = ( - 8D2949771BC1D06E00FDC81F /* Base */, - ); - name = LaunchScreen.storyboard; - sourceTree = ""; - }; -/* End PBXVariantGroup section */ - -/* Begin XCBuildConfiguration section */ - 8D29497A1BC1D06E00FDC81F /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = iphoneos; - }; - name = Debug; - }; - 8D29497B1BC1D06E00FDC81F /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; - MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = iphoneos; - VALIDATE_PRODUCT = YES; - }; - name = Release; - }; - 8D29497D1BC1D06E00FDC81F /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - INFOPLIST_FILE = SavingForever/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.mikekavouras.SavingForever; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - 8D29497E1BC1D06E00FDC81F /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - INFOPLIST_FILE = SavingForever/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.mikekavouras.SavingForever; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 8D29495D1BC1D06D00FDC81F /* Build configuration list for PBXProject "SavingForever" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 8D29497A1BC1D06E00FDC81F /* Debug */, - 8D29497B1BC1D06E00FDC81F /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 8D29497C1BC1D06E00FDC81F /* Build configuration list for PBXNativeTarget "SavingForever" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 8D29497D1BC1D06E00FDC81F /* Debug */, - 8D29497E1BC1D06E00FDC81F /* Release */, - ); - defaultConfigurationIsVisible = 0; - }; -/* End XCConfigurationList section */ - -/* Begin XCVersionGroup section */ - 8D2949711BC1D06E00FDC81F /* SavingForever.xcdatamodeld */ = { - isa = XCVersionGroup; - children = ( - 8D2949721BC1D06E00FDC81F /* SavingForever.xcdatamodel */, - ); - currentVersion = 8D2949721BC1D06E00FDC81F /* SavingForever.xcdatamodel */; - path = SavingForever.xcdatamodeld; - sourceTree = ""; - versionGroupType = wrapper.xcdatamodel; - }; -/* End XCVersionGroup section */ - }; - rootObject = 8D29495A1BC1D06D00FDC81F /* Project object */; -} diff --git a/SavingForever/SavingForever/Base.lproj/Main.storyboard b/SavingForever/SavingForever/Base.lproj/Main.storyboard deleted file mode 100644 index f56d2f3..0000000 --- a/SavingForever/SavingForever/Base.lproj/Main.storyboard +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SavingForever/SavingForever/SavingForever.xcdatamodeld/SavingForever.xcdatamodel/contents b/SavingForever/SavingForever/SavingForever.xcdatamodeld/SavingForever.xcdatamodel/contents deleted file mode 100644 index 193f33c..0000000 --- a/SavingForever/SavingForever/SavingForever.xcdatamodeld/SavingForever.xcdatamodel/contents +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/SavingForever/SavingForever/ViewController.h b/SavingForever/SavingForever/ViewController.h deleted file mode 100644 index b193f94..0000000 --- a/SavingForever/SavingForever/ViewController.h +++ /dev/null @@ -1,15 +0,0 @@ -// -// ViewController.h -// SavingForever -// -// Created by Michael Kavouras on 10/4/15. -// Copyright © 2015 Michael Kavouras. All rights reserved. -// - -#import - -@interface ViewController : UIViewController - - -@end - diff --git a/SavingForever/SavingForever/ViewController.m b/SavingForever/SavingForever/ViewController.m deleted file mode 100644 index 5f1f663..0000000 --- a/SavingForever/SavingForever/ViewController.m +++ /dev/null @@ -1,27 +0,0 @@ -// -// ViewController.m -// SavingForever -// -// Created by Michael Kavouras on 10/4/15. -// Copyright © 2015 Michael 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 155cbd8ca8b2e174fcae74bc85d338db36d28a93 Mon Sep 17 00:00:00 2001 From: JovannyEspinal Date: Fri, 9 Oct 2015 15:14:01 -0400 Subject: [PATCH 2/3] Ability to add lists and add tasks to the specific list. No other functionality --- MarsWater/MarsWater.xcodeproj/project.pbxproj | 454 +++++------------- MarsWater/MarsWater/AppDelegate.h | 4 +- MarsWater/MarsWater/AppDelegate.m | 6 +- .../Base.lproj/LaunchScreen.storyboard | 4 +- .../MarsWater/Base.lproj/Main.storyboard | 323 +++++++++---- MarsWater/MarsWater/List+CoreDataProperties.h | 8 +- MarsWater/MarsWater/List+CoreDataProperties.m | 6 +- MarsWater/MarsWater/List.h | 4 +- MarsWater/MarsWater/List.m | 4 +- .../ListCreationTableViewController.h | 4 +- .../ListCreationTableViewController.m | 38 +- MarsWater/MarsWater/ListTableViewController.h | 13 - .../MarsWater/ListsTableViewController.h | 13 + ...ontroller.m => ListsTableViewController.m} | 54 ++- .../MarsWater.xcdatamodel/contents | 8 +- MarsWater/MarsWater/Task+CoreDataProperties.h | 6 +- MarsWater/MarsWater/Task+CoreDataProperties.m | 4 +- MarsWater/MarsWater/Task.h | 6 +- MarsWater/MarsWater/Task.m | 5 +- .../TaskCreationTableViewController.h | 16 + .../TaskCreationTableViewController.m | 54 +++ .../MarsWater/TasksTableViewController.h | 15 + .../MarsWater/TasksTableViewController.m | 58 +++ MarsWater/MarsWater/main.m | 6 +- MarsWater/MarsWaterTests/Info.plist | 24 - MarsWater/MarsWaterTests/MarsWaterTests.m | 39 -- MarsWater/MarsWaterUITests/Info.plist | 24 - MarsWater/MarsWaterUITests/MarsWaterUITests.m | 40 -- 28 files changed, 605 insertions(+), 635 deletions(-) delete mode 100644 MarsWater/MarsWater/ListTableViewController.h create mode 100644 MarsWater/MarsWater/ListsTableViewController.h rename MarsWater/MarsWater/{ListTableViewController.m => ListsTableViewController.m} (57%) 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 delete mode 100644 MarsWater/MarsWaterTests/Info.plist delete mode 100644 MarsWater/MarsWaterTests/MarsWaterTests.m delete mode 100644 MarsWater/MarsWaterUITests/Info.plist delete mode 100644 MarsWater/MarsWaterUITests/MarsWaterUITests.m diff --git a/MarsWater/MarsWater.xcodeproj/project.pbxproj b/MarsWater/MarsWater.xcodeproj/project.pbxproj index 94b5b59..0e76846 100644 --- a/MarsWater/MarsWater.xcodeproj/project.pbxproj +++ b/MarsWater/MarsWater.xcodeproj/project.pbxproj @@ -7,85 +7,52 @@ objects = { /* Begin PBXBuildFile section */ - 50B4EB221BC1AE940068BF21 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 50B4EB211BC1AE940068BF21 /* main.m */; }; - 50B4EB251BC1AE940068BF21 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 50B4EB241BC1AE940068BF21 /* AppDelegate.m */; }; - 50B4EB2B1BC1AE940068BF21 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50B4EB291BC1AE940068BF21 /* Main.storyboard */; }; - 50B4EB2E1BC1AE940068BF21 /* MarsWater.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 50B4EB2C1BC1AE940068BF21 /* MarsWater.xcdatamodeld */; }; - 50B4EB301BC1AE940068BF21 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 50B4EB2F1BC1AE940068BF21 /* Assets.xcassets */; }; - 50B4EB331BC1AE940068BF21 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50B4EB311BC1AE940068BF21 /* LaunchScreen.storyboard */; }; - 50B4EB3E1BC1AE950068BF21 /* MarsWaterTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 50B4EB3D1BC1AE950068BF21 /* MarsWaterTests.m */; }; - 50B4EB491BC1AE950068BF21 /* MarsWaterUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = 50B4EB481BC1AE950068BF21 /* MarsWaterUITests.m */; }; - 50B4EB621BC1B3200068BF21 /* List+CoreDataProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = 50B4EB5B1BC1B3200068BF21 /* List+CoreDataProperties.m */; settings = {ASSET_TAGS = (); }; }; - 50B4EB631BC1B3200068BF21 /* List.m in Sources */ = {isa = PBXBuildFile; fileRef = 50B4EB5D1BC1B3200068BF21 /* List.m */; settings = {ASSET_TAGS = (); }; }; - 50B4EB641BC1B3200068BF21 /* Task+CoreDataProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = 50B4EB5F1BC1B3200068BF21 /* Task+CoreDataProperties.m */; settings = {ASSET_TAGS = (); }; }; - 50B4EB651BC1B3200068BF21 /* Task.m in Sources */ = {isa = PBXBuildFile; fileRef = 50B4EB611BC1B3200068BF21 /* Task.m */; settings = {ASSET_TAGS = (); }; }; - 50B4EB681BC1B90A0068BF21 /* ListTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 50B4EB671BC1B90A0068BF21 /* ListTableViewController.m */; settings = {ASSET_TAGS = (); }; }; - 50B4EB6B1BC1B92C0068BF21 /* ListCreationTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 50B4EB6A1BC1B92C0068BF21 /* ListCreationTableViewController.m */; settings = {ASSET_TAGS = (); }; }; + 5054F1241BC83BFE0047FE54 /* TaskCreationTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5054F1231BC83BFE0047FE54 /* TaskCreationTableViewController.m */; settings = {ASSET_TAGS = (); }; }; + 5054F1271BC83C0B0047FE54 /* TasksTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5054F1261BC83C0B0047FE54 /* TasksTableViewController.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 */; }; + 8DA86CB51BC1AE57006C50BC /* MarsWater.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 8DA86CB31BC1AE57006C50BC /* MarsWater.xcdatamodeld */; }; + 8DA86CB71BC1AE57006C50BC /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8DA86CB61BC1AE57006C50BC /* Assets.xcassets */; }; + 8DA86CBA1BC1AE57006C50BC /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8DA86CB81BC1AE57006C50BC /* LaunchScreen.storyboard */; }; + 8DA86CD41BC1B8E4006C50BC /* ListsTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8DA86CD31BC1B8E4006C50BC /* ListsTableViewController.m */; }; + 8DA86CD71BC1B904006C50BC /* ListCreationTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8DA86CD61BC1B904006C50BC /* ListCreationTableViewController.m */; }; + 8DB2F6E71BC1E75500E58E65 /* List.m in Sources */ = {isa = PBXBuildFile; fileRef = 8DB2F6E01BC1E75500E58E65 /* List.m */; }; + 8DB2F6E81BC1E75500E58E65 /* List+CoreDataProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = 8DB2F6E21BC1E75500E58E65 /* List+CoreDataProperties.m */; }; + 8DB2F6E91BC1E75500E58E65 /* Task.m in Sources */ = {isa = PBXBuildFile; fileRef = 8DB2F6E41BC1E75500E58E65 /* Task.m */; }; + 8DB2F6EA1BC1E75500E58E65 /* Task+CoreDataProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = 8DB2F6E61BC1E75500E58E65 /* Task+CoreDataProperties.m */; }; /* End PBXBuildFile section */ -/* Begin PBXContainerItemProxy section */ - 50B4EB3A1BC1AE950068BF21 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 50B4EB151BC1AE940068BF21 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 50B4EB1C1BC1AE940068BF21; - remoteInfo = MarsWater; - }; - 50B4EB451BC1AE950068BF21 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 50B4EB151BC1AE940068BF21 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 50B4EB1C1BC1AE940068BF21; - remoteInfo = MarsWater; - }; -/* End PBXContainerItemProxy section */ - /* Begin PBXFileReference section */ - 50B4EB1D1BC1AE940068BF21 /* MarsWater.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MarsWater.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 50B4EB211BC1AE940068BF21 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; - 50B4EB231BC1AE940068BF21 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; - 50B4EB241BC1AE940068BF21 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; - 50B4EB2A1BC1AE940068BF21 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; - 50B4EB2D1BC1AE940068BF21 /* MarsWater.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = MarsWater.xcdatamodel; sourceTree = ""; }; - 50B4EB2F1BC1AE940068BF21 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - 50B4EB321BC1AE940068BF21 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; - 50B4EB341BC1AE940068BF21 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 50B4EB391BC1AE950068BF21 /* MarsWaterTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MarsWaterTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 50B4EB3D1BC1AE950068BF21 /* MarsWaterTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MarsWaterTests.m; sourceTree = ""; }; - 50B4EB3F1BC1AE950068BF21 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 50B4EB441BC1AE950068BF21 /* MarsWaterUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MarsWaterUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 50B4EB481BC1AE950068BF21 /* MarsWaterUITests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MarsWaterUITests.m; sourceTree = ""; }; - 50B4EB4A1BC1AE950068BF21 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 50B4EB5A1BC1B3200068BF21 /* List+CoreDataProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "List+CoreDataProperties.h"; path = "MarsWater/List+CoreDataProperties.h"; sourceTree = ""; }; - 50B4EB5B1BC1B3200068BF21 /* List+CoreDataProperties.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "List+CoreDataProperties.m"; path = "MarsWater/List+CoreDataProperties.m"; sourceTree = ""; }; - 50B4EB5C1BC1B3200068BF21 /* List.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = List.h; path = MarsWater/List.h; sourceTree = ""; }; - 50B4EB5D1BC1B3200068BF21 /* List.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = List.m; path = MarsWater/List.m; sourceTree = ""; }; - 50B4EB5E1BC1B3200068BF21 /* Task+CoreDataProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "Task+CoreDataProperties.h"; path = "MarsWater/Task+CoreDataProperties.h"; sourceTree = ""; }; - 50B4EB5F1BC1B3200068BF21 /* Task+CoreDataProperties.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "Task+CoreDataProperties.m"; path = "MarsWater/Task+CoreDataProperties.m"; sourceTree = ""; }; - 50B4EB601BC1B3200068BF21 /* Task.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Task.h; path = MarsWater/Task.h; sourceTree = ""; }; - 50B4EB611BC1B3200068BF21 /* Task.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Task.m; path = MarsWater/Task.m; sourceTree = ""; }; - 50B4EB661BC1B90A0068BF21 /* ListTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ListTableViewController.h; sourceTree = ""; }; - 50B4EB671BC1B90A0068BF21 /* ListTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ListTableViewController.m; sourceTree = ""; }; - 50B4EB691BC1B92C0068BF21 /* ListCreationTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ListCreationTableViewController.h; sourceTree = ""; }; - 50B4EB6A1BC1B92C0068BF21 /* ListCreationTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ListCreationTableViewController.m; sourceTree = ""; }; + 5054F1221BC83BFE0047FE54 /* TaskCreationTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TaskCreationTableViewController.h; sourceTree = ""; }; + 5054F1231BC83BFE0047FE54 /* TaskCreationTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TaskCreationTableViewController.m; sourceTree = ""; }; + 5054F1251BC83C0B0047FE54 /* TasksTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TasksTableViewController.h; sourceTree = ""; }; + 5054F1261BC83C0B0047FE54 /* TasksTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TasksTableViewController.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 = ""; }; + 8DA86CAB1BC1AE57006C50BC /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; + 8DA86CB11BC1AE57006C50BC /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + 8DA86CB41BC1AE57006C50BC /* MarsWater.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = MarsWater.xcdatamodel; sourceTree = ""; }; + 8DA86CB61BC1AE57006C50BC /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 8DA86CB91BC1AE57006C50BC /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; + 8DA86CBB1BC1AE57006C50BC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 8DA86CD21BC1B8E4006C50BC /* ListsTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ListsTableViewController.h; sourceTree = ""; }; + 8DA86CD31BC1B8E4006C50BC /* ListsTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ListsTableViewController.m; sourceTree = ""; }; + 8DA86CD51BC1B904006C50BC /* ListCreationTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ListCreationTableViewController.h; sourceTree = ""; }; + 8DA86CD61BC1B904006C50BC /* ListCreationTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ListCreationTableViewController.m; sourceTree = ""; }; + 8DB2F6DF1BC1E75500E58E65 /* List.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = List.h; sourceTree = ""; }; + 8DB2F6E01BC1E75500E58E65 /* List.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = List.m; sourceTree = ""; }; + 8DB2F6E11BC1E75500E58E65 /* List+CoreDataProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "List+CoreDataProperties.h"; sourceTree = ""; }; + 8DB2F6E21BC1E75500E58E65 /* List+CoreDataProperties.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "List+CoreDataProperties.m"; sourceTree = ""; }; + 8DB2F6E31BC1E75500E58E65 /* Task.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Task.h; sourceTree = ""; }; + 8DB2F6E41BC1E75500E58E65 /* Task.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Task.m; sourceTree = ""; }; + 8DB2F6E51BC1E75500E58E65 /* Task+CoreDataProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Task+CoreDataProperties.h"; sourceTree = ""; }; + 8DB2F6E61BC1E75500E58E65 /* Task+CoreDataProperties.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "Task+CoreDataProperties.m"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 50B4EB1A1BC1AE940068BF21 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 50B4EB361BC1AE950068BF21 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 50B4EB411BC1AE950068BF21 /* Frameworks */ = { + 8DA86CA11BC1AE57006C50BC /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( @@ -95,98 +62,79 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 50B4EB141BC1AE940068BF21 = { + 8DA86C9B1BC1AE57006C50BC = { isa = PBXGroup; children = ( - 50B4EB1F1BC1AE940068BF21 /* MarsWater */, - 50B4EB3C1BC1AE950068BF21 /* MarsWaterTests */, - 50B4EB471BC1AE950068BF21 /* MarsWaterUITests */, - 50B4EB1E1BC1AE940068BF21 /* Products */, + 8DA86CA61BC1AE57006C50BC /* MarsWater */, + 8DA86CA51BC1AE57006C50BC /* Products */, ); sourceTree = ""; }; - 50B4EB1E1BC1AE940068BF21 /* Products */ = { + 8DA86CA51BC1AE57006C50BC /* Products */ = { isa = PBXGroup; children = ( - 50B4EB1D1BC1AE940068BF21 /* MarsWater.app */, - 50B4EB391BC1AE950068BF21 /* MarsWaterTests.xctest */, - 50B4EB441BC1AE950068BF21 /* MarsWaterUITests.xctest */, + 8DA86CA41BC1AE57006C50BC /* MarsWater.app */, ); name = Products; sourceTree = ""; }; - 50B4EB1F1BC1AE940068BF21 /* MarsWater */ = { + 8DA86CA61BC1AE57006C50BC /* MarsWater */ = { isa = PBXGroup; children = ( - 50B4EB561BC1B2890068BF21 /* Model */, - 50B4EB231BC1AE940068BF21 /* AppDelegate.h */, - 50B4EB241BC1AE940068BF21 /* AppDelegate.m */, - 50B4EB661BC1B90A0068BF21 /* ListTableViewController.h */, - 50B4EB671BC1B90A0068BF21 /* ListTableViewController.m */, - 50B4EB691BC1B92C0068BF21 /* ListCreationTableViewController.h */, - 50B4EB6A1BC1B92C0068BF21 /* ListCreationTableViewController.m */, - 50B4EB291BC1AE940068BF21 /* Main.storyboard */, - 50B4EB2F1BC1AE940068BF21 /* Assets.xcassets */, - 50B4EB311BC1AE940068BF21 /* LaunchScreen.storyboard */, - 50B4EB341BC1AE940068BF21 /* Info.plist */, - 50B4EB2C1BC1AE940068BF21 /* MarsWater.xcdatamodeld */, - 50B4EB201BC1AE940068BF21 /* Supporting Files */, + 8DA86CD11BC1B329006C50BC /* Model */, + 8DA86CAA1BC1AE57006C50BC /* AppDelegate.h */, + 8DA86CAB1BC1AE57006C50BC /* AppDelegate.m */, + 8DA86CD21BC1B8E4006C50BC /* ListsTableViewController.h */, + 8DA86CD31BC1B8E4006C50BC /* ListsTableViewController.m */, + 8DA86CD51BC1B904006C50BC /* ListCreationTableViewController.h */, + 8DA86CD61BC1B904006C50BC /* ListCreationTableViewController.m */, + 5054F1251BC83C0B0047FE54 /* TasksTableViewController.h */, + 5054F1261BC83C0B0047FE54 /* TasksTableViewController.m */, + 5054F1221BC83BFE0047FE54 /* TaskCreationTableViewController.h */, + 5054F1231BC83BFE0047FE54 /* TaskCreationTableViewController.m */, + 8DA86CB01BC1AE57006C50BC /* Main.storyboard */, + 8DA86CB61BC1AE57006C50BC /* Assets.xcassets */, + 8DA86CB81BC1AE57006C50BC /* LaunchScreen.storyboard */, + 8DA86CBB1BC1AE57006C50BC /* Info.plist */, + 8DA86CB31BC1AE57006C50BC /* MarsWater.xcdatamodeld */, + 8DA86CA71BC1AE57006C50BC /* Supporting Files */, ); path = MarsWater; sourceTree = ""; }; - 50B4EB201BC1AE940068BF21 /* Supporting Files */ = { + 8DA86CA71BC1AE57006C50BC /* Supporting Files */ = { isa = PBXGroup; children = ( - 50B4EB211BC1AE940068BF21 /* main.m */, + 8DA86CA81BC1AE57006C50BC /* main.m */, ); name = "Supporting Files"; sourceTree = ""; }; - 50B4EB3C1BC1AE950068BF21 /* MarsWaterTests */ = { - isa = PBXGroup; - children = ( - 50B4EB3D1BC1AE950068BF21 /* MarsWaterTests.m */, - 50B4EB3F1BC1AE950068BF21 /* Info.plist */, - ); - path = MarsWaterTests; - sourceTree = ""; - }; - 50B4EB471BC1AE950068BF21 /* MarsWaterUITests */ = { - isa = PBXGroup; - children = ( - 50B4EB481BC1AE950068BF21 /* MarsWaterUITests.m */, - 50B4EB4A1BC1AE950068BF21 /* Info.plist */, - ); - path = MarsWaterUITests; - sourceTree = ""; - }; - 50B4EB561BC1B2890068BF21 /* Model */ = { + 8DA86CD11BC1B329006C50BC /* Model */ = { isa = PBXGroup; children = ( - 50B4EB5A1BC1B3200068BF21 /* List+CoreDataProperties.h */, - 50B4EB5B1BC1B3200068BF21 /* List+CoreDataProperties.m */, - 50B4EB5C1BC1B3200068BF21 /* List.h */, - 50B4EB5D1BC1B3200068BF21 /* List.m */, - 50B4EB5E1BC1B3200068BF21 /* Task+CoreDataProperties.h */, - 50B4EB5F1BC1B3200068BF21 /* Task+CoreDataProperties.m */, - 50B4EB601BC1B3200068BF21 /* Task.h */, - 50B4EB611BC1B3200068BF21 /* Task.m */, + 8DB2F6DF1BC1E75500E58E65 /* List.h */, + 8DB2F6E01BC1E75500E58E65 /* List.m */, + 8DB2F6E11BC1E75500E58E65 /* List+CoreDataProperties.h */, + 8DB2F6E21BC1E75500E58E65 /* List+CoreDataProperties.m */, + 8DB2F6E31BC1E75500E58E65 /* Task.h */, + 8DB2F6E41BC1E75500E58E65 /* Task.m */, + 8DB2F6E51BC1E75500E58E65 /* Task+CoreDataProperties.h */, + 8DB2F6E61BC1E75500E58E65 /* Task+CoreDataProperties.m */, ); name = Model; - path = ..; sourceTree = ""; }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 50B4EB1C1BC1AE940068BF21 /* MarsWater */ = { + 8DA86CA31BC1AE57006C50BC /* MarsWater */ = { isa = PBXNativeTarget; - buildConfigurationList = 50B4EB4D1BC1AE950068BF21 /* Build configuration list for PBXNativeTarget "MarsWater" */; + buildConfigurationList = 8DA86CBE1BC1AE57006C50BC /* Build configuration list for PBXNativeTarget "MarsWater" */; buildPhases = ( - 50B4EB191BC1AE940068BF21 /* Sources */, - 50B4EB1A1BC1AE940068BF21 /* Frameworks */, - 50B4EB1B1BC1AE940068BF21 /* Resources */, + 8DA86CA01BC1AE57006C50BC /* Sources */, + 8DA86CA11BC1AE57006C50BC /* Frameworks */, + 8DA86CA21BC1AE57006C50BC /* Resources */, ); buildRules = ( ); @@ -194,71 +142,25 @@ ); name = MarsWater; productName = MarsWater; - productReference = 50B4EB1D1BC1AE940068BF21 /* MarsWater.app */; + productReference = 8DA86CA41BC1AE57006C50BC /* MarsWater.app */; productType = "com.apple.product-type.application"; }; - 50B4EB381BC1AE950068BF21 /* MarsWaterTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 50B4EB501BC1AE950068BF21 /* Build configuration list for PBXNativeTarget "MarsWaterTests" */; - buildPhases = ( - 50B4EB351BC1AE950068BF21 /* Sources */, - 50B4EB361BC1AE950068BF21 /* Frameworks */, - 50B4EB371BC1AE950068BF21 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 50B4EB3B1BC1AE950068BF21 /* PBXTargetDependency */, - ); - name = MarsWaterTests; - productName = MarsWaterTests; - productReference = 50B4EB391BC1AE950068BF21 /* MarsWaterTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; - 50B4EB431BC1AE950068BF21 /* MarsWaterUITests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 50B4EB531BC1AE950068BF21 /* Build configuration list for PBXNativeTarget "MarsWaterUITests" */; - buildPhases = ( - 50B4EB401BC1AE950068BF21 /* Sources */, - 50B4EB411BC1AE950068BF21 /* Frameworks */, - 50B4EB421BC1AE950068BF21 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 50B4EB461BC1AE950068BF21 /* PBXTargetDependency */, - ); - name = MarsWaterUITests; - productName = MarsWaterUITests; - productReference = 50B4EB441BC1AE950068BF21 /* MarsWaterUITests.xctest */; - productType = "com.apple.product-type.bundle.ui-testing"; - }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ - 50B4EB151BC1AE940068BF21 /* Project object */ = { + 8DA86C9C1BC1AE57006C50BC /* Project object */ = { isa = PBXProject; attributes = { LastUpgradeCheck = 0700; - ORGANIZATIONNAME = "Jovanny Espinal"; + ORGANIZATIONNAME = "Michael Kavouras"; TargetAttributes = { - 50B4EB1C1BC1AE940068BF21 = { + 8DA86CA31BC1AE57006C50BC = { CreatedOnToolsVersion = 7.0.1; DevelopmentTeam = B4G65K7YME; }; - 50B4EB381BC1AE950068BF21 = { - CreatedOnToolsVersion = 7.0.1; - DevelopmentTeam = B4G65K7YME; - TestTargetID = 50B4EB1C1BC1AE940068BF21; - }; - 50B4EB431BC1AE950068BF21 = { - CreatedOnToolsVersion = 7.0.1; - DevelopmentTeam = B4G65K7YME; - TestTargetID = 50B4EB1C1BC1AE940068BF21; - }; }; }; - buildConfigurationList = 50B4EB181BC1AE940068BF21 /* Build configuration list for PBXProject "MarsWater" */; + buildConfigurationList = 8DA86C9F1BC1AE57006C50BC /* Build configuration list for PBXProject "MarsWater" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; @@ -266,106 +168,63 @@ en, Base, ); - mainGroup = 50B4EB141BC1AE940068BF21; - productRefGroup = 50B4EB1E1BC1AE940068BF21 /* Products */; + mainGroup = 8DA86C9B1BC1AE57006C50BC; + productRefGroup = 8DA86CA51BC1AE57006C50BC /* Products */; projectDirPath = ""; projectRoot = ""; targets = ( - 50B4EB1C1BC1AE940068BF21 /* MarsWater */, - 50B4EB381BC1AE950068BF21 /* MarsWaterTests */, - 50B4EB431BC1AE950068BF21 /* MarsWaterUITests */, + 8DA86CA31BC1AE57006C50BC /* MarsWater */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - 50B4EB1B1BC1AE940068BF21 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 50B4EB331BC1AE940068BF21 /* LaunchScreen.storyboard in Resources */, - 50B4EB301BC1AE940068BF21 /* Assets.xcassets in Resources */, - 50B4EB2B1BC1AE940068BF21 /* Main.storyboard in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 50B4EB371BC1AE950068BF21 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 50B4EB421BC1AE950068BF21 /* Resources */ = { + 8DA86CA21BC1AE57006C50BC /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 8DA86CBA1BC1AE57006C50BC /* LaunchScreen.storyboard in Resources */, + 8DA86CB71BC1AE57006C50BC /* Assets.xcassets in Resources */, + 8DA86CB21BC1AE57006C50BC /* Main.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - 50B4EB191BC1AE940068BF21 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 50B4EB2E1BC1AE940068BF21 /* MarsWater.xcdatamodeld in Sources */, - 50B4EB641BC1B3200068BF21 /* Task+CoreDataProperties.m in Sources */, - 50B4EB251BC1AE940068BF21 /* AppDelegate.m in Sources */, - 50B4EB651BC1B3200068BF21 /* Task.m in Sources */, - 50B4EB631BC1B3200068BF21 /* List.m in Sources */, - 50B4EB621BC1B3200068BF21 /* List+CoreDataProperties.m in Sources */, - 50B4EB6B1BC1B92C0068BF21 /* ListCreationTableViewController.m in Sources */, - 50B4EB221BC1AE940068BF21 /* main.m in Sources */, - 50B4EB681BC1B90A0068BF21 /* ListTableViewController.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 50B4EB351BC1AE950068BF21 /* Sources */ = { + 8DA86CA01BC1AE57006C50BC /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 50B4EB3E1BC1AE950068BF21 /* MarsWaterTests.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 50B4EB401BC1AE950068BF21 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 50B4EB491BC1AE950068BF21 /* MarsWaterUITests.m in Sources */, + 8DA86CB51BC1AE57006C50BC /* MarsWater.xcdatamodeld in Sources */, + 8DA86CAC1BC1AE57006C50BC /* AppDelegate.m in Sources */, + 8DB2F6EA1BC1E75500E58E65 /* Task+CoreDataProperties.m in Sources */, + 5054F1271BC83C0B0047FE54 /* TasksTableViewController.m in Sources */, + 5054F1241BC83BFE0047FE54 /* TaskCreationTableViewController.m in Sources */, + 8DA86CD41BC1B8E4006C50BC /* ListsTableViewController.m in Sources */, + 8DB2F6E71BC1E75500E58E65 /* List.m in Sources */, + 8DB2F6E91BC1E75500E58E65 /* Task.m in Sources */, + 8DA86CD71BC1B904006C50BC /* ListCreationTableViewController.m in Sources */, + 8DA86CA91BC1AE57006C50BC /* main.m in Sources */, + 8DB2F6E81BC1E75500E58E65 /* List+CoreDataProperties.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ -/* Begin PBXTargetDependency section */ - 50B4EB3B1BC1AE950068BF21 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 50B4EB1C1BC1AE940068BF21 /* MarsWater */; - targetProxy = 50B4EB3A1BC1AE950068BF21 /* PBXContainerItemProxy */; - }; - 50B4EB461BC1AE950068BF21 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 50B4EB1C1BC1AE940068BF21 /* MarsWater */; - targetProxy = 50B4EB451BC1AE950068BF21 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - /* Begin PBXVariantGroup section */ - 50B4EB291BC1AE940068BF21 /* Main.storyboard */ = { + 8DA86CB01BC1AE57006C50BC /* Main.storyboard */ = { isa = PBXVariantGroup; children = ( - 50B4EB2A1BC1AE940068BF21 /* Base */, + 8DA86CB11BC1AE57006C50BC /* Base */, ); name = Main.storyboard; sourceTree = ""; }; - 50B4EB311BC1AE940068BF21 /* LaunchScreen.storyboard */ = { + 8DA86CB81BC1AE57006C50BC /* LaunchScreen.storyboard */ = { isa = PBXVariantGroup; children = ( - 50B4EB321BC1AE940068BF21 /* Base */, + 8DA86CB91BC1AE57006C50BC /* Base */, ); name = LaunchScreen.storyboard; sourceTree = ""; @@ -373,7 +232,7 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ - 50B4EB4B1BC1AE950068BF21 /* Debug */ = { + 8DA86CBC1BC1AE57006C50BC /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -416,7 +275,7 @@ }; name = Debug; }; - 50B4EB4C1BC1AE950068BF21 /* Release */ = { + 8DA86CBD1BC1AE57006C50BC /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -453,126 +312,65 @@ }; name = Release; }; - 50B4EB4E1BC1AE950068BF21 /* Debug */ = { + 8DA86CBF1BC1AE57006C50BC /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_IDENTITY = "iPhone Developer"; INFOPLIST_FILE = MarsWater/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = jovannyespinal.MarsWater; + PRODUCT_BUNDLE_IDENTIFIER = espinaljovanny; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; }; - 50B4EB4F1BC1AE950068BF21 /* Release */ = { + 8DA86CC01BC1AE57006C50BC /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_IDENTITY = "iPhone Developer"; INFOPLIST_FILE = MarsWater/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = jovannyespinal.MarsWater; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; - 50B4EB511BC1AE950068BF21 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - INFOPLIST_FILE = MarsWaterTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = jovannyespinal.MarsWaterTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MarsWater.app/MarsWater"; - }; - name = Debug; - }; - 50B4EB521BC1AE950068BF21 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - INFOPLIST_FILE = MarsWaterTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = jovannyespinal.MarsWaterTests; + PRODUCT_BUNDLE_IDENTIFIER = espinaljovanny; PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MarsWater.app/MarsWater"; - }; - name = Release; - }; - 50B4EB541BC1AE950068BF21 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - INFOPLIST_FILE = MarsWaterUITests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = jovannyespinal.MarsWaterUITests; - PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_TARGET_NAME = MarsWater; - USES_XCTRUNNER = YES; - }; - name = Debug; - }; - 50B4EB551BC1AE950068BF21 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - INFOPLIST_FILE = MarsWaterUITests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = jovannyespinal.MarsWaterUITests; - PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_TARGET_NAME = MarsWater; - USES_XCTRUNNER = YES; }; name = Release; }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 50B4EB181BC1AE940068BF21 /* Build configuration list for PBXProject "MarsWater" */ = { + 8DA86C9F1BC1AE57006C50BC /* Build configuration list for PBXProject "MarsWater" */ = { isa = XCConfigurationList; buildConfigurations = ( - 50B4EB4B1BC1AE950068BF21 /* Debug */, - 50B4EB4C1BC1AE950068BF21 /* Release */, + 8DA86CBC1BC1AE57006C50BC /* Debug */, + 8DA86CBD1BC1AE57006C50BC /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 50B4EB4D1BC1AE950068BF21 /* Build configuration list for PBXNativeTarget "MarsWater" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 50B4EB4E1BC1AE950068BF21 /* Debug */, - 50B4EB4F1BC1AE950068BF21 /* Release */, - ); - defaultConfigurationIsVisible = 0; - }; - 50B4EB501BC1AE950068BF21 /* Build configuration list for PBXNativeTarget "MarsWaterTests" */ = { + 8DA86CBE1BC1AE57006C50BC /* Build configuration list for PBXNativeTarget "MarsWater" */ = { isa = XCConfigurationList; buildConfigurations = ( - 50B4EB511BC1AE950068BF21 /* Debug */, - 50B4EB521BC1AE950068BF21 /* Release */, - ); - defaultConfigurationIsVisible = 0; - }; - 50B4EB531BC1AE950068BF21 /* Build configuration list for PBXNativeTarget "MarsWaterUITests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 50B4EB541BC1AE950068BF21 /* Debug */, - 50B4EB551BC1AE950068BF21 /* Release */, + 8DA86CBF1BC1AE57006C50BC /* Debug */, + 8DA86CC01BC1AE57006C50BC /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; /* End XCConfigurationList section */ /* Begin XCVersionGroup section */ - 50B4EB2C1BC1AE940068BF21 /* MarsWater.xcdatamodeld */ = { + 8DA86CB31BC1AE57006C50BC /* MarsWater.xcdatamodeld */ = { isa = XCVersionGroup; children = ( - 50B4EB2D1BC1AE940068BF21 /* MarsWater.xcdatamodel */, + 8DA86CB41BC1AE57006C50BC /* MarsWater.xcdatamodel */, ); - currentVersion = 50B4EB2D1BC1AE940068BF21 /* MarsWater.xcdatamodel */; + currentVersion = 8DA86CB41BC1AE57006C50BC /* MarsWater.xcdatamodel */; path = MarsWater.xcdatamodeld; sourceTree = ""; versionGroupType = wrapper.xcdatamodel; }; /* End XCVersionGroup section */ }; - rootObject = 50B4EB151BC1AE940068BF21 /* Project object */; + rootObject = 8DA86C9C1BC1AE57006C50BC /* Project object */; } diff --git a/MarsWater/MarsWater/AppDelegate.h b/MarsWater/MarsWater/AppDelegate.h index e2a048a..33642bf 100644 --- a/MarsWater/MarsWater/AppDelegate.h +++ b/MarsWater/MarsWater/AppDelegate.h @@ -2,8 +2,8 @@ // AppDelegate.h // MarsWater // -// Created by Jovanny Espinal on 10/4/15. -// Copyright © 2015 Jovanny Espinal. All rights reserved. +// Created by Michael Kavouras on 10/4/15. +// Copyright © 2015 Michael Kavouras. All rights reserved. // #import diff --git a/MarsWater/MarsWater/AppDelegate.m b/MarsWater/MarsWater/AppDelegate.m index 1c58daf..8e592d7 100644 --- a/MarsWater/MarsWater/AppDelegate.m +++ b/MarsWater/MarsWater/AppDelegate.m @@ -2,8 +2,8 @@ // AppDelegate.m // MarsWater // -// Created by Jovanny Espinal on 10/4/15. -// Copyright © 2015 Jovanny Espinal. All rights reserved. +// Created by Michael Kavouras on 10/4/15. +// Copyright © 2015 Michael Kavouras. All rights reserved. // #import "AppDelegate.h" @@ -51,7 +51,7 @@ - (void)applicationWillTerminate:(UIApplication *)application { @synthesize persistentStoreCoordinator = _persistentStoreCoordinator; - (NSURL *)applicationDocumentsDirectory { - // The directory the application uses to store the Core Data store file. This code uses a directory named "jovannyespinal.MarsWater" in the application's documents directory. + // The directory the application uses to store the Core Data store file. This code uses a directory named "com.mikekavouras.MarsWater" in the application's documents directory. return [[[NSFileManager defaultManager] URLsForDirectory:NSDocumentDirectory inDomains:NSUserDomainMask] lastObject]; } diff --git a/MarsWater/MarsWater/Base.lproj/LaunchScreen.storyboard b/MarsWater/MarsWater/Base.lproj/LaunchScreen.storyboard index 900bc17..2e721e1 100644 --- a/MarsWater/MarsWater/Base.lproj/LaunchScreen.storyboard +++ b/MarsWater/MarsWater/Base.lproj/LaunchScreen.storyboard @@ -1,7 +1,7 @@ - + - + diff --git a/MarsWater/MarsWater/Base.lproj/Main.storyboard b/MarsWater/MarsWater/Base.lproj/Main.storyboard index 34714b4..e1a9d4d 100644 --- a/MarsWater/MarsWater/Base.lproj/Main.storyboard +++ b/MarsWater/MarsWater/Base.lproj/Main.storyboard @@ -1,27 +1,27 @@ - + - + - - + + - + - + - + + + - - + + - - - + + - + - - + - + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -157,54 +325,35 @@ - - + + - + - + - - - - - - - - - - - - - - - - - - + - + - + - - - + + - - + - + - + diff --git a/MarsWater/MarsWater/List+CoreDataProperties.h b/MarsWater/MarsWater/List+CoreDataProperties.h index 7288053..ccbccbd 100644 --- a/MarsWater/MarsWater/List+CoreDataProperties.h +++ b/MarsWater/MarsWater/List+CoreDataProperties.h @@ -2,8 +2,8 @@ // List+CoreDataProperties.h // MarsWater // -// Created by Jovanny Espinal on 10/4/15. -// Copyright © 2015 Jovanny Espinal. All rights reserved. +// Created by Michael Kavouras on 10/4/15. +// Copyright © 2015 Michael Kavouras. All rights reserved. // // Choose "Create NSManagedObject Subclass…" from the Core Data editor menu // to delete and recreate this implementation file for your updated model. @@ -16,9 +16,9 @@ NS_ASSUME_NONNULL_BEGIN @interface List (CoreDataProperties) @property (nullable, nonatomic, retain) NSString *title; -@property (nullable, nonatomic, retain) id color; @property (nullable, nonatomic, retain) NSDate *createdAt; -@property (nullable, nonatomic, retain) NSArray *task; +@property (nullable, nonatomic, retain) id color; +@property (nullable, nonatomic, retain) NSOrderedSet *task; @end diff --git a/MarsWater/MarsWater/List+CoreDataProperties.m b/MarsWater/MarsWater/List+CoreDataProperties.m index 90014b6..6c70870 100644 --- a/MarsWater/MarsWater/List+CoreDataProperties.m +++ b/MarsWater/MarsWater/List+CoreDataProperties.m @@ -2,8 +2,8 @@ // List+CoreDataProperties.m // MarsWater // -// Created by Jovanny Espinal on 10/4/15. -// Copyright © 2015 Jovanny Espinal. All rights reserved. +// Created by Michael Kavouras on 10/4/15. +// Copyright © 2015 Michael Kavouras. All rights reserved. // // Choose "Create NSManagedObject Subclass…" from the Core Data editor menu // to delete and recreate this implementation file for your updated model. @@ -14,8 +14,8 @@ @implementation List (CoreDataProperties) @dynamic title; -@dynamic color; @dynamic createdAt; +@dynamic color; @dynamic task; @end diff --git a/MarsWater/MarsWater/List.h b/MarsWater/MarsWater/List.h index 4c4be41..d7c69f2 100644 --- a/MarsWater/MarsWater/List.h +++ b/MarsWater/MarsWater/List.h @@ -2,8 +2,8 @@ // List.h // MarsWater // -// Created by Jovanny Espinal on 10/4/15. -// Copyright © 2015 Jovanny Espinal. All rights reserved. +// Created by Michael Kavouras on 10/4/15. +// Copyright © 2015 Michael Kavouras. All rights reserved. // #import diff --git a/MarsWater/MarsWater/List.m b/MarsWater/MarsWater/List.m index 2adb547..5edadfa 100644 --- a/MarsWater/MarsWater/List.m +++ b/MarsWater/MarsWater/List.m @@ -2,8 +2,8 @@ // List.m // MarsWater // -// Created by Jovanny Espinal on 10/4/15. -// Copyright © 2015 Jovanny Espinal. All rights reserved. +// Created by Michael Kavouras on 10/4/15. +// Copyright © 2015 Michael Kavouras. All rights reserved. // #import "List.h" diff --git a/MarsWater/MarsWater/ListCreationTableViewController.h b/MarsWater/MarsWater/ListCreationTableViewController.h index 1a146ab..df226d4 100644 --- a/MarsWater/MarsWater/ListCreationTableViewController.h +++ b/MarsWater/MarsWater/ListCreationTableViewController.h @@ -2,8 +2,8 @@ // ListCreationTableViewController.h // MarsWater // -// Created by Jovanny Espinal on 10/4/15. -// Copyright © 2015 Jovanny Espinal. All rights reserved. +// Created by Michael Kavouras on 10/4/15. +// Copyright © 2015 Michael Kavouras. All rights reserved. // #import diff --git a/MarsWater/MarsWater/ListCreationTableViewController.m b/MarsWater/MarsWater/ListCreationTableViewController.m index aa8d6d3..0ecf6e9 100644 --- a/MarsWater/MarsWater/ListCreationTableViewController.m +++ b/MarsWater/MarsWater/ListCreationTableViewController.m @@ -2,8 +2,8 @@ // ListCreationTableViewController.m // MarsWater // -// Created by Jovanny Espinal on 10/4/15. -// Copyright © 2015 Jovanny Espinal. All rights reserved. +// Created by Michael Kavouras on 10/4/15. +// Copyright © 2015 Michael Kavouras. All rights reserved. // #import @@ -12,14 +12,16 @@ #import "AppDelegate.h" @interface ListCreationTableViewController () + @property (weak, nonatomic) IBOutlet UITextField *titleTextField; -@property (nonatomic)List *list; + +@property (nonatomic) List *list; @end @implementation ListCreationTableViewController --(void)viewDidLoad{ +- (void)viewDidLoad { [super viewDidLoad]; [self setupNavigationBar]; @@ -27,38 +29,34 @@ -(void)viewDidLoad{ AppDelegate *delegate = [UIApplication sharedApplication].delegate; self.list = [NSEntityDescription insertNewObjectForEntityForName:@"List" inManagedObjectContext:delegate.managedObjectContext]; - - NSLog(@"%@", self.list); } --(void)setupNavigationBar{ - //Set the title - self.navigationController.title = @"Create New List"; +- (void)setupNavigationBar { + + self.navigationItem.title = @"Create new list"; - //Set the left bar to cancel self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel target:self action:@selector(cancel)]; - //Set the right button to save self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemSave target:self action:@selector(save)]; + + // set the right button to save } --(void)save{ +- (void)cancel { + [self dismissViewControllerAnimated:YES completion:nil]; +} + +- (void)save { self.list.title = self.titleTextField.text; self.list.createdAt = [NSDate date]; - AppDelegate *delegate = [UIApplication sharedApplication].delegate; [delegate.managedObjectContext save:nil]; - [self cancel]; - NSLog(@"%@", self.list); - + [self dismissViewControllerAnimated:YES completion:nil]; } --(void)cancel{ - [self dismissViewControllerAnimated:true completion:nil]; -} -- (IBAction)colorButtonTapped:(UIButton *)sender{ +- (IBAction)colorButtonTapped:(UIButton *)sender { self.list.color = sender.backgroundColor; } diff --git a/MarsWater/MarsWater/ListTableViewController.h b/MarsWater/MarsWater/ListTableViewController.h deleted file mode 100644 index 27620af..0000000 --- a/MarsWater/MarsWater/ListTableViewController.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// ListTableViewController.h -// MarsWater -// -// Created by Jovanny Espinal on 10/4/15. -// Copyright © 2015 Jovanny Espinal. All rights reserved. -// - -#import - -@interface ListTableViewController : UITableViewController - -@end diff --git a/MarsWater/MarsWater/ListsTableViewController.h b/MarsWater/MarsWater/ListsTableViewController.h new file mode 100644 index 0000000..e83a1d1 --- /dev/null +++ b/MarsWater/MarsWater/ListsTableViewController.h @@ -0,0 +1,13 @@ +// +// ListsTableViewController.h +// MarsWater +// +// Created by Michael Kavouras on 10/4/15. +// Copyright © 2015 Michael Kavouras. All rights reserved. +// + +#import + +@interface ListsTableViewController : UITableViewController + +@end diff --git a/MarsWater/MarsWater/ListTableViewController.m b/MarsWater/MarsWater/ListsTableViewController.m similarity index 57% rename from MarsWater/MarsWater/ListTableViewController.m rename to MarsWater/MarsWater/ListsTableViewController.m index fd476e1..be8e82c 100644 --- a/MarsWater/MarsWater/ListTableViewController.m +++ b/MarsWater/MarsWater/ListsTableViewController.m @@ -1,81 +1,87 @@ // -// ListTableViewController.m +// ListsTableViewController.m // MarsWater // -// Created by Jovanny Espinal on 10/4/15. -// Copyright © 2015 Jovanny Espinal. All rights reserved. +// Created by Michael Kavouras on 10/4/15. +// Copyright © 2015 Michael Kavouras. All rights reserved. // #import -#import "ListTableViewController.h" +#import "ListsTableViewController.h" +#import "TasksTableViewController.h" #import "AppDelegate.h" #import "List.h" -@interface ListTableViewController () +@interface ListsTableViewController () @property (nonatomic) NSFetchedResultsController *fetchedResultsController; @end -@implementation ListTableViewController +@implementation ListsTableViewController - (void)viewDidLoad { [super viewDidLoad]; - AppDelegate *delegate = [UIApplication sharedApplication].delegate; + // 1) create an instance of NSFetchRequest with an entity name NSFetchRequest *fetchRequest = [[NSFetchRequest alloc] initWithEntityName:@"List"]; - NSSortDescriptor *sort = [[NSSortDescriptor alloc]initWithKey:@"createdAt" ascending:NO]; + + // 2) create a sort descriptor + NSSortDescriptor *sort = [[NSSortDescriptor alloc] initWithKey:@"createdAt" ascending:NO]; + + // 3) set the sortDescriptors on the fetchRequest fetchRequest.sortDescriptors = @[sort]; + // 4) create a fetchedResultsController with a fetchRequest and a managedObjectContext, self.fetchedResultsController = [[NSFetchedResultsController alloc] initWithFetchRequest:fetchRequest managedObjectContext:delegate.managedObjectContext sectionNameKeyPath:nil cacheName:nil]; self.fetchedResultsController.delegate = self; [self.fetchedResultsController performFetch:nil]; - - [self.tableView reloadData]; - } -- (void)didReceiveMemoryWarning { - [super didReceiveMemoryWarning]; - // Dispose of any resources that can be recreated. -} #pragma mark - Table view data source - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { - return 1; } - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.fetchedResultsController.fetchedObjects.count; } -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{ - - UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"ListCellIdentifier" forIndexPath:indexPath]; +- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { + UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier: @"ListCellIdentifier" forIndexPath:indexPath]; List *list = self.fetchedResultsController.fetchedObjects[indexPath.row]; - + cell.backgroundColor = (UIColor *)list.color; cell.textLabel.text = list.title; - cell.textLabel.textColor = (UIColor *)list.color; cell.detailTextLabel.text = [list.createdAt description]; return cell; } -- (void)controller:(NSFetchedResultsController *)controller didChangeObject:(id)anObject atIndexPath:(NSIndexPath *)indexPath forChangeType:(NSFetchedResultsChangeType)type newIndexPath:(NSIndexPath *)newIndexPath{ - +- (void)controller:(NSFetchedResultsController *)controller didChangeObject:(id)anObject atIndexPath:(NSIndexPath *)indexPath forChangeType:(NSFetchedResultsChangeType)type newIndexPath:(NSIndexPath *)newIndexPath { + [self.tableView reloadData]; } +-(void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender{ + + if ([segue.identifier isEqualToString:@"taskSegue"]) { + NSIndexPath *indexPath = [self.tableView indexPathForSelectedRow]; + + TasksTableViewController *tasksTVC = segue.destinationViewController; + + tasksTVC.list = self.fetchedResultsController.fetchedObjects[indexPath.row]; + } +} @end + diff --git a/MarsWater/MarsWater/MarsWater.xcdatamodeld/MarsWater.xcdatamodel/contents b/MarsWater/MarsWater/MarsWater.xcdatamodeld/MarsWater.xcdatamodel/contents index 5dc6d1c..116441d 100644 --- a/MarsWater/MarsWater/MarsWater.xcdatamodeld/MarsWater.xcdatamodel/contents +++ b/MarsWater/MarsWater/MarsWater.xcdatamodeld/MarsWater.xcdatamodel/contents @@ -4,7 +4,7 @@ - + @@ -13,10 +13,10 @@ - + - - + + \ No newline at end of file diff --git a/MarsWater/MarsWater/Task+CoreDataProperties.h b/MarsWater/MarsWater/Task+CoreDataProperties.h index f9ce5ea..2cc11d7 100644 --- a/MarsWater/MarsWater/Task+CoreDataProperties.h +++ b/MarsWater/MarsWater/Task+CoreDataProperties.h @@ -2,8 +2,8 @@ // Task+CoreDataProperties.h // MarsWater // -// Created by Jovanny Espinal on 10/4/15. -// Copyright © 2015 Jovanny Espinal. All rights reserved. +// Created by Michael Kavouras on 10/4/15. +// Copyright © 2015 Michael Kavouras. All rights reserved. // // Choose "Create NSManagedObject Subclass…" from the Core Data editor menu // to delete and recreate this implementation file for your updated model. @@ -21,7 +21,7 @@ NS_ASSUME_NONNULL_BEGIN @property (nullable, nonatomic, retain) NSDate *updatedAt; @property (nullable, nonatomic, retain) NSNumber *priority; @property (nullable, nonatomic, retain) NSDate *completedAt; -@property (nullable, nonatomic, retain) Task *list; +@property (nullable, nonatomic, retain) List *list; @end diff --git a/MarsWater/MarsWater/Task+CoreDataProperties.m b/MarsWater/MarsWater/Task+CoreDataProperties.m index cf1b1ef..1ea972c 100644 --- a/MarsWater/MarsWater/Task+CoreDataProperties.m +++ b/MarsWater/MarsWater/Task+CoreDataProperties.m @@ -2,8 +2,8 @@ // Task+CoreDataProperties.m // MarsWater // -// Created by Jovanny Espinal on 10/4/15. -// Copyright © 2015 Jovanny Espinal. All rights reserved. +// Created by Michael Kavouras on 10/4/15. +// Copyright © 2015 Michael Kavouras. All rights reserved. // // Choose "Create NSManagedObject Subclass…" from the Core Data editor menu // to delete and recreate this implementation file for your updated model. diff --git a/MarsWater/MarsWater/Task.h b/MarsWater/MarsWater/Task.h index 9c3eb50..e714efc 100644 --- a/MarsWater/MarsWater/Task.h +++ b/MarsWater/MarsWater/Task.h @@ -2,13 +2,15 @@ // Task.h // MarsWater // -// Created by Jovanny Espinal on 10/4/15. -// Copyright © 2015 Jovanny Espinal. All rights reserved. +// Created by Michael Kavouras on 10/4/15. +// Copyright © 2015 Michael Kavouras. All rights reserved. // #import #import +@class List; + NS_ASSUME_NONNULL_BEGIN @interface Task : NSManagedObject diff --git a/MarsWater/MarsWater/Task.m b/MarsWater/MarsWater/Task.m index a43d6a1..c32ed42 100644 --- a/MarsWater/MarsWater/Task.m +++ b/MarsWater/MarsWater/Task.m @@ -2,11 +2,12 @@ // Task.m // MarsWater // -// Created by Jovanny Espinal on 10/4/15. -// Copyright © 2015 Jovanny Espinal. All rights reserved. +// Created by Michael Kavouras on 10/4/15. +// Copyright © 2015 Michael Kavouras. All rights reserved. // #import "Task.h" +#import "List.h" @implementation Task diff --git a/MarsWater/MarsWater/TaskCreationTableViewController.h b/MarsWater/MarsWater/TaskCreationTableViewController.h new file mode 100644 index 0000000..d00d19c --- /dev/null +++ b/MarsWater/MarsWater/TaskCreationTableViewController.h @@ -0,0 +1,16 @@ +// +// TaskCreationTableViewController.h +// MarsWater +// +// Created by Jovanny Espinal on 10/9/15. +// Copyright © 2015 Michael Kavouras. All rights reserved. +// + +#import +#import "List.h" + +@interface TaskCreationTableViewController : UITableViewController + +@property (nonatomic) List *list; + +@end diff --git a/MarsWater/MarsWater/TaskCreationTableViewController.m b/MarsWater/MarsWater/TaskCreationTableViewController.m new file mode 100644 index 0000000..b586d74 --- /dev/null +++ b/MarsWater/MarsWater/TaskCreationTableViewController.m @@ -0,0 +1,54 @@ +// +// TaskCreationTableViewController.m +// MarsWater +// +// Created by Jovanny Espinal on 10/9/15. +// Copyright © 2015 Michael Kavouras. All rights reserved. +// + +#import "TaskCreationTableViewController.h" +#import "Task.h" +#import "AppDelegate.h" + +@interface TaskCreationTableViewController () +@property (weak, nonatomic) IBOutlet UITextField *textField; +@property (nonatomic) Task *task; +@property (nonatomic) NSMutableOrderedSet *tempSet; +@end + +@implementation TaskCreationTableViewController + +- (void)viewDidLoad { + [super viewDidLoad]; + + self.tempSet = [self.list.task mutableCopy]; + + AppDelegate *delegate = [UIApplication sharedApplication].delegate; + + self.task = [NSEntityDescription insertNewObjectForEntityForName:@"Task" inManagedObjectContext:delegate.managedObjectContext]; + + +} + +- (IBAction)cancelTask:(UIBarButtonItem *)sender { + [self dismissViewControllerAnimated:YES completion:nil]; +} + +- (IBAction)saveTask:(UIBarButtonItem *)sender { + + AppDelegate *delegate = [UIApplication sharedApplication].delegate; + + self.task.taskDescription = self.textField.text; + self.task.createdAt = [NSDate date]; + + [self.tempSet addObject:self.task]; + + self.list.task = self.tempSet; + + [delegate.managedObjectContext save:nil]; + + [self dismissViewControllerAnimated:YES completion:nil]; +} + + +@end diff --git a/MarsWater/MarsWater/TasksTableViewController.h b/MarsWater/MarsWater/TasksTableViewController.h new file mode 100644 index 0000000..740f3d6 --- /dev/null +++ b/MarsWater/MarsWater/TasksTableViewController.h @@ -0,0 +1,15 @@ +// +// TasksTableViewController.h +// MarsWater +// +// Created by Jovanny Espinal on 10/9/15. +// Copyright © 2015 Michael Kavouras. All rights reserved. +// + +#import +#import "List.h" + +@interface TasksTableViewController : UITableViewController + +@property (nonatomic) List *list; +@end diff --git a/MarsWater/MarsWater/TasksTableViewController.m b/MarsWater/MarsWater/TasksTableViewController.m new file mode 100644 index 0000000..bf32dea --- /dev/null +++ b/MarsWater/MarsWater/TasksTableViewController.m @@ -0,0 +1,58 @@ +// +// TasksTableViewController.m +// MarsWater +// +// Created by Jovanny Espinal on 10/9/15. +// Copyright © 2015 Michael Kavouras. All rights reserved. +// + +#import "TasksTableViewController.h" +#import "Task.h" +#import "TaskCreationTableViewController.h" + +@interface TasksTableViewController () + +@end + +@implementation TasksTableViewController + +- (void)viewDidLoad { + [super viewDidLoad]; + +} + +-(void)viewWillAppear:(BOOL)animated{ + [self.tableView reloadData]; +} + +#pragma mark - Table view data source + +- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { + return 1; +} + +- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { + return self.list.task.count; +} + + +- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { + UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"TaskCellIdentifier" forIndexPath:indexPath]; + + Task *task = self.list.task[indexPath.row]; + + cell.textLabel.text = task.taskDescription; + cell.detailTextLabel.text = [task.createdAt description]; + + return cell; +} + +-(void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender{ + + UINavigationController *navController = segue.destinationViewController; + + TaskCreationTableViewController *taskCTVC = (TaskCreationTableViewController *)([navController viewControllers][0]); + taskCTVC.list = self.list; +} + +@end diff --git a/MarsWater/MarsWater/main.m b/MarsWater/MarsWater/main.m index 675b2ee..c107d8b 100644 --- a/MarsWater/MarsWater/main.m +++ b/MarsWater/MarsWater/main.m @@ -1,9 +1,9 @@ -// + // main.m // MarsWater // -// Created by Jovanny Espinal on 10/4/15. -// Copyright © 2015 Jovanny Espinal. All rights reserved. +// Created by Michael Kavouras on 10/4/15. +// Copyright © 2015 Michael Kavouras. All rights reserved. // #import diff --git a/MarsWater/MarsWaterTests/Info.plist b/MarsWater/MarsWaterTests/Info.plist deleted file mode 100644 index ba72822..0000000 --- a/MarsWater/MarsWaterTests/Info.plist +++ /dev/null @@ -1,24 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - BNDL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - - diff --git a/MarsWater/MarsWaterTests/MarsWaterTests.m b/MarsWater/MarsWaterTests/MarsWaterTests.m deleted file mode 100644 index 53f08e0..0000000 --- a/MarsWater/MarsWaterTests/MarsWaterTests.m +++ /dev/null @@ -1,39 +0,0 @@ -// -// MarsWaterTests.m -// MarsWaterTests -// -// Created by Jovanny Espinal on 10/4/15. -// Copyright © 2015 Jovanny Espinal. All rights reserved. -// - -#import - -@interface MarsWaterTests : XCTestCase - -@end - -@implementation MarsWaterTests - -- (void)setUp { - [super setUp]; - // Put setup code here. This method is called before the invocation of each test method in the class. -} - -- (void)tearDown { - // Put teardown code here. This method is called after the invocation of each test method in the class. - [super tearDown]; -} - -- (void)testExample { - // This is an example of a functional test case. - // Use XCTAssert and related functions to verify your tests produce the correct results. -} - -- (void)testPerformanceExample { - // This is an example of a performance test case. - [self measureBlock:^{ - // Put the code you want to measure the time of here. - }]; -} - -@end diff --git a/MarsWater/MarsWaterUITests/Info.plist b/MarsWater/MarsWaterUITests/Info.plist deleted file mode 100644 index ba72822..0000000 --- a/MarsWater/MarsWaterUITests/Info.plist +++ /dev/null @@ -1,24 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - BNDL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - - diff --git a/MarsWater/MarsWaterUITests/MarsWaterUITests.m b/MarsWater/MarsWaterUITests/MarsWaterUITests.m deleted file mode 100644 index b1acedf..0000000 --- a/MarsWater/MarsWaterUITests/MarsWaterUITests.m +++ /dev/null @@ -1,40 +0,0 @@ -// -// MarsWaterUITests.m -// MarsWaterUITests -// -// Created by Jovanny Espinal on 10/4/15. -// Copyright © 2015 Jovanny Espinal. All rights reserved. -// - -#import - -@interface MarsWaterUITests : XCTestCase - -@end - -@implementation MarsWaterUITests - -- (void)setUp { - [super setUp]; - - // Put setup code here. This method is called before the invocation of each test method in the class. - - // In UI tests it is usually best to stop immediately when a failure occurs. - self.continueAfterFailure = NO; - // UI tests must launch the application that they test. Doing this in setup will make sure it happens for each test method. - [[[XCUIApplication alloc] init] launch]; - - // In UI tests it’s important to set the initial state - such as interface orientation - required for your tests before they run. The setUp method is a good place to do this. -} - -- (void)tearDown { - // Put teardown code here. This method is called after the invocation of each test method in the class. - [super tearDown]; -} - -- (void)testExample { - // Use recording to get started writing UI tests. - // Use XCTAssert and related functions to verify your tests produce the correct results. -} - -@end From 8fe0d98a11a1bd5ed8c7a76f2485f7c0e1a72151 Mon Sep 17 00:00:00 2001 From: JovannyEspinal Date: Fri, 9 Oct 2015 20:16:22 -0400 Subject: [PATCH 3/3] Fixed Task cell. displays date now. --- .../MarsWater/Base.lproj/Main.storyboard | 32 +++++++++++++++---- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/MarsWater/MarsWater/Base.lproj/Main.storyboard b/MarsWater/MarsWater/Base.lproj/Main.storyboard index e1a9d4d..e43a338 100644 --- a/MarsWater/MarsWater/Base.lproj/Main.storyboard +++ b/MarsWater/MarsWater/Base.lproj/Main.storyboard @@ -26,7 +26,7 @@ - + @@ -73,12 +73,30 @@ - + + + + + @@ -109,7 +127,7 @@ - + @@ -124,7 +142,7 @@ - + @@ -208,7 +226,7 @@ - + @@ -223,7 +241,7 @@ - +