diff --git a/Task Master/Task Master.xcodeproj/project.pbxproj b/Task Master/Task Master.xcodeproj/project.pbxproj index 757196e..7a6af04 100644 --- a/Task Master/Task Master.xcodeproj/project.pbxproj +++ b/Task Master/Task Master.xcodeproj/project.pbxproj @@ -7,48 +7,48 @@ objects = { /* Begin PBXBuildFile section */ - 5F1F2F7B1DDDC4CC00194BCC /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F1F2F7A1DDDC4CC00194BCC /* AppDelegate.swift */; }; - 5F1F2F7D1DDDC4CC00194BCC /* MasterViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F1F2F7C1DDDC4CC00194BCC /* MasterViewController.swift */; }; - 5F1F2F7F1DDDC4CC00194BCC /* DetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F1F2F7E1DDDC4CC00194BCC /* DetailViewController.swift */; }; - 5F1F2F821DDDC4CC00194BCC /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 5F1F2F801DDDC4CC00194BCC /* Main.storyboard */; }; - 5F1F2F841DDDC4CC00194BCC /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5F1F2F831DDDC4CC00194BCC /* Assets.xcassets */; }; - 5F1F2F871DDDC4CC00194BCC /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 5F1F2F851DDDC4CC00194BCC /* LaunchScreen.storyboard */; }; - 5F1F2F921DDDC4CD00194BCC /* Task_MasterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F1F2F911DDDC4CD00194BCC /* Task_MasterTests.swift */; }; + 5F26CD831DDDDAF6008452B2 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F26CD821DDDDAF6008452B2 /* AppDelegate.swift */; }; + 5F26CD851DDDDAF6008452B2 /* FirstViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F26CD841DDDDAF6008452B2 /* FirstViewController.swift */; }; + 5F26CD871DDDDAF6008452B2 /* SecondViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F26CD861DDDDAF6008452B2 /* SecondViewController.swift */; }; + 5F26CD8A1DDDDAF6008452B2 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 5F26CD881DDDDAF6008452B2 /* Main.storyboard */; }; + 5F26CD8C1DDDDAF6008452B2 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5F26CD8B1DDDDAF6008452B2 /* Assets.xcassets */; }; + 5F26CD8F1DDDDAF6008452B2 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 5F26CD8D1DDDDAF6008452B2 /* LaunchScreen.storyboard */; }; + 5F26CD9A1DDDDAF6008452B2 /* Task_MasterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F26CD991DDDDAF6008452B2 /* Task_MasterTests.swift */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 5F1F2F8E1DDDC4CD00194BCC /* PBXContainerItemProxy */ = { + 5F26CD961DDDDAF6008452B2 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 5F1F2F6F1DDDC4CC00194BCC /* Project object */; + containerPortal = 5F26CD771DDDDAF6008452B2 /* Project object */; proxyType = 1; - remoteGlobalIDString = 5F1F2F761DDDC4CC00194BCC; + remoteGlobalIDString = 5F26CD7E1DDDDAF6008452B2; remoteInfo = "Task Master"; }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 5F1F2F771DDDC4CC00194BCC /* Task Master.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Task Master.app"; sourceTree = BUILT_PRODUCTS_DIR; }; - 5F1F2F7A1DDDC4CC00194BCC /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - 5F1F2F7C1DDDC4CC00194BCC /* MasterViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MasterViewController.swift; sourceTree = ""; }; - 5F1F2F7E1DDDC4CC00194BCC /* DetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DetailViewController.swift; sourceTree = ""; }; - 5F1F2F811DDDC4CC00194BCC /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; - 5F1F2F831DDDC4CC00194BCC /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - 5F1F2F861DDDC4CC00194BCC /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; - 5F1F2F881DDDC4CC00194BCC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 5F1F2F8D1DDDC4CD00194BCC /* Task MasterTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Task MasterTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; - 5F1F2F911DDDC4CD00194BCC /* Task_MasterTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Task_MasterTests.swift; sourceTree = ""; }; - 5F1F2F931DDDC4CD00194BCC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 5F26CD7F1DDDDAF6008452B2 /* Task Master.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Task Master.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 5F26CD821DDDDAF6008452B2 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 5F26CD841DDDDAF6008452B2 /* FirstViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FirstViewController.swift; sourceTree = ""; }; + 5F26CD861DDDDAF6008452B2 /* SecondViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecondViewController.swift; sourceTree = ""; }; + 5F26CD891DDDDAF6008452B2 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + 5F26CD8B1DDDDAF6008452B2 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 5F26CD8E1DDDDAF6008452B2 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; + 5F26CD901DDDDAF6008452B2 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 5F26CD951DDDDAF6008452B2 /* Task MasterTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Task MasterTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; + 5F26CD991DDDDAF6008452B2 /* Task_MasterTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Task_MasterTests.swift; sourceTree = ""; }; + 5F26CD9B1DDDDAF6008452B2 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 5F1F2F741DDDC4CC00194BCC /* Frameworks */ = { + 5F26CD7C1DDDDAF6008452B2 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( ); runOnlyForDeploymentPostprocessing = 0; }; - 5F1F2F8A1DDDC4CD00194BCC /* Frameworks */ = { + 5F26CD921DDDDAF6008452B2 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( @@ -58,43 +58,43 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 5F1F2F6E1DDDC4CC00194BCC = { + 5F26CD761DDDDAF6008452B2 = { isa = PBXGroup; children = ( - 5F1F2F791DDDC4CC00194BCC /* Task Master */, - 5F1F2F901DDDC4CD00194BCC /* Task MasterTests */, - 5F1F2F781DDDC4CC00194BCC /* Products */, + 5F26CD811DDDDAF6008452B2 /* Task Master */, + 5F26CD981DDDDAF6008452B2 /* Task MasterTests */, + 5F26CD801DDDDAF6008452B2 /* Products */, ); sourceTree = ""; }; - 5F1F2F781DDDC4CC00194BCC /* Products */ = { + 5F26CD801DDDDAF6008452B2 /* Products */ = { isa = PBXGroup; children = ( - 5F1F2F771DDDC4CC00194BCC /* Task Master.app */, - 5F1F2F8D1DDDC4CD00194BCC /* Task MasterTests.xctest */, + 5F26CD7F1DDDDAF6008452B2 /* Task Master.app */, + 5F26CD951DDDDAF6008452B2 /* Task MasterTests.xctest */, ); name = Products; sourceTree = ""; }; - 5F1F2F791DDDC4CC00194BCC /* Task Master */ = { + 5F26CD811DDDDAF6008452B2 /* Task Master */ = { isa = PBXGroup; children = ( - 5F1F2F7A1DDDC4CC00194BCC /* AppDelegate.swift */, - 5F1F2F7C1DDDC4CC00194BCC /* MasterViewController.swift */, - 5F1F2F7E1DDDC4CC00194BCC /* DetailViewController.swift */, - 5F1F2F801DDDC4CC00194BCC /* Main.storyboard */, - 5F1F2F831DDDC4CC00194BCC /* Assets.xcassets */, - 5F1F2F851DDDC4CC00194BCC /* LaunchScreen.storyboard */, - 5F1F2F881DDDC4CC00194BCC /* Info.plist */, + 5F26CD821DDDDAF6008452B2 /* AppDelegate.swift */, + 5F26CD841DDDDAF6008452B2 /* FirstViewController.swift */, + 5F26CD861DDDDAF6008452B2 /* SecondViewController.swift */, + 5F26CD881DDDDAF6008452B2 /* Main.storyboard */, + 5F26CD8B1DDDDAF6008452B2 /* Assets.xcassets */, + 5F26CD8D1DDDDAF6008452B2 /* LaunchScreen.storyboard */, + 5F26CD901DDDDAF6008452B2 /* Info.plist */, ); path = "Task Master"; sourceTree = ""; }; - 5F1F2F901DDDC4CD00194BCC /* Task MasterTests */ = { + 5F26CD981DDDDAF6008452B2 /* Task MasterTests */ = { isa = PBXGroup; children = ( - 5F1F2F911DDDC4CD00194BCC /* Task_MasterTests.swift */, - 5F1F2F931DDDC4CD00194BCC /* Info.plist */, + 5F26CD991DDDDAF6008452B2 /* Task_MasterTests.swift */, + 5F26CD9B1DDDDAF6008452B2 /* Info.plist */, ); path = "Task MasterTests"; sourceTree = ""; @@ -102,13 +102,13 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 5F1F2F761DDDC4CC00194BCC /* Task Master */ = { + 5F26CD7E1DDDDAF6008452B2 /* Task Master */ = { isa = PBXNativeTarget; - buildConfigurationList = 5F1F2F961DDDC4CD00194BCC /* Build configuration list for PBXNativeTarget "Task Master" */; + buildConfigurationList = 5F26CD9E1DDDDAF6008452B2 /* Build configuration list for PBXNativeTarget "Task Master" */; buildPhases = ( - 5F1F2F731DDDC4CC00194BCC /* Sources */, - 5F1F2F741DDDC4CC00194BCC /* Frameworks */, - 5F1F2F751DDDC4CC00194BCC /* Resources */, + 5F26CD7B1DDDDAF6008452B2 /* Sources */, + 5F26CD7C1DDDDAF6008452B2 /* Frameworks */, + 5F26CD7D1DDDDAF6008452B2 /* Resources */, ); buildRules = ( ); @@ -116,51 +116,51 @@ ); name = "Task Master"; productName = "Task Master"; - productReference = 5F1F2F771DDDC4CC00194BCC /* Task Master.app */; + productReference = 5F26CD7F1DDDDAF6008452B2 /* Task Master.app */; productType = "com.apple.product-type.application"; }; - 5F1F2F8C1DDDC4CD00194BCC /* Task MasterTests */ = { + 5F26CD941DDDDAF6008452B2 /* Task MasterTests */ = { isa = PBXNativeTarget; - buildConfigurationList = 5F1F2F991DDDC4CD00194BCC /* Build configuration list for PBXNativeTarget "Task MasterTests" */; + buildConfigurationList = 5F26CDA11DDDDAF6008452B2 /* Build configuration list for PBXNativeTarget "Task MasterTests" */; buildPhases = ( - 5F1F2F891DDDC4CD00194BCC /* Sources */, - 5F1F2F8A1DDDC4CD00194BCC /* Frameworks */, - 5F1F2F8B1DDDC4CD00194BCC /* Resources */, + 5F26CD911DDDDAF6008452B2 /* Sources */, + 5F26CD921DDDDAF6008452B2 /* Frameworks */, + 5F26CD931DDDDAF6008452B2 /* Resources */, ); buildRules = ( ); dependencies = ( - 5F1F2F8F1DDDC4CD00194BCC /* PBXTargetDependency */, + 5F26CD971DDDDAF6008452B2 /* PBXTargetDependency */, ); name = "Task MasterTests"; productName = "Task MasterTests"; - productReference = 5F1F2F8D1DDDC4CD00194BCC /* Task MasterTests.xctest */; + productReference = 5F26CD951DDDDAF6008452B2 /* Task MasterTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ - 5F1F2F6F1DDDC4CC00194BCC /* Project object */ = { + 5F26CD771DDDDAF6008452B2 /* Project object */ = { isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0810; LastUpgradeCheck = 0810; ORGANIZATIONNAME = "Alexander Davis Computing and Media"; TargetAttributes = { - 5F1F2F761DDDC4CC00194BCC = { + 5F26CD7E1DDDDAF6008452B2 = { CreatedOnToolsVersion = 8.1; DevelopmentTeam = 28CC8SCVUN; ProvisioningStyle = Automatic; }; - 5F1F2F8C1DDDC4CD00194BCC = { + 5F26CD941DDDDAF6008452B2 = { CreatedOnToolsVersion = 8.1; DevelopmentTeam = 28CC8SCVUN; ProvisioningStyle = Automatic; - TestTargetID = 5F1F2F761DDDC4CC00194BCC; + TestTargetID = 5F26CD7E1DDDDAF6008452B2; }; }; }; - buildConfigurationList = 5F1F2F721DDDC4CC00194BCC /* Build configuration list for PBXProject "Task Master" */; + buildConfigurationList = 5F26CD7A1DDDDAF6008452B2 /* Build configuration list for PBXProject "Task Master" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; @@ -168,29 +168,29 @@ en, Base, ); - mainGroup = 5F1F2F6E1DDDC4CC00194BCC; - productRefGroup = 5F1F2F781DDDC4CC00194BCC /* Products */; + mainGroup = 5F26CD761DDDDAF6008452B2; + productRefGroup = 5F26CD801DDDDAF6008452B2 /* Products */; projectDirPath = ""; projectRoot = ""; targets = ( - 5F1F2F761DDDC4CC00194BCC /* Task Master */, - 5F1F2F8C1DDDC4CD00194BCC /* Task MasterTests */, + 5F26CD7E1DDDDAF6008452B2 /* Task Master */, + 5F26CD941DDDDAF6008452B2 /* Task MasterTests */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - 5F1F2F751DDDC4CC00194BCC /* Resources */ = { + 5F26CD7D1DDDDAF6008452B2 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 5F1F2F871DDDC4CC00194BCC /* LaunchScreen.storyboard in Resources */, - 5F1F2F841DDDC4CC00194BCC /* Assets.xcassets in Resources */, - 5F1F2F821DDDC4CC00194BCC /* Main.storyboard in Resources */, + 5F26CD8F1DDDDAF6008452B2 /* LaunchScreen.storyboard in Resources */, + 5F26CD8C1DDDDAF6008452B2 /* Assets.xcassets in Resources */, + 5F26CD8A1DDDDAF6008452B2 /* Main.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; - 5F1F2F8B1DDDC4CD00194BCC /* Resources */ = { + 5F26CD931DDDDAF6008452B2 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( @@ -200,47 +200,47 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - 5F1F2F731DDDC4CC00194BCC /* Sources */ = { + 5F26CD7B1DDDDAF6008452B2 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 5F1F2F7F1DDDC4CC00194BCC /* DetailViewController.swift in Sources */, - 5F1F2F7D1DDDC4CC00194BCC /* MasterViewController.swift in Sources */, - 5F1F2F7B1DDDC4CC00194BCC /* AppDelegate.swift in Sources */, + 5F26CD871DDDDAF6008452B2 /* SecondViewController.swift in Sources */, + 5F26CD831DDDDAF6008452B2 /* AppDelegate.swift in Sources */, + 5F26CD851DDDDAF6008452B2 /* FirstViewController.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; - 5F1F2F891DDDC4CD00194BCC /* Sources */ = { + 5F26CD911DDDDAF6008452B2 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 5F1F2F921DDDC4CD00194BCC /* Task_MasterTests.swift in Sources */, + 5F26CD9A1DDDDAF6008452B2 /* Task_MasterTests.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 5F1F2F8F1DDDC4CD00194BCC /* PBXTargetDependency */ = { + 5F26CD971DDDDAF6008452B2 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 5F1F2F761DDDC4CC00194BCC /* Task Master */; - targetProxy = 5F1F2F8E1DDDC4CD00194BCC /* PBXContainerItemProxy */; + target = 5F26CD7E1DDDDAF6008452B2 /* Task Master */; + targetProxy = 5F26CD961DDDDAF6008452B2 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ - 5F1F2F801DDDC4CC00194BCC /* Main.storyboard */ = { + 5F26CD881DDDDAF6008452B2 /* Main.storyboard */ = { isa = PBXVariantGroup; children = ( - 5F1F2F811DDDC4CC00194BCC /* Base */, + 5F26CD891DDDDAF6008452B2 /* Base */, ); name = Main.storyboard; sourceTree = ""; }; - 5F1F2F851DDDC4CC00194BCC /* LaunchScreen.storyboard */ = { + 5F26CD8D1DDDDAF6008452B2 /* LaunchScreen.storyboard */ = { isa = PBXVariantGroup; children = ( - 5F1F2F861DDDC4CC00194BCC /* Base */, + 5F26CD8E1DDDDAF6008452B2 /* Base */, ); name = LaunchScreen.storyboard; sourceTree = ""; @@ -248,7 +248,7 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ - 5F1F2F941DDDC4CD00194BCC /* Debug */ = { + 5F26CD9C1DDDDAF6008452B2 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -297,7 +297,7 @@ }; name = Debug; }; - 5F1F2F951DDDC4CD00194BCC /* Release */ = { + 5F26CD9D1DDDDAF6008452B2 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -339,7 +339,7 @@ }; name = Release; }; - 5F1F2F971DDDC4CD00194BCC /* Debug */ = { + 5F26CD9F1DDDDAF6008452B2 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; @@ -352,7 +352,7 @@ }; name = Debug; }; - 5F1F2F981DDDC4CD00194BCC /* Release */ = { + 5F26CDA01DDDDAF6008452B2 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; @@ -365,7 +365,7 @@ }; name = Release; }; - 5F1F2F9A1DDDC4CD00194BCC /* Debug */ = { + 5F26CDA21DDDDAF6008452B2 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; @@ -380,7 +380,7 @@ }; name = Debug; }; - 5F1F2F9B1DDDC4CD00194BCC /* Release */ = { + 5F26CDA31DDDDAF6008452B2 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; @@ -398,32 +398,32 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 5F1F2F721DDDC4CC00194BCC /* Build configuration list for PBXProject "Task Master" */ = { + 5F26CD7A1DDDDAF6008452B2 /* Build configuration list for PBXProject "Task Master" */ = { isa = XCConfigurationList; buildConfigurations = ( - 5F1F2F941DDDC4CD00194BCC /* Debug */, - 5F1F2F951DDDC4CD00194BCC /* Release */, + 5F26CD9C1DDDDAF6008452B2 /* Debug */, + 5F26CD9D1DDDDAF6008452B2 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 5F1F2F961DDDC4CD00194BCC /* Build configuration list for PBXNativeTarget "Task Master" */ = { + 5F26CD9E1DDDDAF6008452B2 /* Build configuration list for PBXNativeTarget "Task Master" */ = { isa = XCConfigurationList; buildConfigurations = ( - 5F1F2F971DDDC4CD00194BCC /* Debug */, - 5F1F2F981DDDC4CD00194BCC /* Release */, + 5F26CD9F1DDDDAF6008452B2 /* Debug */, + 5F26CDA01DDDDAF6008452B2 /* Release */, ); defaultConfigurationIsVisible = 0; }; - 5F1F2F991DDDC4CD00194BCC /* Build configuration list for PBXNativeTarget "Task MasterTests" */ = { + 5F26CDA11DDDDAF6008452B2 /* Build configuration list for PBXNativeTarget "Task MasterTests" */ = { isa = XCConfigurationList; buildConfigurations = ( - 5F1F2F9A1DDDC4CD00194BCC /* Debug */, - 5F1F2F9B1DDDC4CD00194BCC /* Release */, + 5F26CDA21DDDDAF6008452B2 /* Debug */, + 5F26CDA31DDDDAF6008452B2 /* Release */, ); defaultConfigurationIsVisible = 0; }; /* End XCConfigurationList section */ }; - rootObject = 5F1F2F6F1DDDC4CC00194BCC /* Project object */; + rootObject = 5F26CD771DDDDAF6008452B2 /* Project object */; } diff --git a/Task Master/Task Master.xcodeproj/project.xcworkspace/xcuserdata/alexanderdavis.xcuserdatad/UserInterfaceState.xcuserstate b/Task Master/Task Master.xcodeproj/project.xcworkspace/xcuserdata/alexanderdavis.xcuserdatad/UserInterfaceState.xcuserstate index d290cea..05f3e15 100644 Binary files a/Task Master/Task Master.xcodeproj/project.xcworkspace/xcuserdata/alexanderdavis.xcuserdatad/UserInterfaceState.xcuserstate and b/Task Master/Task Master.xcodeproj/project.xcworkspace/xcuserdata/alexanderdavis.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/Task Master/Task Master.xcodeproj/xcuserdata/alexanderdavis.xcuserdatad/xcschemes/Task Master.xcscheme b/Task Master/Task Master.xcodeproj/xcuserdata/alexanderdavis.xcuserdatad/xcschemes/Task Master.xcscheme index a34a48a..e826227 100644 --- a/Task Master/Task Master.xcodeproj/xcuserdata/alexanderdavis.xcuserdatad/xcschemes/Task Master.xcscheme +++ b/Task Master/Task Master.xcodeproj/xcuserdata/alexanderdavis.xcuserdatad/xcschemes/Task Master.xcscheme @@ -14,7 +14,7 @@ buildForAnalyzing = "YES"> @@ -32,7 +32,7 @@ skipped = "NO"> @@ -42,7 +42,7 @@ @@ -65,7 +65,7 @@ runnableDebuggingMode = "0"> @@ -84,7 +84,7 @@ runnableDebuggingMode = "0"> diff --git a/Task Master/Task Master.xcodeproj/xcuserdata/alexanderdavis.xcuserdatad/xcschemes/xcschememanagement.plist b/Task Master/Task Master.xcodeproj/xcuserdata/alexanderdavis.xcuserdatad/xcschemes/xcschememanagement.plist index 528f3bb..5420f97 100644 --- a/Task Master/Task Master.xcodeproj/xcuserdata/alexanderdavis.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/Task Master/Task Master.xcodeproj/xcuserdata/alexanderdavis.xcuserdatad/xcschemes/xcschememanagement.plist @@ -12,12 +12,12 @@ SuppressBuildableAutocreation - 5F1F2F761DDDC4CC00194BCC + 5F26CD7E1DDDDAF6008452B2 primary - 5F1F2F8C1DDDC4CD00194BCC + 5F26CD941DDDDAF6008452B2 primary diff --git a/Task Master/Task Master/AppDelegate.swift b/Task Master/Task Master/AppDelegate.swift index a61d199..b70f9c7 100644 --- a/Task Master/Task Master/AppDelegate.swift +++ b/Task Master/Task Master/AppDelegate.swift @@ -9,17 +9,13 @@ import UIKit @UIApplicationMain -class AppDelegate: UIResponder, UIApplicationDelegate, UISplitViewControllerDelegate { +class AppDelegate: UIResponder, UIApplicationDelegate { var window: UIWindow? func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool { // Override point for customization after application launch. - let splitViewController = self.window!.rootViewController as! UISplitViewController - let navigationController = splitViewController.viewControllers[splitViewController.viewControllers.count-1] as! UINavigationController - navigationController.topViewController!.navigationItem.leftBarButtonItem = splitViewController.displayModeButtonItem - splitViewController.delegate = self return true } @@ -45,17 +41,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UISplitViewControllerDele // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:. } - // MARK: - Split view - - func splitViewController(_ splitViewController: UISplitViewController, collapseSecondary secondaryViewController:UIViewController, onto primaryViewController:UIViewController) -> Bool { - guard let secondaryAsNavController = secondaryViewController as? UINavigationController else { return false } - guard let topAsDetailController = secondaryAsNavController.topViewController as? DetailViewController else { return false } - if topAsDetailController.detailItem == nil { - // Return true to indicate that we have handled the collapse by doing nothing; the secondary controller will be discarded. - return true - } - return false - } } diff --git a/Task Master/Task Master/Assets.xcassets/first.imageset/Contents.json b/Task Master/Task Master/Assets.xcassets/first.imageset/Contents.json new file mode 100644 index 0000000..33a7451 --- /dev/null +++ b/Task Master/Task Master/Assets.xcassets/first.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "first.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Task Master/Task Master/Assets.xcassets/first.imageset/first.pdf b/Task Master/Task Master/Assets.xcassets/first.imageset/first.pdf new file mode 100644 index 0000000..47d911d Binary files /dev/null and b/Task Master/Task Master/Assets.xcassets/first.imageset/first.pdf differ diff --git a/Task Master/Task Master/Assets.xcassets/second.imageset/Contents.json b/Task Master/Task Master/Assets.xcassets/second.imageset/Contents.json new file mode 100644 index 0000000..03bd9c9 --- /dev/null +++ b/Task Master/Task Master/Assets.xcassets/second.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "second.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Task Master/Task Master/Assets.xcassets/second.imageset/second.pdf b/Task Master/Task Master/Assets.xcassets/second.imageset/second.pdf new file mode 100644 index 0000000..401614e Binary files /dev/null and b/Task Master/Task Master/Assets.xcassets/second.imageset/second.pdf differ diff --git a/Task Master/Task Master/Base.lproj/Main.storyboard b/Task Master/Task Master/Base.lproj/Main.storyboard index 25fdf94..8bca8db 100644 --- a/Task Master/Task Master/Base.lproj/Main.storyboard +++ b/Task Master/Task Master/Base.lproj/Main.storyboard @@ -1,162 +1,108 @@ - - - - - + + - - + - - + + - - - - - - - - - - - - - - - - - + - - + + - + - - - - + + + + - - - - - + - + - + - - + + - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + - - + + - - - - - + + + + + + + - + + - - + + - + - - - + + + + diff --git a/Task Master/Task Master/DetailViewController.swift b/Task Master/Task Master/DetailViewController.swift deleted file mode 100644 index aab3ab5..0000000 --- a/Task Master/Task Master/DetailViewController.swift +++ /dev/null @@ -1,45 +0,0 @@ -// -// DetailViewController.swift -// Task Master -// -// Created by Alexander Davis on 17/11/2016. -// Copyright © 2016 Alexander Davis Computing and Media. All rights reserved. -// - -import UIKit - -class DetailViewController: UIViewController { - - @IBOutlet weak var detailDescriptionLabel: UILabel! - - - func configureView() { - // Update the user interface for the detail item. - if let detail = self.detailItem { - if let label = self.detailDescriptionLabel { - label.text = detail.description - } - } - } - - override func viewDidLoad() { - super.viewDidLoad() - // Do any additional setup after loading the view, typically from a nib. - self.configureView() - } - - override func didReceiveMemoryWarning() { - super.didReceiveMemoryWarning() - // Dispose of any resources that can be recreated. - } - - var detailItem: NSDate? { - didSet { - // Update the view. - self.configureView() - } - } - - -} - diff --git a/Task Master/Task Master/FirstViewController.swift b/Task Master/Task Master/FirstViewController.swift new file mode 100644 index 0000000..a0f80cb --- /dev/null +++ b/Task Master/Task Master/FirstViewController.swift @@ -0,0 +1,25 @@ +// +// FirstViewController.swift +// Task Master +// +// Created by Alexander Davis on 17/11/2016. +// Copyright © 2016 Alexander Davis Computing and Media. All rights reserved. +// + +import UIKit + +class FirstViewController: UIViewController { + + override func viewDidLoad() { + super.viewDidLoad() + // Do any additional setup after loading the view, typically from a nib. + } + + override func didReceiveMemoryWarning() { + super.didReceiveMemoryWarning() + // Dispose of any resources that can be recreated. + } + + +} + diff --git a/Task Master/Task Master/MasterViewController.swift b/Task Master/Task Master/MasterViewController.swift deleted file mode 100644 index f7b86bd..0000000 --- a/Task Master/Task Master/MasterViewController.swift +++ /dev/null @@ -1,94 +0,0 @@ -// -// MasterViewController.swift -// Task Master -// -// Created by Alexander Davis on 17/11/2016. -// Copyright © 2016 Alexander Davis Computing and Media. All rights reserved. -// - -import UIKit - -class MasterViewController: UITableViewController { - - var detailViewController: DetailViewController? = nil - var objects = [Any]() - - - override func viewDidLoad() { - super.viewDidLoad() - // Do any additional setup after loading the view, typically from a nib. - self.navigationItem.leftBarButtonItem = self.editButtonItem - - let addButton = UIBarButtonItem(barButtonSystemItem: .add, target: self, action: #selector(insertNewObject(_:))) - self.navigationItem.rightBarButtonItem = addButton - if let split = self.splitViewController { - let controllers = split.viewControllers - self.detailViewController = (controllers[controllers.count-1] as! UINavigationController).topViewController as? DetailViewController - } - } - - override func viewWillAppear(_ animated: Bool) { - self.clearsSelectionOnViewWillAppear = self.splitViewController!.isCollapsed - super.viewWillAppear(animated) - } - - override func didReceiveMemoryWarning() { - super.didReceiveMemoryWarning() - // Dispose of any resources that can be recreated. - } - - func insertNewObject(_ sender: Any) { - objects.insert(NSDate(), at: 0) - let indexPath = IndexPath(row: 0, section: 0) - self.tableView.insertRows(at: [indexPath], with: .automatic) - } - - // MARK: - Segues - - override func prepare(for segue: UIStoryboardSegue, sender: Any?) { - if segue.identifier == "showDetail" { - if let indexPath = self.tableView.indexPathForSelectedRow { - let object = objects[indexPath.row] as! NSDate - let controller = (segue.destination as! UINavigationController).topViewController as! DetailViewController - controller.detailItem = object - controller.navigationItem.leftBarButtonItem = self.splitViewController?.displayModeButtonItem - controller.navigationItem.leftItemsSupplementBackButton = true - } - } - } - - // MARK: - Table View - - override func numberOfSections(in tableView: UITableView) -> Int { - return 1 - } - - override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { - return objects.count - } - - override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { - let cell = tableView.dequeueReusableCell(withIdentifier: "Cell", for: indexPath) - - let object = objects[indexPath.row] as! NSDate - cell.textLabel!.text = object.description - return cell - } - - override func tableView(_ tableView: UITableView, canEditRowAt indexPath: IndexPath) -> Bool { - // Return false if you do not want the specified item to be editable. - return true - } - - override func tableView(_ tableView: UITableView, commit editingStyle: UITableViewCellEditingStyle, forRowAt indexPath: IndexPath) { - if editingStyle == .delete { - objects.remove(at: indexPath.row) - tableView.deleteRows(at: [indexPath], with: .fade) - } else if editingStyle == .insert { - // Create a new instance of the appropriate class, insert it into the array, and add a new row to the table view. - } - } - - -} - diff --git a/Task Master/Task Master/SecondViewController.swift b/Task Master/Task Master/SecondViewController.swift new file mode 100644 index 0000000..476b9dc --- /dev/null +++ b/Task Master/Task Master/SecondViewController.swift @@ -0,0 +1,25 @@ +// +// SecondViewController.swift +// Task Master +// +// Created by Alexander Davis on 17/11/2016. +// Copyright © 2016 Alexander Davis Computing and Media. All rights reserved. +// + +import UIKit + +class SecondViewController: UIViewController { + + override func viewDidLoad() { + super.viewDidLoad() + // Do any additional setup after loading the view, typically from a nib. + } + + override func didReceiveMemoryWarning() { + super.didReceiveMemoryWarning() + // Dispose of any resources that can be recreated. + } + + +} +