diff --git a/COVIDWatch iOS/Assets.xcassets/arrow.imageset/Contents.json b/COVIDWatch iOS/Assets.xcassets/arrow.imageset/Contents.json
new file mode 100644
index 0000000..4288080
--- /dev/null
+++ b/COVIDWatch iOS/Assets.xcassets/arrow.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "filename" : "arrow.png",
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "arrow@2x.png",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "filename" : "arrow@3x.png",
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/COVIDWatch iOS/Assets.xcassets/arrow.imageset/arrow.png b/COVIDWatch iOS/Assets.xcassets/arrow.imageset/arrow.png
new file mode 100644
index 0000000..2948d4e
Binary files /dev/null and b/COVIDWatch iOS/Assets.xcassets/arrow.imageset/arrow.png differ
diff --git a/COVIDWatch iOS/Assets.xcassets/arrow.imageset/arrow@2x.png b/COVIDWatch iOS/Assets.xcassets/arrow.imageset/arrow@2x.png
new file mode 100644
index 0000000..c0425ee
Binary files /dev/null and b/COVIDWatch iOS/Assets.xcassets/arrow.imageset/arrow@2x.png differ
diff --git a/COVIDWatch iOS/Assets.xcassets/arrow.imageset/arrow@3x.png b/COVIDWatch iOS/Assets.xcassets/arrow.imageset/arrow@3x.png
new file mode 100644
index 0000000..ea47cf6
Binary files /dev/null and b/COVIDWatch iOS/Assets.xcassets/arrow.imageset/arrow@3x.png differ
diff --git a/COVIDWatch iOS/Confirm.storyboard b/COVIDWatch iOS/Confirm.storyboard
new file mode 100644
index 0000000..b8aaf2c
--- /dev/null
+++ b/COVIDWatch iOS/Confirm.storyboard
@@ -0,0 +1,193 @@
+
+
+
+
+
+
+
+
+
+
+ Montserrat-Bold
+
+
+ Montserrat-Regular
+
+
+ Montserrat-SemiBold
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/COVIDWatch iOS/Test.storyboard b/COVIDWatch iOS/Test.storyboard
index 88a86a0..5071293 100644
--- a/COVIDWatch iOS/Test.storyboard
+++ b/COVIDWatch iOS/Test.storyboard
@@ -380,7 +380,7 @@
-
+
@@ -388,10 +388,10 @@
-
+
-
+
diff --git a/COVIDWatch iOS/Thankyou.storyboard b/COVIDWatch iOS/Thankyou.storyboard
deleted file mode 100644
index ccb2299..0000000
--- a/COVIDWatch iOS/Thankyou.storyboard
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/COVIDWatch iOS/ViewControllers/Confirm.swift b/COVIDWatch iOS/ViewControllers/Confirm.swift
new file mode 100644
index 0000000..c691125
--- /dev/null
+++ b/COVIDWatch iOS/ViewControllers/Confirm.swift
@@ -0,0 +1,122 @@
+//
+// Confirm.swift
+// COVIDWatch iOS
+//
+// Created by Nikhil Kumar on 4/14/20.
+// Copyright © 2020 IZE. All rights reserved.
+//
+
+import UIKit
+
+class Confirm: UIViewController {
+ @IBOutlet var boxView: UIView!
+ @IBOutlet var slideButton: UIView!
+ @IBOutlet var slideView: UIView!
+ @IBOutlet var slideToConfirmText: UILabel!
+ @IBOutlet var cancelButton: UIButton!
+ @IBOutlet var cancelTopSpace: NSLayoutConstraint!
+ @IBOutlet var detailTopSpace: NSLayoutConstraint!
+ @IBOutlet var topSpace: NSLayoutConstraint!
+ @IBOutlet var boxTopSpace: NSLayoutConstraint!
+ @IBOutlet var testTopSpace: NSLayoutConstraint!
+ @IBOutlet var slideTopSpace: NSLayoutConstraint!
+
+ public var testedDate: Date = Date()
+ var ogSlideButtonPosition: CGPoint = CGPoint.zero
+ var slideStartPosition: CGFloat = 0.0
+ var slideEndPosition: CGFloat = 0.0
+ var slideCurrentPosition: CGFloat = 0.0
+ var btnWidth: CGFloat = 0.0
+
+ override func viewDidLoad() {
+ super.viewDidLoad()
+
+ slideButton.layer.cornerRadius = 4
+ slideButton.layer.borderWidth = 4
+ slideButton.layer.borderColor = UIColor.Primary.White.cgColor
+ slideButton.addGestureRecognizer(UIPanGestureRecognizer(target: self, action: #selector(onSlide)))
+ btnWidth = slideButton.bounds.width
+
+ slideView.layer.cornerRadius = 10
+ slideStartPosition = slideView.bounds.minX + 8
+ let sliderWidth = slideView.bounds.width - 16
+ slideEndPosition = slideStartPosition + sliderWidth
+
+ boxView.layer.cornerRadius = 10
+ boxView.layer.borderWidth = 1
+ boxView.layer.borderColor = UIColor.Secondary.LightGray.cgColor
+
+ cancelButton.layer.cornerRadius = 10
+ cancelButton.layer.borderWidth = 2
+ cancelButton.layer.borderColor = UIColor.Secondary.LightGray.cgColor
+ }
+
+ @objc func onSlide(gesture: UIPanGestureRecognizer) {
+ if let gView = gesture.view,
+ let xPos = gesture.view?.center.x,
+ let yPos = gesture.view?.center.y {
+
+ if gesture.state == .began {
+ ogSlideButtonPosition = gView.center
+ }
+ if gesture.state == .began || gesture.state == .changed {
+ let translation = gesture.translation(in: slideView)
+ let viewFrame = slideView.convert(gView.frame, from: slideButton)
+ let currentLeftPos = viewFrame.minX + translation.x
+ slideCurrentPosition = xPos + translation.x + (btnWidth / 2.0)
+ let slideDistance = (slideCurrentPosition - ogSlideButtonPosition.x)
+ let totalSlideDistance = screenWidth - btnWidth - 94
+ slideToConfirmText.alpha = 1.0 - 2 * (slideDistance / totalSlideDistance)
+ if currentLeftPos > slideStartPosition && slideDistance < totalSlideDistance {
+ gesture.view?.center = CGPoint(x: xPos + translation.x, y: yPos)
+ gesture.setTranslation(CGPoint.zero, in: slideView)
+ } else if slideDistance >= totalSlideDistance {
+ onConfirm()
+ }
+ }
+ if gesture.state == .ended {
+ gesture.view?.center = ogSlideButtonPosition
+ gesture.setTranslation(CGPoint.zero, in: slideView)
+ slideToConfirmText.alpha = 1.0
+ }
+ }
+ }
+
+ func onConfirm() {
+ UserDefaults.shared.isUserSick = true
+ UserDefaults.shared.lastTestedDate = Date()
+ performSegue(withIdentifier: "confirmToHome", sender: self)
+ }
+}
+
+extension Confirm {
+ override func updateViewConstraints() {
+ topSpace.constant = (30.0/321.0) * contentMaxWidth
+ boxTopSpace.constant = (15.0/321.0) * contentMaxWidth
+ testTopSpace.constant = (15.0/321.0) * contentMaxWidth
+ slideTopSpace.constant = (15.0/321.0) * contentMaxWidth
+ cancelTopSpace.constant = (15.0/321.0) * contentMaxWidth
+ detailTopSpace.constant = (5.0/321.0) * contentMaxWidth
+
+ if let slideView = self.slideView {
+ slideView.addConstraint(getButtonHeight(view: slideView))
+ }
+ if let cancelButton = self.cancelButton {
+ cancelButton.addConstraint(getButtonHeight(view: cancelButton))
+ }
+
+ super.updateViewConstraints()
+ }
+
+ func getButtonHeight(view: Any) -> NSLayoutConstraint {
+ return NSLayoutConstraint(
+ item: view,
+ attribute: .height,
+ relatedBy: .equal,
+ toItem: nil,
+ attribute: .notAnAttribute,
+ multiplier: 1,
+ constant: (58.0/321.0) * contentMaxWidth
+ )
+ }
+}
diff --git a/COVIDWatch iOS/ViewControllers/Test.swift b/COVIDWatch iOS/ViewControllers/Test.swift
index e58f4b7..d3a3d49 100644
--- a/COVIDWatch iOS/ViewControllers/Test.swift
+++ b/COVIDWatch iOS/ViewControllers/Test.swift
@@ -111,9 +111,7 @@ class Test: UIViewController, UIPickerViewDataSource, UIPickerViewDelegate {
}
@objc func submitPositive() {
- UserDefaults.shared.isUserSick = true
- UserDefaults.shared.lastTestedDate = Date()
- performSegue(withIdentifier: "testToHome", sender: self)
+ performSegue(withIdentifier: "confirmTest", sender: self)
}
@objc func pickDate() {
@@ -130,7 +128,7 @@ class Test: UIViewController, UIPickerViewDataSource, UIPickerViewDelegate {
let calendar = Calendar.current
var endDate = Date()
- guard let startDate = calendar.date(byAdding: .day, value: -13, to: endDate) else {
+ guard let startDate = calendar.date(byAdding: .day, value: -30, to: endDate) else {
print("\(#function): Error Creating date")
return
}
@@ -175,6 +173,21 @@ class Test: UIViewController, UIPickerViewDataSource, UIPickerViewDelegate {
showOnNegativeView.isHidden = true
}
+ // MARK: - Pass testedDate to Confirm
+ override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
+ if segue.identifier == "confirmTest" {
+ if let confirmVC = segue.destination as? Confirm {
+ if let dateString = dateLabel.text {
+ let df = DateFormatter()
+ if let date = df.date(from: dateString) {
+ confirmVC.testedDate = date
+ }
+ }
+ }
+ }
+ }
+
+ // MARK: - PickerView functions
func numberOfComponents(in pickerView: UIPickerView) -> Int {
return 1
}
diff --git a/COVIDWatch iOS/ViewControllers/ThankYou.swift b/COVIDWatch iOS/ViewControllers/ThankYou.swift
deleted file mode 100644
index 18bc470..0000000
--- a/COVIDWatch iOS/ViewControllers/ThankYou.swift
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-// thankyou.swift
-// COVIDWatch iOS
-//
-// Created by Laima Cernius-Ink on 4/7/20.
-// Copyright © 2020 IZE. All rights reserved.
-//
-
-import UIKit
-
-class ThankYou: UIViewController {
- var thankyouLbl = UITextView()
-
- var explain = UITextView()
-
- var logo = UIImageView()
-
- var continued = UIView()
- var continuedLbl = UILabel()
-
- var scalingFactor: CGFloat?
- let screenSize: CGRect = UIScreen.main.bounds
-
- // swiftlint:disable:next function_body_length
- override func viewDidLoad() {
- super.viewDidLoad()
-
- self.scalingFactor = CGFloat(screenHeight) / CGFloat(896)
- var fontScalingFactor = CGFloat(1.0)
- if screenHeight <= 736.0,
- let scalingFactor = scalingFactor {
- fontScalingFactor = scalingFactor
- }
- print("ScreenHeight = \(screenHeight)")
- thankyouLbl.text = "Thank you for helping your community."
- thankyouLbl.textColor = UIColor(red: 0.345, green: 0.345, blue: 0.345, alpha: 1)
- thankyouLbl.font = UIFont(name: "Montserrat-Black", size: 36 )
- thankyouLbl.frame.size.width = 300
- thankyouLbl.frame.size.height = 200
- thankyouLbl.center.x = view.center.x - 10
- thankyouLbl.center.y = 125
-
- view.addSubview(thankyouLbl)
-
- if let uiImage = UIImage(named: "image") {
- logo.image = uiImage
- }
- logo.frame.size.width = 375
- logo.frame.size.height = 308
- logo.center.x = view.center.x
- logo.center.y = thankyouLbl.center.y + thankyouLbl.frame.size.height/2 + 100
- view.addSubview(logo)
-
- // swiftlint:disable:next line_length
- explain.text = "By using this app and reporting your test results anonymously, you have helped others be more careful and helped reduce the spread."
- explain.textColor = UIColor(red: 0.345, green: 0.345, blue: 0.345, alpha: 1)
- explain.font = UIFont(name: "Montserrat-Regular", size: 18 * fontScalingFactor)
- explain.frame.size.width = 300
- explain.frame.size.height = 100
- explain.center.x = view.center.x
- explain.center.y = logo.center.y + logo.frame.size.height/2 + 50
- explain.textAlignment = .center
- view.addSubview(explain)
-
- continued.frame.size.width = explain.frame.size.width
- continued.frame.size.height = 75
- continued.center.x = view.center.x
- continued.center.y = explain.center.y + explain.frame.size.height/2 + 50
- continued.backgroundColor = UIColor(red: 0.286, green: 0.435, blue: 0.714, alpha: 1)
- continued.layer.cornerRadius = 20
- view.addSubview(continued)
-
- let tap = UITapGestureRecognizer(target: self, action: #selector(toHome))
-
- continued.addGestureRecognizer(tap)
- continuedLbl.text = "Continue"
- continuedLbl.textColor = UIColor(red: 1, green: 1, blue: 1, alpha: 1)
- continuedLbl.font = UIFont(name: "Montserrat-Bold", size: 21)
- continuedLbl.sizeToFit()
- continuedLbl.center = continued.center
-
- view.addSubview(continuedLbl)
-
- }
-
- @objc func toHome() {
- performSegue(withIdentifier: "home", sender: nil)
- }
-}
diff --git a/COVIDWatch.xcodeproj/project.pbxproj b/COVIDWatch.xcodeproj/project.pbxproj
index 78d1f5b..601acd1 100644
--- a/COVIDWatch.xcodeproj/project.pbxproj
+++ b/COVIDWatch.xcodeproj/project.pbxproj
@@ -72,13 +72,17 @@
2EFE630C2440E9EA00D00305 /* InfoBanner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2EFE630B2440E9EA00D00305 /* InfoBanner.swift */; };
60A44B4E244402A500A8154B /* Entry.swift in Sources */ = {isa = PBXBuildFile; fileRef = 60A44B4D244402A500A8154B /* Entry.swift */; };
60A44B502444046A00A8154B /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 60A44B4F2444046A00A8154B /* Main.storyboard */; };
+ 60BD14FB2446854F0009D7E0 /* Confirm.swift in Sources */ = {isa = PBXBuildFile; fileRef = 60BD14FA2446854F0009D7E0 /* Confirm.swift */; };
+ 60BD14FC2446854F0009D7E0 /* Confirm.swift in Sources */ = {isa = PBXBuildFile; fileRef = 60BD14FA2446854F0009D7E0 /* Confirm.swift */; };
+ 60BD14FD2446854F0009D7E0 /* Confirm.swift in Sources */ = {isa = PBXBuildFile; fileRef = 60BD14FA2446854F0009D7E0 /* Confirm.swift */; };
+ 60BD14FF244685620009D7E0 /* Confirm.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 60BD14FE244685620009D7E0 /* Confirm.storyboard */; };
+ 60BD1500244685620009D7E0 /* Confirm.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 60BD14FE244685620009D7E0 /* Confirm.storyboard */; };
+ 60BD1501244685620009D7E0 /* Confirm.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 60BD14FE244685620009D7E0 /* Confirm.storyboard */; };
60EF50F12440E624006CDD76 /* Bluetooth.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 60EF50F02440E624006CDD76 /* Bluetooth.storyboard */; };
60EF50F32440FAA4006CDD76 /* Notifications.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 60EF50F22440FAA4006CDD76 /* Notifications.storyboard */; };
60EF50F72440FAE0006CDD76 /* Home.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 60EF50F62440FAE0006CDD76 /* Home.storyboard */; };
60EF50F92440FAF3006CDD76 /* Test.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 60EF50F82440FAF3006CDD76 /* Test.storyboard */; };
- 60EF50FB2440FAFC006CDD76 /* Thankyou.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 60EF50FA2440FAFC006CDD76 /* Thankyou.storyboard */; };
B1D85F9E809BCC12318E2223 /* Pods_COVIDWatch_iOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 067227CBFA80D8CE4D90B6F6 /* Pods_COVIDWatch_iOS.framework */; };
- E1A7016D243D448F001FF6F0 /* ThankYou.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1A7016A243D448F001FF6F0 /* ThankYou.swift */; };
E1C729FF243DE30900D30118 /* Test.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1C729FE243DE30900D30118 /* Test.swift */; };
E24BC323244545CB00819EF0 /* NotificationPermission.swift in Sources */ = {isa = PBXBuildFile; fileRef = E24BC322244545CB00819EF0 /* NotificationPermission.swift */; };
E2B451A924443FE900E17888 /* BluetoothPermission.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2B451A824443FE900E17888 /* BluetoothPermission.swift */; };
@@ -177,11 +181,12 @@
3B7D25614E640EE632352602 /* Pods-COVID-19 Risk-COVID-19 RiskUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-COVID-19 Risk-COVID-19 RiskUITests.release.xcconfig"; path = "Target Support Files/Pods-COVID-19 Risk-COVID-19 RiskUITests/Pods-COVID-19 Risk-COVID-19 RiskUITests.release.xcconfig"; sourceTree = ""; };
60A44B4D244402A500A8154B /* Entry.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Entry.swift; sourceTree = ""; };
60A44B4F2444046A00A8154B /* Main.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = ""; };
+ 60BD14FA2446854F0009D7E0 /* Confirm.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Confirm.swift; sourceTree = ""; };
+ 60BD14FE244685620009D7E0 /* Confirm.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Confirm.storyboard; sourceTree = ""; };
60EF50F02440E624006CDD76 /* Bluetooth.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Bluetooth.storyboard; sourceTree = ""; };
60EF50F22440FAA4006CDD76 /* Notifications.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Notifications.storyboard; sourceTree = ""; };
60EF50F62440FAE0006CDD76 /* Home.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Home.storyboard; sourceTree = ""; };
60EF50F82440FAF3006CDD76 /* Test.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Test.storyboard; sourceTree = ""; };
- 60EF50FA2440FAFC006CDD76 /* Thankyou.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Thankyou.storyboard; sourceTree = ""; };
64576CBB2D573736A801A228 /* Pods-COVIDWatch iOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-COVIDWatch iOS.release.xcconfig"; path = "Target Support Files/Pods-COVIDWatch iOS/Pods-COVIDWatch iOS.release.xcconfig"; sourceTree = ""; };
68229525C3FC0E16F5BEA5CD /* Pods-COVID-19 Risk.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-COVID-19 Risk.release.xcconfig"; path = "Target Support Files/Pods-COVID-19 Risk/Pods-COVID-19 Risk.release.xcconfig"; sourceTree = ""; };
797D91CDEEC20C267ED17AE4 /* Pods-COVIDWatch iOSTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-COVIDWatch iOSTests.release.xcconfig"; path = "Target Support Files/Pods-COVIDWatch iOSTests/Pods-COVIDWatch iOSTests.release.xcconfig"; sourceTree = ""; };
@@ -192,7 +197,6 @@
A40ADD9EFD1AE21913D43EB7 /* Pods-COVIDWatch iOS-COVIDWatch iOSUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-COVIDWatch iOS-COVIDWatch iOSUITests.release.xcconfig"; path = "Target Support Files/Pods-COVIDWatch iOS-COVIDWatch iOSUITests/Pods-COVIDWatch iOS-COVIDWatch iOSUITests.release.xcconfig"; sourceTree = ""; };
A5B373FB19305537F2E1D4A1 /* Pods-COVID-19 Risk.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-COVID-19 Risk.debug.xcconfig"; path = "Target Support Files/Pods-COVID-19 Risk/Pods-COVID-19 Risk.debug.xcconfig"; sourceTree = ""; };
B100AAFD7EDE7205A094091D /* Pods_COVIDWatch_iOS_COVIDWatch_iOSUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_COVIDWatch_iOS_COVIDWatch_iOSUITests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
- E1A7016A243D448F001FF6F0 /* ThankYou.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ThankYou.swift; sourceTree = ""; };
E1C729FE243DE30900D30118 /* Test.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Test.swift; sourceTree = ""; };
E24BC322244545CB00819EF0 /* NotificationPermission.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationPermission.swift; sourceTree = ""; };
E2B451A824443FE900E17888 /* BluetoothPermission.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BluetoothPermission.swift; sourceTree = ""; };
@@ -246,8 +250,8 @@
2E1FDC1A24394424000D8D67 /* Notifications.swift */,
2EFE6303243F990900D00305 /* Home.swift */,
60A44B4D244402A500A8154B /* Entry.swift */,
+ 60BD14FA2446854F0009D7E0 /* Confirm.swift */,
E1C729FE243DE30900D30118 /* Test.swift */,
- E1A7016A243D448F001FF6F0 /* ThankYou.swift */,
2EBF8726243BC7F8003278E6 /* BaseViewController.swift */,
);
path = ViewControllers;
@@ -334,8 +338,8 @@
60A44B4F2444046A00A8154B /* Main.storyboard */,
60EF50F62440FAE0006CDD76 /* Home.storyboard */,
60EF50F82440FAF3006CDD76 /* Test.storyboard */,
- 60EF50FA2440FAFC006CDD76 /* Thankyou.storyboard */,
60EF50F22440FAA4006CDD76 /* Notifications.storyboard */,
+ 60BD14FE244685620009D7E0 /* Confirm.storyboard */,
60EF50F02440E624006CDD76 /* Bluetooth.storyboard */,
2DFDC5B024190AB900B108F8 /* LaunchScreen.storyboard */,
2DFDC5B324190AB900B108F8 /* Info.plist */,
@@ -560,7 +564,6 @@
2E1FDC0E24393C5A000D8D67 /* Montserrat-Thin.ttf in Resources */,
2E1FDC0C24393C5A000D8D67 /* Montserrat-MediumItalic.ttf in Resources */,
60A44B502444046A00A8154B /* Main.storyboard in Resources */,
- 60EF50FB2440FAFC006CDD76 /* Thankyou.storyboard in Resources */,
2E1FDC1624393C5A000D8D67 /* Montserrat-SemiBold.ttf in Resources */,
2E1FDC1224393C5A000D8D67 /* Montserrat-BlackItalic.ttf in Resources */,
2E1FDC1024393C5A000D8D67 /* Montserrat-BoldItalic.ttf in Resources */,
@@ -578,6 +581,7 @@
2E1FDC0A24393C5A000D8D67 /* Montserrat-Italic.ttf in Resources */,
60EF50F12440E624006CDD76 /* Bluetooth.storyboard in Resources */,
2DFDC5AF24190AB900B108F8 /* Preview Assets.xcassets in Resources */,
+ 60BD14FF244685620009D7E0 /* Confirm.storyboard in Resources */,
2E1FDC1124393C5A000D8D67 /* Montserrat-Bold.ttf in Resources */,
2DFDC5AC24190AB900B108F8 /* Assets.xcassets in Resources */,
60EF50F72440FAE0006CDD76 /* Home.storyboard in Resources */,
@@ -592,6 +596,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
+ 60BD1500244685620009D7E0 /* Confirm.storyboard in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -599,6 +604,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
+ 60BD1501244685620009D7E0 /* Confirm.storyboard in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -764,12 +770,12 @@
2D1F0FE3241AD0E100356B3A /* LocalContactEventsUploader.swift in Sources */,
2DC231EE241BA27800216404 /* AppDelegate+UserNotificationCenter.swift in Sources */,
2EBF8735243CE60E003278E6 /* Menu.swift in Sources */,
- E1A7016D243D448F001FF6F0 /* ThankYou.swift in Sources */,
2EFE6308243FB54F00D00305 /* UIResponderExtension.swift in Sources */,
E24BC323244545CB00819EF0 /* NotificationPermission.swift in Sources */,
2EFE6304243F990900D00305 /* Home.swift in Sources */,
2DF8F3D32430C503001C88EF /* AppDelegate+BackgroundFetch.swift in Sources */,
2DF8F3D1243082F7001C88EF /* AppDelegate+BackgroundTasks.swift in Sources */,
+ 60BD14FB2446854F0009D7E0 /* Confirm.swift in Sources */,
2EBF872B243BEAFA003278E6 /* LargeText.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -778,6 +784,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
+ 60BD14FC2446854F0009D7E0 /* Confirm.swift in Sources */,
2DFDC5BD24190ABA00B108F8 /* COVIDWatch_iOSTests.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -786,6 +793,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
+ 60BD14FD2446854F0009D7E0 /* Confirm.swift in Sources */,
2DFDC5C824190ABA00B108F8 /* COVIDWatch_iOSUITests.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;