aargonian/Project308
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Merge pull request #2 from Aargonian/revert-1-Stopwatch"

Browse Source 
This reverts commit 049a50aee9, reversing
changes made to cc8fcca473.
This commit is contained in:
Timothy Davis
2019-04-21 15:14:19 -04:00
parent 049a50aee9
commit 00b7779ff2
4 changed files with 70 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Project308.xcodeproj/project.pbxproj
View File

@@ -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 = "<group>"; };
16C2E9382266302E00C8FA04 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
16C2E93B2266302E00C8FA04 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
16C2E93D2266302E00C8FA04 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
16C2E9402266302E00C8FA04 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
@@ -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 = "<group>"; };
16C2E9582266302E00C8FA04 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
D745B591226A512500C85F2A /* StopWatchViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StopWatchViewController.swift; sourceTree = "<group>"; };
D745B593226A55EF00C85F2A /* TimerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimerViewController.swift; sourceTree = "<group>"; };
/* 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;

4
Project308/Base.lproj/Main.storyboard
View File

@@ -13,7 +13,7 @@
<!--Timer-->
<scene sceneID="tj6-Zy-LVG">
<objects>
<viewController id="Qye-JV-Pqh" sceneMemberID="viewController">
<viewController id="Qye-JV-Pqh" customClass="TimerViewController" customModule="Project308" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="MOK-pC-mqV">
<rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -81,7 +81,7 @@
<!--Stopwatch-->
<scene sceneID="LPL-s6-U34">
<objects>
<viewController id="Gtu-61-Naf" sceneMemberID="viewController">
<viewController id="Gtu-61-Naf" customClass="StopWatchViewController" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="rFa-ED-Nh9">
<rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>

30
Project308/StopWatchViewController.swift Normal file
View File

@@ -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.
}
*/
}

30
Project308/TimerViewController.swift Normal file
View File

@@ -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.
}
*/
}