diff --git a/ios-cs-app.xcodeproj/project.pbxproj b/ios-cs-app.xcodeproj/project.pbxproj index de976ff..26ca02f 100644 --- a/ios-cs-app.xcodeproj/project.pbxproj +++ b/ios-cs-app.xcodeproj/project.pbxproj @@ -8,13 +8,16 @@ /* Begin PBXBuildFile section */ E15FD4F11E37DFC600DFC9B6 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E15FD4F01E37DFC600DFC9B6 /* AppDelegate.swift */; }; - E15FD4F31E37DFC600DFC9B6 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E15FD4F21E37DFC600DFC9B6 /* ViewController.swift */; }; - E15FD4F61E37DFC600DFC9B6 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E15FD4F41E37DFC600DFC9B6 /* Main.storyboard */; }; E15FD4F91E37DFC600DFC9B6 /* ios_cs_app.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = E15FD4F71E37DFC600DFC9B6 /* ios_cs_app.xcdatamodeld */; }; E15FD4FB1E37DFC600DFC9B6 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E15FD4FA1E37DFC600DFC9B6 /* Assets.xcassets */; }; E15FD4FE1E37DFC600DFC9B6 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E15FD4FC1E37DFC600DFC9B6 /* LaunchScreen.storyboard */; }; E15FD5091E37DFC600DFC9B6 /* ios_cs_appTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E15FD5081E37DFC600DFC9B6 /* ios_cs_appTests.swift */; }; E15FD5141E37DFC600DFC9B6 /* ios_cs_appUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E15FD5131E37DFC600DFC9B6 /* ios_cs_appUITests.swift */; }; + E15FD5251E37E00600DFC9B6 /* ExplorerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E15FD5211E37E00600DFC9B6 /* ExplorerViewController.swift */; }; + E15FD5261E37E00600DFC9B6 /* MyProductivityViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E15FD5221E37E00600DFC9B6 /* MyProductivityViewController.swift */; }; + E15FD5271E37E00600DFC9B6 /* QuickLinksViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E15FD5231E37E00600DFC9B6 /* QuickLinksViewController.swift */; }; + E15FD5281E37E00600DFC9B6 /* TaskCenterViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E15FD5241E37E00600DFC9B6 /* TaskCenterViewController.swift */; }; + E15FD52B1E37E01100DFC9B6 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E15FD5291E37E01100DFC9B6 /* Main.storyboard */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -37,8 +40,6 @@ /* Begin PBXFileReference section */ E15FD4ED1E37DFC600DFC9B6 /* ios-cs-app.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ios-cs-app.app"; sourceTree = BUILT_PRODUCTS_DIR; }; E15FD4F01E37DFC600DFC9B6 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - E15FD4F21E37DFC600DFC9B6 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; - E15FD4F51E37DFC600DFC9B6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; E15FD4F81E37DFC600DFC9B6 /* ios_cs_app.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = ios_cs_app.xcdatamodel; sourceTree = ""; }; E15FD4FA1E37DFC600DFC9B6 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; E15FD4FD1E37DFC600DFC9B6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; @@ -49,6 +50,11 @@ E15FD50F1E37DFC600DFC9B6 /* ios-cs-appUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "ios-cs-appUITests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; E15FD5131E37DFC600DFC9B6 /* ios_cs_appUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ios_cs_appUITests.swift; sourceTree = ""; }; E15FD5151E37DFC600DFC9B6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + E15FD5211E37E00600DFC9B6 /* ExplorerViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExplorerViewController.swift; sourceTree = ""; }; + E15FD5221E37E00600DFC9B6 /* MyProductivityViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MyProductivityViewController.swift; sourceTree = ""; }; + E15FD5231E37E00600DFC9B6 /* QuickLinksViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QuickLinksViewController.swift; sourceTree = ""; }; + E15FD5241E37E00600DFC9B6 /* TaskCenterViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TaskCenterViewController.swift; sourceTree = ""; }; + E15FD52A1E37E01100DFC9B6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -99,13 +105,11 @@ E15FD4EF1E37DFC600DFC9B6 /* ios-cs-app */ = { isa = PBXGroup; children = ( - E15FD4F01E37DFC600DFC9B6 /* AppDelegate.swift */, - E15FD4F21E37DFC600DFC9B6 /* ViewController.swift */, - E15FD4F41E37DFC600DFC9B6 /* Main.storyboard */, - E15FD4FA1E37DFC600DFC9B6 /* Assets.xcassets */, - E15FD4FC1E37DFC600DFC9B6 /* LaunchScreen.storyboard */, - E15FD4FF1E37DFC600DFC9B6 /* Info.plist */, - E15FD4F71E37DFC600DFC9B6 /* ios_cs_app.xcdatamodeld */, + E15FD5211E37E00600DFC9B6 /* ExplorerViewController.swift */, + E15FD5241E37E00600DFC9B6 /* TaskCenterViewController.swift */, + E15FD5221E37E00600DFC9B6 /* MyProductivityViewController.swift */, + E15FD5231E37E00600DFC9B6 /* QuickLinksViewController.swift */, + E15FD52C1E37E0A400DFC9B6 /* Supporting Files */, ); path = "ios-cs-app"; sourceTree = ""; @@ -128,6 +132,19 @@ path = "ios-cs-appUITests"; sourceTree = ""; }; + E15FD52C1E37E0A400DFC9B6 /* Supporting Files */ = { + isa = PBXGroup; + children = ( + E15FD4F01E37DFC600DFC9B6 /* AppDelegate.swift */, + E15FD5291E37E01100DFC9B6 /* Main.storyboard */, + E15FD4FA1E37DFC600DFC9B6 /* Assets.xcassets */, + E15FD4FC1E37DFC600DFC9B6 /* LaunchScreen.storyboard */, + E15FD4FF1E37DFC600DFC9B6 /* Info.plist */, + E15FD4F71E37DFC600DFC9B6 /* ios_cs_app.xcdatamodeld */, + ); + name = "Supporting Files"; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -235,9 +252,9 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + E15FD52B1E37E01100DFC9B6 /* Main.storyboard in Resources */, E15FD4FE1E37DFC600DFC9B6 /* LaunchScreen.storyboard in Resources */, E15FD4FB1E37DFC600DFC9B6 /* Assets.xcassets in Resources */, - E15FD4F61E37DFC600DFC9B6 /* Main.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -262,8 +279,11 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - E15FD4F31E37DFC600DFC9B6 /* ViewController.swift in Sources */, + E15FD5261E37E00600DFC9B6 /* MyProductivityViewController.swift in Sources */, E15FD4F11E37DFC600DFC9B6 /* AppDelegate.swift in Sources */, + E15FD5251E37E00600DFC9B6 /* ExplorerViewController.swift in Sources */, + E15FD5271E37E00600DFC9B6 /* QuickLinksViewController.swift in Sources */, + E15FD5281E37E00600DFC9B6 /* TaskCenterViewController.swift in Sources */, E15FD4F91E37DFC600DFC9B6 /* ios_cs_app.xcdatamodeld in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -300,20 +320,20 @@ /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ - E15FD4F41E37DFC600DFC9B6 /* Main.storyboard */ = { + E15FD4FC1E37DFC600DFC9B6 /* LaunchScreen.storyboard */ = { isa = PBXVariantGroup; children = ( - E15FD4F51E37DFC600DFC9B6 /* Base */, + E15FD4FD1E37DFC600DFC9B6 /* Base */, ); - name = Main.storyboard; + name = LaunchScreen.storyboard; sourceTree = ""; }; - E15FD4FC1E37DFC600DFC9B6 /* LaunchScreen.storyboard */ = { + E15FD5291E37E01100DFC9B6 /* Main.storyboard */ = { isa = PBXVariantGroup; children = ( - E15FD4FD1E37DFC600DFC9B6 /* Base */, + E15FD52A1E37E01100DFC9B6 /* Base */, ); - name = LaunchScreen.storyboard; + name = Main.storyboard; sourceTree = ""; }; /* End PBXVariantGroup section */ diff --git a/ios-cs-app.xcodeproj/xcuserdata/esericksanc.xcuserdatad/xcschemes/ios-cs-app.xcscheme b/ios-cs-app.xcodeproj/xcuserdata/esericksanc.xcuserdatad/xcschemes/ios-cs-app.xcscheme index b422b1d..2f8d0a1 100644 --- a/ios-cs-app.xcodeproj/xcuserdata/esericksanc.xcuserdatad/xcschemes/ios-cs-app.xcscheme +++ b/ios-cs-app.xcodeproj/xcuserdata/esericksanc.xcuserdatad/xcschemes/ios-cs-app.xcscheme @@ -5,6 +5,22 @@ + + + + + + + + + + + + + + + + + + @@ -26,6 +71,16 @@ debugDocumentVersioning = "YES" debugServiceExtension = "internal" allowLocationSimulation = "YES"> + + + + @@ -35,6 +90,16 @@ savedToolIdentifier = "" useCustomWorkingDirectory = "NO" debugDocumentVersioning = "YES"> + + + + diff --git a/ios-cs-app/Base.lproj/Main.storyboard b/ios-cs-app/Base.lproj/Main.storyboard index 273375f..bfc5e26 100644 --- a/ios-cs-app/Base.lproj/Main.storyboard +++ b/ios-cs-app/Base.lproj/Main.storyboard @@ -1,26 +1,158 @@ - - + + + + + - + + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ios-cs-app/ViewController.swift b/ios-cs-app/ExplorerViewController.swift similarity index 80% rename from ios-cs-app/ViewController.swift rename to ios-cs-app/ExplorerViewController.swift index cf289fd..2a1bcc3 100644 --- a/ios-cs-app/ViewController.swift +++ b/ios-cs-app/ExplorerViewController.swift @@ -1,14 +1,14 @@ // // ViewController.swift -// ios-cs-app +// CS App // -// Created by Erick Sanchez on 1/24/17. +// Created by Erick Sanchez on 1/23/17. // Copyright © 2017 SRJC Computer Science Club. All rights reserved. // import UIKit -class ViewController: UIViewController { +class ExplorerViewController: UIViewController { override func viewDidLoad() { super.viewDidLoad() diff --git a/ios-cs-app/MyProductivityViewController.swift b/ios-cs-app/MyProductivityViewController.swift new file mode 100644 index 0000000..885cae8 --- /dev/null +++ b/ios-cs-app/MyProductivityViewController.swift @@ -0,0 +1,35 @@ +// +// MyProductivityViewController.swift +// CS App +// +// Created by Erick Sanchez on 1/23/17. +// Copyright © 2017 SRJC Computer Science Club. All rights reserved. +// + +import UIKit + +class MyProductivityViewController: UIViewController { + + override func viewDidLoad() { + super.viewDidLoad() + + // Do any additional setup after loading the view. + } + + override func didReceiveMemoryWarning() { + super.didReceiveMemoryWarning() + // Dispose of any resources that can be recreated. + } + + + /* + // MARK: - Navigation + + // In a storyboard-based application, you will often want to do a little preparation before navigation + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { + // Get the new view controller using segue.destinationViewController. + // Pass the selected object to the new view controller. + } + */ + +} diff --git a/ios-cs-app/QuickLinksViewController.swift b/ios-cs-app/QuickLinksViewController.swift new file mode 100644 index 0000000..836958b --- /dev/null +++ b/ios-cs-app/QuickLinksViewController.swift @@ -0,0 +1,35 @@ +// +// QuickLinksViewController.swift +// CS App +// +// Created by Erick Sanchez on 1/23/17. +// Copyright © 2017 SRJC Computer Science Club. All rights reserved. +// + +import UIKit + +class QuickLinksViewController: UITableViewController { + + override func viewDidLoad() { + super.viewDidLoad() + + // Do any additional setup after loading the view. + } + + override func didReceiveMemoryWarning() { + super.didReceiveMemoryWarning() + // Dispose of any resources that can be recreated. + } + + + /* + // MARK: - Navigation + + // In a storyboard-based application, you will often want to do a little preparation before navigation + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { + // Get the new view controller using segue.destinationViewController. + // Pass the selected object to the new view controller. + } + */ + +} diff --git a/ios-cs-app/TaskCenterViewController.swift b/ios-cs-app/TaskCenterViewController.swift new file mode 100644 index 0000000..d2babf4 --- /dev/null +++ b/ios-cs-app/TaskCenterViewController.swift @@ -0,0 +1,35 @@ +// +// TaskCenterViewController.swift +// CS App +// +// Created by Erick Sanchez on 1/23/17. +// Copyright © 2017 SRJC Computer Science Club. All rights reserved. +// + +import UIKit + +class TaskCenterViewController: UIViewController { + + override func viewDidLoad() { + super.viewDidLoad() + + // Do any additional setup after loading the view. + } + + override func didReceiveMemoryWarning() { + super.didReceiveMemoryWarning() + // Dispose of any resources that can be recreated. + } + + + /* + // MARK: - Navigation + + // In a storyboard-based application, you will often want to do a little preparation before navigation + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { + // Get the new view controller using segue.destinationViewController. + // Pass the selected object to the new view controller. + } + */ + +}