From e6817bd795a6fb649ad3a2f25784def9fa1764f7 Mon Sep 17 00:00:00 2001
From: Dallon Archibald <darchibald21@stjohnsprep.org>
Date: Sat, 23 Jan 2021 17:34:28 -0500
Subject: [PATCH] Created Stopwatch controller and adjusted/linked tab bar

---
 ProjectClock.xcodeproj/project.pbxproj     |  4 ++++
 ProjectClock/Base.lproj/Main.storyboard    | 28 ++++++++++++++++++----
 ProjectClock/StopwatchViewController.swift | 19 +++++++++++++++
 3 files changed, 46 insertions(+), 5 deletions(-)
 create mode 100644 ProjectClock/StopwatchViewController.swift

diff --git a/ProjectClock.xcodeproj/project.pbxproj b/ProjectClock.xcodeproj/project.pbxproj
index f9fa29e..95840b7 100644
--- a/ProjectClock.xcodeproj/project.pbxproj
+++ b/ProjectClock.xcodeproj/project.pbxproj
@@ -23,6 +23,7 @@
 		7C83963625AF375B0027A94C /* NotificationLogic.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C83963525AF375B0027A94C /* NotificationLogic.swift */; };
 		7C83963925AF68980027A94C /* TestingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C83963825AF68980027A94C /* TestingViewController.swift */; };
 		C7E638E825B88F8B00799512 /* MathExpressions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C7E638E725B88F8B00799512 /* MathExpressions.swift */; };
+		F0DF7C0725BCD9FC0064A26B /* StopwatchViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F0DF7C0625BCD9FC0064A26B /* StopwatchViewController.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -46,6 +47,7 @@
 		7C83963525AF375B0027A94C /* NotificationLogic.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationLogic.swift; sourceTree = "<group>"; };
 		7C83963825AF68980027A94C /* TestingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestingViewController.swift; sourceTree = "<group>"; };
 		C7E638E725B88F8B00799512 /* MathExpressions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MathExpressions.swift; sourceTree = "<group>"; };
+		F0DF7C0625BCD9FC0064A26B /* StopwatchViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StopwatchViewController.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -92,6 +94,7 @@
 				4FD642DF25B4D5F30069171E /* AlarmActivationViewController.swift */,
 				4FD642D225B48C380069171E /* AlarmActivator.swift */,
 				4FF0684425A5F18700304E6B /* Main.storyboard */,
+				F0DF7C0625BCD9FC0064A26B /* StopwatchViewController.swift */,
 				7C83963525AF375B0027A94C /* NotificationLogic.swift */,
 				4F98955125A9260400F51321 /* Net.swift */,
 				4F509BD125AE22D100726227 /* Models.swift */,
@@ -187,6 +190,7 @@
 				4F98955225A9260400F51321 /* Net.swift in Sources */,
 				7C83963925AF68980027A94C /* TestingViewController.swift in Sources */,
 				4FF0684325A5F18700304E6B /* AccountViewController.swift in Sources */,
+				F0DF7C0725BCD9FC0064A26B /* StopwatchViewController.swift in Sources */,
 				4FF0683F25A5F18700304E6B /* AppDelegate.swift in Sources */,
 				4FD642D325B48C380069171E /* AlarmActivator.swift in Sources */,
 				4FD642DB25B4B7F60069171E /* Utils.swift in Sources */,
diff --git a/ProjectClock/Base.lproj/Main.storyboard b/ProjectClock/Base.lproj/Main.storyboard
index 599710b..66054f6 100644
--- a/ProjectClock/Base.lproj/Main.storyboard
+++ b/ProjectClock/Base.lproj/Main.storyboard
@@ -198,7 +198,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="240.57971014492756" y="868.52678571428567"/>
+            <point key="canvasLocation" x="897" y="869"/>
         </scene>
         <!--Debug-->
         <scene sceneID="x23-kV-b5u">
@@ -268,7 +268,23 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="mZu-oh-Lmb" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="952" y="869"/>
+            <point key="canvasLocation" x="1652" y="869"/>
+        </scene>
+        <!--Stopwatch-->
+        <scene sceneID="HUO-7o-NzS">
+            <objects>
+                <viewController id="PYt-Lf-JNp" customClass="StopwatchViewController" customModule="ProjectClock" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="wac-VZ-OTJ">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <viewLayoutGuide key="safeArea" id="0Lp-Fy-R0s"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                    </view>
+                    <tabBarItem key="tabBarItem" title="Stopwatch" image="clock.arrow.circlepath" catalog="system" selectedImage="clock.arrow.circlepath" id="hNc-UI-vIQ"/>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="ZlX-5W-Pjn" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="194" y="869"/>
         </scene>
         <!--Add Alarm View Controller-->
         <scene sceneID="sJi-AZ-FUw">
@@ -615,7 +631,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="78q-sr-CNz" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="1700.0000000000002" y="1101.5625"/>
+            <point key="canvasLocation" x="2391" y="1102"/>
         </scene>
         <!--Alarm Activator-->
         <scene sceneID="c7a-VN-D68">
@@ -632,6 +648,7 @@
                         <segue destination="BYZ-38-t0r" kind="relationship" relationship="viewControllers" destinationCreationSelector="Account" id="NN6-JO-Hmi"/>
                         <segue destination="r8W-6e-Hn2" kind="relationship" relationship="viewControllers" destinationCreationSelector="Testing" id="SLn-vq-UnH"/>
                         <segue destination="hDW-11-g9U" kind="showDetail" identifier="activate-alarm" destinationCreationSelector="sendAlarm:" id="z9o-Jh-fnM"/>
+                        <segue destination="PYt-Lf-JNp" kind="relationship" relationship="viewControllers" id="uMq-nh-i7c"/>
                     </connections>
                 </tabBarController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="S6R-Xr-Nfe" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
@@ -724,7 +741,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="M0T-zq-vZ0" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="267" y="1325"/>
+            <point key="canvasLocation" x="949" y="1342"/>
         </scene>
         <!--ManageVC-->
         <scene sceneID="jRZ-qD-YDj">
@@ -809,12 +826,13 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="pLc-eQ-yBW" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="267" y="1687"/>
+            <point key="canvasLocation" x="948" y="1676"/>
         </scene>
     </scenes>
     <resources>
         <image name="alarm.fill" catalog="system" width="124" height="128"/>
         <image name="checkmark" catalog="system" width="128" height="114"/>
+        <image name="clock.arrow.circlepath" catalog="system" width="128" height="110"/>
         <image name="hammer.fill" catalog="system" width="128" height="117"/>
         <image name="person.crop.circle" catalog="system" width="128" height="121"/>
         <image name="person.crop.circle.badge.checkmark" catalog="system" width="128" height="113"/>
diff --git a/ProjectClock/StopwatchViewController.swift b/ProjectClock/StopwatchViewController.swift
new file mode 100644
index 0000000..51dd620
--- /dev/null
+++ b/ProjectClock/StopwatchViewController.swift
@@ -0,0 +1,19 @@
+//
+//  StopwatchViewController.swift
+//  ProjectClock
+//
+//  Created by Dallon Archibald on 1/23/21.
+//
+
+import UIKit
+
+class StopwatchViewController: UIViewController {
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        // Do any additional setup after loading the view.
+    }
+    
+
+}