From 0ab98ea7eaac30b01e00d1a91c66ae0825dce704 Mon Sep 17 00:00:00 2001 From: Alexander Davis Date: Thu, 17 Nov 2016 12:35:10 +0000 Subject: [PATCH] Modification of the xCode Application This change makes the application a tab based application on the Swift iOS model --- .../Task Master.xcodeproj/project.pbxproj | 194 ++++++++--------- .../UserInterfaceState.xcuserstate | Bin 15441 -> 8346 bytes .../xcschemes/Task Master.xcscheme | 10 +- .../xcschemes/xcschememanagement.plist | 4 +- Task Master/Task Master/AppDelegate.swift | 17 +- .../first.imageset/Contents.json | 12 ++ .../Assets.xcassets/first.imageset/first.pdf | Bin 0 -> 2465 bytes .../second.imageset/Contents.json | 12 ++ .../second.imageset/second.pdf | Bin 0 -> 2423 bytes .../Task Master/Base.lproj/Main.storyboard | 200 +++++++----------- .../Task Master/DetailViewController.swift | 45 ---- .../Task Master/FirstViewController.swift | 25 +++ .../Task Master/MasterViewController.swift | 94 -------- .../Task Master/SecondViewController.swift | 25 +++ 14 files changed, 252 insertions(+), 386 deletions(-) create mode 100644 Task Master/Task Master/Assets.xcassets/first.imageset/Contents.json create mode 100644 Task Master/Task Master/Assets.xcassets/first.imageset/first.pdf create mode 100644 Task Master/Task Master/Assets.xcassets/second.imageset/Contents.json create mode 100644 Task Master/Task Master/Assets.xcassets/second.imageset/second.pdf delete mode 100644 Task Master/Task Master/DetailViewController.swift create mode 100644 Task Master/Task Master/FirstViewController.swift delete mode 100644 Task Master/Task Master/MasterViewController.swift create mode 100644 Task Master/Task Master/SecondViewController.swift 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 d290cea7a308664324773a7391f8101389988bb3..05f3e15b2a479c40272cd4f305995b9834fc7d68 100644 GIT binary patch delta 5306 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 AGynhq 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 0000000000000000000000000000000000000000..47d911dea647d55983671ead4d08b6f6b3600715 GIT binary patch literal 2465 zcmai03se(l7FLvisY+L#f-EBsK`11Xkc1=%MIujmB|xQ!>5vQ%APFP`Mlf5nSPOKE z2-^C>7DZkM!J;Da5{kfrC?Kvp3J41-3shFXvhuJqKo*oer*r0H{{P-P_x0cTzLzjD!bE z0qT;#Q7l4Gy%fMoXJaKT`@{5#R(MOqJPwQifv8iK6A%Ot9L14h2`38T!2s4PM=1!< zmL06}VYAA|ay#jZRs>HpA%X+eQW4rufWU%d1w5GTy!X#LeZsF_+~ccZmn3Fi)v^Z; zIG;?uU*yLLEYs61tjD>gXOFvSWsh{48xJvPNqKrIJtMdCz2cA2aC7TF?b@K`V!Lw- zE;zpH&ApqhoRjAHt}gK}>(qAc8dvrkD31*`<5<%C(&4_LqhQ3-GOf8~n^leG?+-@@^pjPa$J2gW@O)!b9hdTJ zTauyIJ&~rqeEZC1p9dWgx7{_WRc2=drMO=wcT7B{Zd58z`d)r_36r4V<6PGkCjpGfbnVMtm@;b}F!T?)Qav$_y7H5T;Mf!T}M zWxP9TNqrV?e5;b|pWd3^u2KAatk&3aDB@0 zZBaQNdCZ2#fblzYZnRCCjQ-GQWb-s8bX&<)?SxnUGdDYVFVk`xIf7@g3~$DX`H71_;r5OSZz1p`$_8y_9 z{;MJJ+n=>7Ewg;GnGHoz)&ID0z@F2!e$F7cWQ?d6s(!VY)_Gw})xCyMvsD={5i&H* zAIr_ACo8;Se6<*!-mm9Am79Iz^RVlc?%S5sg|E*SyIV{dd9{Mpf#d3cih5WKt=%ps zBEo)bt8EjmeCFYJRYU|b7d`p+-V|X2wOCYtyLP6t=!WH-kgdf0A};ytPfZiCwVPx{ z`g;zpe{8a4RQxQUwVU02<4X3w|9h;}XjhGWquqn{vVqq8g{*}BQF9=ybe_TM*!M=rFs1pN)yzctIXAoicsCe6>fit>wgZ#vp^hZOY0`J`rx zwdSK?GwR_xm9;5XjH|vf{O+Yg-)z;s*xt>;-vU`D-_SK<=~4eEVQkV~57{vyH6ebu>DqwE~Mx_A31Lg~$ zy`i52ew?GEluE%AN>ju*5z~dx2QQLP-G+E>o|En2+s&<^4*d zWD+<8PXs_Jp7_5Dpi(Gg3J?M;%Rn0{dcxQRh!ip+iHJ_e`!bM1MGxwI8Iedr+x>wI zq@&04fsADHfBccq^gpm8Q_u-~Uj|Z$YwSR(^_mzUb!}Xb2Cj`uqphg}v_Y%?Fs=;= zWq3s{hy)Tu!ji@RJsd$C+G{F6V2j1*Xk+7xo|LO7M2yb)(wc=%x-AclP9pLsbTF7m tf?*P!2EjJu5MD57P32Q4pdJ3tO_shCDT2=K;$ebx8ymcd$v!V9{2$sQiO>K5 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..401614e288b4b160471c2776bed6f09762af3e1c GIT binary patch literal 2423 zcmai02~-nz8dqq7rWU#)x2z)&iMWtV?gK$2a)?|BP!TbkV}J-Gl1wmy+3G9S0=uOY zwCjai6uBOPMMdNiN`VDYKwLQr2#W^`R93*Ua=0^)EGYY4=grIf|KIohziYnv{elnR zdN_hk6db<(+3RPcxs!iut8c(j0TLh=9mY931H^rhEE0|aXo!dh5Iv+ZFr+}9F+v#P zLSnfD0$f~hN>~92V{z)WJA&2)5rW!|I?;o?oI*%zejJiuY>hFLQwKlAa9O+PnPh#% zJp~JAfs-De6u@;{cREMs}D-sGib_4>50m8_|Uj-zC0m@Qx zJV+^5Da4Qxpf3sBtKZs<_aI$Cb1T+h<->yL^rfiGNelYkqgC3#SqVP_iy*_RPcbjH)xYf zvYdC-)D_t8c{=5%;$VJQxs_#61J*kuXMC?|&PbPo-7uSxoNr~&J94|gKk+03JGXXM zx4w~=^VUzWqQveu_ilRgPdgNNdnLZCH`=;w91}cP5ihdm*B_jI+rk=Pz2Lk!)XUu| zkls3P5&YHJ!t0kF+MUVBHOAx)a zy|JxHNd37z*~b5#%*0w_F|#4?erNP;pG`Fevoq2%?9Y>%Cmzv1(ks;aPIGaiy1mhU zr{7lB^Mem&`QK{b{uiDC zLD8muY(FNk{YdV|zO#o_VB%);8|~Bh(Z4p?GM}g-HN2;q7~YNl-lD~HZ$taYw$Fzbn6c?c5eo=@`i>()el#qwB)hI-gp0 ztsw@dh-I5NJkk)RCoBC`L8ffKfY)=oG=#4LA9TO6eA}9~@a6dupB+=S{%s&NY}^0GY`hAqod)uxXHitrN%bWOJohV>t?!&Z#d4y^7J@=Oh`HV zee**4j>xRUd)|D0^I-B#<`m1-5PO{)!v(q?ecFYqr_8Q{+z7#n0uFbq%_?hZ-Ck(6NRn=vDS7Nb1Xxx_)9`!i- zGR>av*PJ+P_AGO*a_$FbtCCISg5PK44p&W#t$)+HVcxpR9LAL%_Pv$p`0tO*sYZD0 zCG3-ipr4WoVbjpw%Nf^r^rnWcDcjumgBPEjO;NM6QtZ8wU#0rjHx5zs%CahF4$W*U zxu!q8kYP+>v!BNPVIRJUGIWU@7qVvx2VZDw4gV8%z%bjpF#aF(W|PmliwlakuRq>= zhaCRc^R!7T)#Twb0{!Tns=CxGcGX|leErg`f3|v0eBXxHU&6Sj-_>zOL!!d+j5Xt* zPS;rWd^zEF{5d5%)nNK=)zFJ8Uc=aQKD%UK)_TNes1Gh{SD*Mb_@O` z7*zs9Uq~Vq?v|^8FcM-yLGMKzR3YFB0z@CFM2X-dio%Gu6&MJj=I?uS7sA3AdE^p8 zE49$PjJzPIJwfn;jso7X2#jynr3dO@p5QAK1O9wqKLC=PkQjj~p#n|-5O`ihbTzzu zL{}2QEe28pJYfVZRW56FL`LvO&|C^1Th{0}hQMW$Ng$QPpnzlwnMnf=kVy8(y==L% zLMa>r0gELdT - - - - + + - - + - - + + - - - - - - - - - - - - - - - - - + - - + + - + - - - - + + + + - - - - - + - + - + - - + + - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + - - + + - - - - - + + + + + + + - + + - - + + - + - - - + + + + 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. + } + + +} +