From 00b7779ff22e40d2fc571cc5582e5f5cdbbebe84 Mon Sep 17 00:00:00 2001 From: Timothy Davis Date: Sun, 21 Apr 2019 15:14:19 -0400 Subject: [PATCH] Revert "Merge pull request #2 from Aargonian/revert-1-Stopwatch" This reverts commit 049a50aee90ff7219c06463262a3eb8f1262f5f1, reversing changes made to cc8fcca473292cea80502215d38c88b778d38efe. --- Project308.xcodeproj/project.pbxproj | 12 ++++++---- Project308/Base.lproj/Main.storyboard | 4 ++-- Project308/StopWatchViewController.swift | 30 ++++++++++++++++++++++++ Project308/TimerViewController.swift | 30 ++++++++++++++++++++++++ 4 files changed, 70 insertions(+), 6 deletions(-) create mode 100644 Project308/StopWatchViewController.swift create mode 100644 Project308/TimerViewController.swift diff --git a/Project308.xcodeproj/project.pbxproj b/Project308.xcodeproj/project.pbxproj index 60093d7..c944d88 100644 --- a/Project308.xcodeproj/project.pbxproj +++ b/Project308.xcodeproj/project.pbxproj @@ -8,12 +8,13 @@ /* Begin PBXBuildFile section */ 16C2E9372266302E00C8FA04 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16C2E9362266302E00C8FA04 /* AppDelegate.swift */; }; - 16C2E9392266302E00C8FA04 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16C2E9382266302E00C8FA04 /* ViewController.swift */; }; 16C2E93C2266302E00C8FA04 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 16C2E93A2266302E00C8FA04 /* Main.storyboard */; }; 16C2E93E2266302E00C8FA04 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 16C2E93D2266302E00C8FA04 /* Assets.xcassets */; }; 16C2E9412266302E00C8FA04 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 16C2E93F2266302E00C8FA04 /* LaunchScreen.storyboard */; }; 16C2E94C2266302E00C8FA04 /* Project308Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16C2E94B2266302E00C8FA04 /* Project308Tests.swift */; }; 16C2E9572266302E00C8FA04 /* Project308UITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16C2E9562266302E00C8FA04 /* Project308UITests.swift */; }; + D745B592226A512500C85F2A /* StopWatchViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D745B591226A512500C85F2A /* StopWatchViewController.swift */; }; + D745B594226A55EF00C85F2A /* TimerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D745B593226A55EF00C85F2A /* TimerViewController.swift */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -36,7 +37,6 @@ /* Begin PBXFileReference section */ 16C2E9332266302E00C8FA04 /* Project308.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Project308.app; sourceTree = BUILT_PRODUCTS_DIR; }; 16C2E9362266302E00C8FA04 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - 16C2E9382266302E00C8FA04 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; 16C2E93B2266302E00C8FA04 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 16C2E93D2266302E00C8FA04 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 16C2E9402266302E00C8FA04 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; @@ -47,6 +47,8 @@ 16C2E9522266302E00C8FA04 /* Project308UITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Project308UITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 16C2E9562266302E00C8FA04 /* Project308UITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Project308UITests.swift; sourceTree = ""; }; 16C2E9582266302E00C8FA04 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + D745B591226A512500C85F2A /* StopWatchViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StopWatchViewController.swift; sourceTree = ""; }; + D745B593226A55EF00C85F2A /* TimerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimerViewController.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -98,7 +100,8 @@ isa = PBXGroup; children = ( 16C2E9362266302E00C8FA04 /* AppDelegate.swift */, - 16C2E9382266302E00C8FA04 /* ViewController.swift */, + D745B591226A512500C85F2A /* StopWatchViewController.swift */, + D745B593226A55EF00C85F2A /* TimerViewController.swift */, 16C2E93A2266302E00C8FA04 /* Main.storyboard */, 16C2E93D2266302E00C8FA04 /* Assets.xcassets */, 16C2E93F2266302E00C8FA04 /* LaunchScreen.storyboard */, @@ -256,7 +259,8 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 16C2E9392266302E00C8FA04 /* ViewController.swift in Sources */, + D745B592226A512500C85F2A /* StopWatchViewController.swift in Sources */, + D745B594226A55EF00C85F2A /* TimerViewController.swift in Sources */, 16C2E9372266302E00C8FA04 /* AppDelegate.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/Project308/Base.lproj/Main.storyboard b/Project308/Base.lproj/Main.storyboard index 192e48d..f0c5385 100644 --- a/Project308/Base.lproj/Main.storyboard +++ b/Project308/Base.lproj/Main.storyboard @@ -13,7 +13,7 @@ - + @@ -81,7 +81,7 @@ - + diff --git a/Project308/StopWatchViewController.swift b/Project308/StopWatchViewController.swift new file mode 100644 index 0000000..1ef812b --- /dev/null +++ b/Project308/StopWatchViewController.swift @@ -0,0 +1,30 @@ +// +// StopwatchViewController.swift +// Project308 +// +// Created by Davis, Timothy A. on 4/19/19. +// Copyright © 2019 Helton, Aaron S. All rights reserved. +// + +import UIKit + +class StopWatchViewController: UIViewController { + + override func viewDidLoad() { + super.viewDidLoad() + + // Do any additional setup after loading the view. + } + + + /* + // 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.destination. + // Pass the selected object to the new view controller. + } + */ + +} diff --git a/Project308/TimerViewController.swift b/Project308/TimerViewController.swift new file mode 100644 index 0000000..5cf4662 --- /dev/null +++ b/Project308/TimerViewController.swift @@ -0,0 +1,30 @@ +// +// TimerViewController.swift +// Project308 +// +// Created by Davis, Timothy A. on 4/19/19. +// Copyright © 2019 Helton, Aaron S. All rights reserved. +// + +import UIKit + +class TimerViewController: UIViewController { + + override func viewDidLoad() { + super.viewDidLoad() + + // Do any additional setup after loading the view. + } + + + /* + // 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.destination. + // Pass the selected object to the new view controller. + } + */ + +}