diff --git a/CovidSafe.xcodeproj/project.pbxproj b/CovidSafe.xcodeproj/project.pbxproj index 0137668..96d4ec6 100644 --- a/CovidSafe.xcodeproj/project.pbxproj +++ b/CovidSafe.xcodeproj/project.pbxproj @@ -1308,7 +1308,7 @@ CODE_SIGN_ENTITLEMENTS = "CovidSafe/Project Bluetrace.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 15; + CURRENT_PROJECT_VERSION = 18; DEVELOPMENT_TEAM = 45792XH5L8; INFOPLIST_FILE = CovidSafe/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; @@ -1316,7 +1316,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.1; + MARKETING_VERSION = 1.2; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = au.gov.health.covidsafe; PRODUCT_NAME = COVIDSafe; @@ -1391,7 +1391,7 @@ CODE_SIGN_ENTITLEMENTS = "CovidSafe/Project Bluetrace.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 15; + CURRENT_PROJECT_VERSION = 18; DEVELOPMENT_TEAM = 45792XH5L8; INFOPLIST_FILE = CovidSafe/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; @@ -1399,7 +1399,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.1; + MARKETING_VERSION = 1.2; PRODUCT_BUNDLE_IDENTIFIER = au.gov.health.covidsafe; PRODUCT_NAME = COVIDSafe; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1419,7 +1419,7 @@ CODE_SIGN_ENTITLEMENTS = "CovidSafe/Project Bluetrace.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 15; + CURRENT_PROJECT_VERSION = 18; DEVELOPMENT_TEAM = 45792XH5L8; INFOPLIST_FILE = CovidSafe/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; @@ -1427,7 +1427,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.1; + MARKETING_VERSION = 1.2; ONLY_ACTIVE_ARCH = YES; OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS -D DEBUG"; PRODUCT_BUNDLE_IDENTIFIER = au.gov.health.covidsafe; @@ -1448,7 +1448,7 @@ CODE_SIGN_ENTITLEMENTS = "CovidSafe/Project Bluetrace.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 15; + CURRENT_PROJECT_VERSION = 18; DEVELOPMENT_TEAM = 45792XH5L8; INFOPLIST_FILE = CovidSafe/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; @@ -1456,7 +1456,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.1; + MARKETING_VERSION = 1.2; ONLY_ACTIVE_ARCH = YES; OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS -D DEBUG"; PRODUCT_BUNDLE_IDENTIFIER = au.gov.health.covidsafe; @@ -1477,7 +1477,7 @@ CODE_SIGN_ENTITLEMENTS = "CovidSafe/Project Bluetrace.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 15; + CURRENT_PROJECT_VERSION = 18; DEVELOPMENT_TEAM = 45792XH5L8; INFOPLIST_FILE = CovidSafe/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; @@ -1485,7 +1485,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.1; + MARKETING_VERSION = 1.2; OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS -D DEBUG"; PRODUCT_BUNDLE_IDENTIFIER = au.gov.health.covidsafe; PRODUCT_NAME = "COVIDSafe-staging"; @@ -1506,7 +1506,7 @@ CODE_SIGN_ENTITLEMENTS = "CovidSafe/Project Bluetrace.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 15; + CURRENT_PROJECT_VERSION = 18; DEVELOPMENT_TEAM = 45792XH5L8; INFOPLIST_FILE = CovidSafe/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; @@ -1514,7 +1514,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.1; + MARKETING_VERSION = 1.2; OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS -D DEBUG"; PRODUCT_BUNDLE_IDENTIFIER = au.gov.health.covidsafe; PRODUCT_NAME = "COVIDSafe-staging"; @@ -1651,7 +1651,7 @@ CODE_SIGN_ENTITLEMENTS = "CovidSafe/Project Bluetrace.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 15; + CURRENT_PROJECT_VERSION = 18; DEVELOPMENT_TEAM = 45792XH5L8; INFOPLIST_FILE = CovidSafe/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; @@ -1659,7 +1659,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.1; + MARKETING_VERSION = 1.2; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = au.gov.health.covidsafe; PRODUCT_NAME = COVIDSafe; @@ -1679,7 +1679,7 @@ CODE_SIGN_ENTITLEMENTS = "CovidSafe/Project Bluetrace.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 15; + CURRENT_PROJECT_VERSION = 18; DEVELOPMENT_TEAM = 45792XH5L8; INFOPLIST_FILE = CovidSafe/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; @@ -1687,7 +1687,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.1; + MARKETING_VERSION = 1.2; PRODUCT_BUNDLE_IDENTIFIER = au.gov.health.covidsafe; PRODUCT_NAME = COVIDSafe; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/CovidSafe/API/Certificates/RootCAs/AmazonRootCA1.cer b/CovidSafe/API/Certificates/RootCAs/AmazonRootCA1.cer new file mode 100644 index 0000000..86b7dcd Binary files /dev/null and b/CovidSafe/API/Certificates/RootCAs/AmazonRootCA1.cer differ diff --git a/CovidSafe/API/Certificates/RootCAs/AmazonRootCA2.cer b/CovidSafe/API/Certificates/RootCAs/AmazonRootCA2.cer new file mode 100644 index 0000000..86d70df Binary files /dev/null and b/CovidSafe/API/Certificates/RootCAs/AmazonRootCA2.cer differ diff --git a/CovidSafe/API/Certificates/RootCAs/AmazonRootCA3.cer b/CovidSafe/API/Certificates/RootCAs/AmazonRootCA3.cer new file mode 100644 index 0000000..7a991b7 Binary files /dev/null and b/CovidSafe/API/Certificates/RootCAs/AmazonRootCA3.cer differ diff --git a/CovidSafe/API/Certificates/RootCAs/AmazonRootCA4.cer b/CovidSafe/API/Certificates/RootCAs/AmazonRootCA4.cer new file mode 100644 index 0000000..10ef441 Binary files /dev/null and b/CovidSafe/API/Certificates/RootCAs/AmazonRootCA4.cer differ diff --git a/CovidSafe/API/Certificates/RootCAs/SFSRootCAG2.cer b/CovidSafe/API/Certificates/RootCAs/SFSRootCAG2.cer new file mode 100644 index 0000000..42f3c1b Binary files /dev/null and b/CovidSafe/API/Certificates/RootCAs/SFSRootCAG2.cer differ diff --git a/CovidSafe/AppDelegate.swift b/CovidSafe/AppDelegate.swift index 07d6563..07bfb51 100644 --- a/CovidSafe/AppDelegate.swift +++ b/CovidSafe/AppDelegate.swift @@ -170,15 +170,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate { DLog("applicationDidEnterBackground") Encounter.timestamp(for: .appEnteredBackground) - let magicNumber = Int.random(in: 0 ... PushNotificationConstants.dailyRemPushNotifContents.count - 1) - self.dismissBlackscreen() - stopAccelerometerUpdates() - - let center = UNUserNotificationCenter.current() - center.removeAllPendingNotificationRequests() - - triggerCalendarLocalPushNotifications(pnContent: PushNotificationConstants.dailyRemPushNotifContents[magicNumber], identifier: "appBackgroundNotifId") + stopAccelerometerUpdates() } func applicationWillEnterForeground(_ application: UIApplication) { diff --git a/CovidSafe/Assets.xcassets/CovidCare/Contents.json b/CovidSafe/Assets.xcassets/CovidCare/Contents.json deleted file mode 100644 index da4a164..0000000 --- a/CovidSafe/Assets.xcassets/CovidCare/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/CovidSafe/Assets.xcassets/CovidCare/AppNoPermissions.imageset/Contents.json b/CovidSafe/Assets.xcassets/CovidSafe/AppNoPermissions.imageset/Contents.json similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/AppNoPermissions.imageset/Contents.json rename to CovidSafe/Assets.xcassets/CovidSafe/AppNoPermissions.imageset/Contents.json diff --git a/CovidSafe/Assets.xcassets/CovidCare/AppNoPermissions.imageset/Illustration.pdf b/CovidSafe/Assets.xcassets/CovidSafe/AppNoPermissions.imageset/Illustration.pdf similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/AppNoPermissions.imageset/Illustration.pdf rename to CovidSafe/Assets.xcassets/CovidSafe/AppNoPermissions.imageset/Illustration.pdf diff --git a/CovidSafe/Assets.xcassets/CovidCare/AppPermissions1.imageset/Contents.json b/CovidSafe/Assets.xcassets/CovidSafe/AppPermissions1.imageset/Contents.json similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/AppPermissions1.imageset/Contents.json rename to CovidSafe/Assets.xcassets/CovidSafe/AppPermissions1.imageset/Contents.json diff --git a/CovidSafe/Assets.xcassets/CovidCare/AppPermissions1.imageset/Illustration.pdf b/CovidSafe/Assets.xcassets/CovidSafe/AppPermissions1.imageset/Illustration.pdf similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/AppPermissions1.imageset/Illustration.pdf rename to CovidSafe/Assets.xcassets/CovidSafe/AppPermissions1.imageset/Illustration.pdf diff --git a/CovidSafe/Assets.xcassets/CovidCare/AppPermissions2.imageset/Contents.json b/CovidSafe/Assets.xcassets/CovidSafe/AppPermissions2.imageset/Contents.json similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/AppPermissions2.imageset/Contents.json rename to CovidSafe/Assets.xcassets/CovidSafe/AppPermissions2.imageset/Contents.json diff --git a/CovidSafe/Assets.xcassets/CovidCare/AppPermissions2.imageset/Illustration.pdf b/CovidSafe/Assets.xcassets/CovidSafe/AppPermissions2.imageset/Illustration.pdf similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/AppPermissions2.imageset/Illustration.pdf rename to CovidSafe/Assets.xcassets/CovidSafe/AppPermissions2.imageset/Illustration.pdf diff --git a/CovidSafe/Assets.xcassets/CovidCare/COVIDSafeTitle.imageset/COVIDSafe.pdf b/CovidSafe/Assets.xcassets/CovidSafe/COVIDSafeTitle.imageset/COVIDSafe.pdf similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/COVIDSafeTitle.imageset/COVIDSafe.pdf rename to CovidSafe/Assets.xcassets/CovidSafe/COVIDSafeTitle.imageset/COVIDSafe.pdf diff --git a/CovidSafe/Assets.xcassets/CovidCare/COVIDSafeTitle.imageset/Contents.json b/CovidSafe/Assets.xcassets/CovidSafe/COVIDSafeTitle.imageset/Contents.json similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/COVIDSafeTitle.imageset/Contents.json rename to CovidSafe/Assets.xcassets/CovidSafe/COVIDSafeTitle.imageset/Contents.json diff --git a/CovidSafe/Assets.xcassets/CovidCare/ChevronRight.imageset/Contents.json b/CovidSafe/Assets.xcassets/CovidSafe/ChevronRight.imageset/Contents.json similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/ChevronRight.imageset/Contents.json rename to CovidSafe/Assets.xcassets/CovidSafe/ChevronRight.imageset/Contents.json diff --git a/CovidSafe/Assets.xcassets/CovidCare/ChevronRight.imageset/chevron-right.pdf b/CovidSafe/Assets.xcassets/CovidSafe/ChevronRight.imageset/chevron-right.pdf similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/ChevronRight.imageset/chevron-right.pdf rename to CovidSafe/Assets.xcassets/CovidSafe/ChevronRight.imageset/chevron-right.pdf diff --git a/CovidSafe/Assets.xcassets/CovidCare/CovidActive.imageset/Contents.json b/CovidSafe/Assets.xcassets/CovidSafe/CovidActive.imageset/Contents.json similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/CovidActive.imageset/Contents.json rename to CovidSafe/Assets.xcassets/CovidSafe/CovidActive.imageset/Contents.json diff --git a/CovidSafe/Assets.xcassets/CovidCare/CovidActive.imageset/Illustration.pdf b/CovidSafe/Assets.xcassets/CovidSafe/CovidActive.imageset/Illustration.pdf similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/CovidActive.imageset/Illustration.pdf rename to CovidSafe/Assets.xcassets/CovidSafe/CovidActive.imageset/Illustration.pdf diff --git a/CovidSafe/Assets.xcassets/CovidCare/DailyUpload.imageset/Check.pdf b/CovidSafe/Assets.xcassets/CovidSafe/DailyUpload.imageset/Check.pdf similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/DailyUpload.imageset/Check.pdf rename to CovidSafe/Assets.xcassets/CovidSafe/DailyUpload.imageset/Check.pdf diff --git a/CovidSafe/Assets.xcassets/CovidCare/DailyUpload.imageset/Contents.json b/CovidSafe/Assets.xcassets/CovidSafe/DailyUpload.imageset/Contents.json similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/DailyUpload.imageset/Contents.json rename to CovidSafe/Assets.xcassets/CovidSafe/DailyUpload.imageset/Contents.json diff --git a/CovidSafe/Assets.xcassets/CovidCare/GovCrest.imageset/Contents.json b/CovidSafe/Assets.xcassets/CovidSafe/GovCrest.imageset/Contents.json similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/GovCrest.imageset/Contents.json rename to CovidSafe/Assets.xcassets/CovidSafe/GovCrest.imageset/Contents.json diff --git a/CovidSafe/Assets.xcassets/CovidCare/GovCrest.imageset/Crest.pdf b/CovidSafe/Assets.xcassets/CovidSafe/GovCrest.imageset/Crest.pdf similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/GovCrest.imageset/Crest.pdf rename to CovidSafe/Assets.xcassets/CovidSafe/GovCrest.imageset/Crest.pdf diff --git a/CovidSafe/Assets.xcassets/CovidCare/GovCrestInitiative.imageset/Contents.json b/CovidSafe/Assets.xcassets/CovidSafe/GovCrestInitiative.imageset/Contents.json similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/GovCrestInitiative.imageset/Contents.json rename to CovidSafe/Assets.xcassets/CovidSafe/GovCrestInitiative.imageset/Contents.json diff --git a/CovidSafe/Assets.xcassets/CovidCare/GovCrestInitiative.imageset/GovCrestInitiative.pdf b/CovidSafe/Assets.xcassets/CovidSafe/GovCrestInitiative.imageset/GovCrestInitiative.pdf similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/GovCrestInitiative.imageset/GovCrestInitiative.pdf rename to CovidSafe/Assets.xcassets/CovidSafe/GovCrestInitiative.imageset/GovCrestInitiative.pdf diff --git a/CovidSafe/Assets.xcassets/CovidCare/GovLogoBlue.imageset/Banner.pdf b/CovidSafe/Assets.xcassets/CovidSafe/GovLogoBlue.imageset/Banner.pdf similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/GovLogoBlue.imageset/Banner.pdf rename to CovidSafe/Assets.xcassets/CovidSafe/GovLogoBlue.imageset/Banner.pdf diff --git a/CovidSafe/Assets.xcassets/CovidCare/GovLogoBlue.imageset/Contents.json b/CovidSafe/Assets.xcassets/CovidSafe/GovLogoBlue.imageset/Contents.json similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/GovLogoBlue.imageset/Contents.json rename to CovidSafe/Assets.xcassets/CovidSafe/GovLogoBlue.imageset/Contents.json diff --git a/CovidSafe/Assets.xcassets/CovidCare/HealthOfficial.imageset/Contents.json b/CovidSafe/Assets.xcassets/CovidSafe/HealthOfficial.imageset/Contents.json similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/HealthOfficial.imageset/Contents.json rename to CovidSafe/Assets.xcassets/CovidSafe/HealthOfficial.imageset/Contents.json diff --git a/CovidSafe/Assets.xcassets/CovidCare/HealthOfficial.imageset/Illustration.pdf b/CovidSafe/Assets.xcassets/CovidSafe/HealthOfficial.imageset/Illustration.pdf similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/HealthOfficial.imageset/Illustration.pdf rename to CovidSafe/Assets.xcassets/CovidSafe/HealthOfficial.imageset/Illustration.pdf diff --git a/CovidSafe/Assets.xcassets/CovidCare/HealthProf.imageset/Contents.json b/CovidSafe/Assets.xcassets/CovidSafe/HealthProf.imageset/Contents.json similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/HealthProf.imageset/Contents.json rename to CovidSafe/Assets.xcassets/CovidSafe/HealthProf.imageset/Contents.json diff --git a/CovidSafe/Assets.xcassets/CovidCare/HealthProf.imageset/healthProfesional.pdf b/CovidSafe/Assets.xcassets/CovidSafe/HealthProf.imageset/healthProfesional.pdf similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/HealthProf.imageset/healthProfesional.pdf rename to CovidSafe/Assets.xcassets/CovidSafe/HealthProf.imageset/healthProfesional.pdf diff --git a/CovidSafe/Assets.xcassets/CovidCare/IsolationSuccess.imageset/Contents.json b/CovidSafe/Assets.xcassets/CovidSafe/IsolationSuccess.imageset/Contents.json similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/IsolationSuccess.imageset/Contents.json rename to CovidSafe/Assets.xcassets/CovidSafe/IsolationSuccess.imageset/Contents.json diff --git a/CovidSafe/Assets.xcassets/CovidCare/IsolationSuccess.imageset/Illustration.pdf b/CovidSafe/Assets.xcassets/CovidSafe/IsolationSuccess.imageset/Illustration.pdf similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/IsolationSuccess.imageset/Illustration.pdf rename to CovidSafe/Assets.xcassets/CovidSafe/IsolationSuccess.imageset/Illustration.pdf diff --git a/CovidSafe/Assets.xcassets/CovidCare/PersonalDetails.imageset/Contents.json b/CovidSafe/Assets.xcassets/CovidSafe/PersonalDetails.imageset/Contents.json similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/PersonalDetails.imageset/Contents.json rename to CovidSafe/Assets.xcassets/CovidSafe/PersonalDetails.imageset/Contents.json diff --git a/CovidSafe/Assets.xcassets/CovidCare/PersonalDetails.imageset/Illustration.pdf b/CovidSafe/Assets.xcassets/CovidSafe/PersonalDetails.imageset/Illustration.pdf similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/PersonalDetails.imageset/Illustration.pdf rename to CovidSafe/Assets.xcassets/CovidSafe/PersonalDetails.imageset/Illustration.pdf diff --git a/CovidSafe/Assets.xcassets/CovidCare/RegConsent.imageset/Contents.json b/CovidSafe/Assets.xcassets/CovidSafe/RegConsent.imageset/Contents.json similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/RegConsent.imageset/Contents.json rename to CovidSafe/Assets.xcassets/CovidSafe/RegConsent.imageset/Contents.json diff --git a/CovidSafe/Assets.xcassets/CovidCare/RegConsent.imageset/consent.pdf b/CovidSafe/Assets.xcassets/CovidSafe/RegConsent.imageset/consent.pdf similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/RegConsent.imageset/consent.pdf rename to CovidSafe/Assets.xcassets/CovidSafe/RegConsent.imageset/consent.pdf diff --git a/CovidSafe/Assets.xcassets/CovidCare/ShareApp.imageset/Contents.json b/CovidSafe/Assets.xcassets/CovidSafe/ShareApp.imageset/Contents.json similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/ShareApp.imageset/Contents.json rename to CovidSafe/Assets.xcassets/CovidSafe/ShareApp.imageset/Contents.json diff --git a/CovidSafe/Assets.xcassets/CovidCare/ShareApp.imageset/share-2.pdf b/CovidSafe/Assets.xcassets/CovidSafe/ShareApp.imageset/share-2.pdf similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/ShareApp.imageset/share-2.pdf rename to CovidSafe/Assets.xcassets/CovidSafe/ShareApp.imageset/share-2.pdf diff --git a/CovidSafe/Assets.xcassets/CovidCare/Splash_logo.imageset/Contents.json b/CovidSafe/Assets.xcassets/CovidSafe/Splash_logo.imageset/Contents.json similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/Splash_logo.imageset/Contents.json rename to CovidSafe/Assets.xcassets/CovidSafe/Splash_logo.imageset/Contents.json diff --git a/CovidSafe/Assets.xcassets/CovidCare/Splash_logo.imageset/Logo.pdf b/CovidSafe/Assets.xcassets/CovidSafe/Splash_logo.imageset/Logo.pdf similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/Splash_logo.imageset/Logo.pdf rename to CovidSafe/Assets.xcassets/CovidSafe/Splash_logo.imageset/Logo.pdf diff --git a/CovidSafe/Assets.xcassets/CovidCare/Under16.imageset/Contents.json b/CovidSafe/Assets.xcassets/CovidSafe/Under16.imageset/Contents.json similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/Under16.imageset/Contents.json rename to CovidSafe/Assets.xcassets/CovidSafe/Under16.imageset/Contents.json diff --git a/CovidSafe/Assets.xcassets/CovidCare/Under16.imageset/under16.pdf b/CovidSafe/Assets.xcassets/CovidSafe/Under16.imageset/under16.pdf similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/Under16.imageset/under16.pdf rename to CovidSafe/Assets.xcassets/CovidSafe/Under16.imageset/under16.pdf diff --git a/CovidSafe/Assets.xcassets/CovidCare/WhiteSmallGovCrest.imageset/Contents.json b/CovidSafe/Assets.xcassets/CovidSafe/WhiteSmallGovCrest.imageset/Contents.json similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/WhiteSmallGovCrest.imageset/Contents.json rename to CovidSafe/Assets.xcassets/CovidSafe/WhiteSmallGovCrest.imageset/Contents.json diff --git a/CovidSafe/Assets.xcassets/CovidCare/WhiteSmallGovCrest.imageset/whiteGovGrestSmall.pdf b/CovidSafe/Assets.xcassets/CovidSafe/WhiteSmallGovCrest.imageset/whiteGovGrestSmall.pdf similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/WhiteSmallGovCrest.imageset/whiteGovGrestSmall.pdf rename to CovidSafe/Assets.xcassets/CovidSafe/WhiteSmallGovCrest.imageset/whiteGovGrestSmall.pdf diff --git a/CovidSafe/Assets.xcassets/CovidSafe/bell 1.imageset/Contents.json b/CovidSafe/Assets.xcassets/CovidSafe/bell 1.imageset/Contents.json new file mode 100644 index 0000000..399ca30 --- /dev/null +++ b/CovidSafe/Assets.xcassets/CovidSafe/bell 1.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "bell 1.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/CovidSafe/Assets.xcassets/CovidSafe/bell 1.imageset/bell 1.pdf b/CovidSafe/Assets.xcassets/CovidSafe/bell 1.imageset/bell 1.pdf new file mode 100644 index 0000000..32c68df --- /dev/null +++ b/CovidSafe/Assets.xcassets/CovidSafe/bell 1.imageset/bell 1.pdf @@ -0,0 +1,122 @@ +%PDF-1.7 + +1 0 obj + << >> +endobj + +2 0 obj + << /Length 3 0 R >> +stream +/DeviceRGB CS +/DeviceRGB cs +q +1.000000 0.000000 -0.000000 1.000000 3.333496 10.000000 cm +0.000000 0.000000 0.000000 scn +8.417218 24.916286 m +10.605143 27.104212 13.572605 28.333374 16.666798 28.333374 c +19.760990 28.333374 22.728455 27.104212 24.916378 24.916286 c +27.104303 22.728361 28.333466 19.760899 28.333466 16.666706 c +28.333466 11.078941 29.528578 7.608990 30.629957 5.589794 c +31.182949 4.575975 31.721422 3.910900 32.095470 3.516073 c +32.282928 3.318199 32.430233 3.187002 32.518929 3.113091 c +32.563297 3.076117 32.593056 3.053432 32.605888 3.043879 c +32.607887 3.042391 32.609474 3.041222 32.610645 3.040365 c +33.208122 2.629946 33.472523 1.879206 33.261951 1.183733 c +33.049122 0.480803 32.401245 0.000040 31.666798 0.000040 c +1.666796 0.000040 l +0.932351 0.000040 0.284474 0.480803 0.071643 1.183733 c +-0.138928 1.879204 0.125471 2.629940 0.722946 3.040361 c +0.724115 3.041216 0.725706 3.042387 0.727709 3.043879 c +0.740541 3.053432 0.770297 3.076117 0.814666 3.113091 c +0.903360 3.187002 1.050666 3.318199 1.238125 3.516073 c +1.612173 3.910900 2.150646 4.575975 2.703637 5.589794 c +3.805017 7.608990 5.000130 11.078941 5.000130 16.666706 c +5.000130 19.760899 6.229293 22.728363 8.417218 24.916286 c +h +0.739792 3.051785 m +0.739924 3.051872 0.740055 3.051962 0.740186 3.052048 c +0.740179 3.052044 0.740172 3.052038 0.740165 3.052034 c +0.739792 3.051785 l +h +5.249002 3.333372 m +28.084591 3.333372 l +27.957779 3.541170 27.830471 3.761097 27.703640 3.993620 c +26.305019 6.557756 25.000132 10.587805 25.000132 16.666706 c +25.000132 18.876844 24.122158 20.996460 22.559357 22.559263 c +20.996553 24.122066 18.876934 25.000040 16.666798 25.000040 c +14.456660 25.000040 12.337044 24.122066 10.774240 22.559263 c +9.211437 20.996460 8.333464 18.876844 8.333464 16.666706 c +8.333464 10.587805 7.028576 6.557756 5.629956 3.993620 c +5.503126 3.761097 5.375815 3.541170 5.249002 3.333372 c +h +f* +n +Q +q +1.000000 0.000000 -0.000000 1.000000 15.449707 1.435913 cm +0.000000 0.000000 0.000000 scn +0.830655 5.005682 m +1.626866 5.467550 2.646740 5.196512 3.108608 4.400301 c +3.255117 4.147735 3.465406 3.938091 3.718419 3.792359 c +3.971431 3.646627 4.258289 3.569921 4.550273 3.569921 c +4.842258 3.569921 5.129116 3.646627 5.382128 3.792359 c +5.635140 3.938091 5.845430 4.147735 5.991939 4.400301 c +6.453807 5.196512 7.473681 5.467550 8.269892 5.005682 c +9.066103 4.543814 9.337140 3.523939 8.875272 2.727728 c +8.435747 1.970035 7.804881 1.341100 7.045839 0.903903 c +6.286797 0.466704 5.426219 0.236588 4.550273 0.236588 c +3.674328 0.236588 2.813751 0.466704 2.054708 0.903903 c +1.295666 1.341100 0.664800 1.970035 0.225275 2.727728 c +-0.236593 3.523939 0.034445 4.543814 0.830655 5.005682 c +h +f* +n +Q + +endstream +endobj + +3 0 obj + 2693 +endobj + +4 0 obj + << /Annots [] + /Type /Page + /MediaBox [ 0.000000 0.000000 40.000000 40.000000 ] + /Resources 1 0 R + /Contents 2 0 R + /Parent 5 0 R + >> +endobj + +5 0 obj + << /Kids [ 4 0 R ] + /Count 1 + /Type /Pages + >> +endobj + +6 0 obj + << /Type /Catalog + /Pages 5 0 R + >> +endobj + +xref +0 7 +0000000000 65535 f +0000000010 00000 n +0000000034 00000 n +0000002783 00000 n +0000002806 00000 n +0000002979 00000 n +0000003053 00000 n +trailer +<< /ID [ (some) (id) ] + /Root 6 0 R + /Size 7 +>> +startxref +3112 +%%EOF \ No newline at end of file diff --git a/CovidSafe/Assets.xcassets/CovidSafe/chev-down.imageset/Contents.json b/CovidSafe/Assets.xcassets/CovidSafe/chev-down.imageset/Contents.json new file mode 100644 index 0000000..5f719f1 --- /dev/null +++ b/CovidSafe/Assets.xcassets/CovidSafe/chev-down.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "chev-down.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/CovidSafe/Assets.xcassets/CovidSafe/chev-down.imageset/chev-down.pdf b/CovidSafe/Assets.xcassets/CovidSafe/chev-down.imageset/chev-down.pdf new file mode 100644 index 0000000..89c2f2c --- /dev/null +++ b/CovidSafe/Assets.xcassets/CovidSafe/chev-down.imageset/chev-down.pdf @@ -0,0 +1,70 @@ +%PDF-1.7 + +1 0 obj + << >> +endobj + +2 0 obj + << /Length 3 0 R >> +stream +/DeviceRGB CS +/DeviceRGB cs +q +-1.000000 0.000000 -0.000000 -1.000000 12.000001 8.000000 cm +0.313726 0.317647 0.317647 scn +6.000000 8.000000 m +12.000001 0.000001 l +0.000000 0.000001 l +6.000000 8.000000 l +h +f +n +Q + +endstream +endobj + +3 0 obj + 211 +endobj + +4 0 obj + << /Annots [] + /Type /Page + /MediaBox [ 0.000000 0.000000 12.000000 8.000000 ] + /Resources 1 0 R + /Contents 2 0 R + /Parent 5 0 R + >> +endobj + +5 0 obj + << /Kids [ 4 0 R ] + /Count 1 + /Type /Pages + >> +endobj + +6 0 obj + << /Type /Catalog + /Pages 5 0 R + >> +endobj + +xref +0 7 +0000000000 65535 f +0000000010 00000 n +0000000034 00000 n +0000000301 00000 n +0000000323 00000 n +0000000495 00000 n +0000000569 00000 n +trailer +<< /ID [ (some) (id) ] + /Root 6 0 R + /Size 7 +>> +startxref +628 +%%EOF \ No newline at end of file diff --git a/CovidSafe/Assets.xcassets/CovidCare/deviceUpload.imageset/Contents.json b/CovidSafe/Assets.xcassets/CovidSafe/deviceUpload.imageset/Contents.json similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/deviceUpload.imageset/Contents.json rename to CovidSafe/Assets.xcassets/CovidSafe/deviceUpload.imageset/Contents.json diff --git a/CovidSafe/Assets.xcassets/CovidCare/deviceUpload.imageset/deviceUpload.pdf b/CovidSafe/Assets.xcassets/CovidSafe/deviceUpload.imageset/deviceUpload.pdf similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/deviceUpload.imageset/deviceUpload.pdf rename to CovidSafe/Assets.xcassets/CovidSafe/deviceUpload.imageset/deviceUpload.pdf diff --git a/CovidSafe/Assets.xcassets/CovidCare/govLogoWhite.imageset/Contents.json b/CovidSafe/Assets.xcassets/CovidSafe/govLogoWhite.imageset/Contents.json similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/govLogoWhite.imageset/Contents.json rename to CovidSafe/Assets.xcassets/CovidSafe/govLogoWhite.imageset/Contents.json diff --git a/CovidSafe/Assets.xcassets/CovidCare/govLogoWhite.imageset/govLogoWhite.pdf b/CovidSafe/Assets.xcassets/CovidSafe/govLogoWhite.imageset/govLogoWhite.pdf similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/govLogoWhite.imageset/govLogoWhite.pdf rename to CovidSafe/Assets.xcassets/CovidSafe/govLogoWhite.imageset/govLogoWhite.pdf diff --git a/CovidSafe/Assets.xcassets/CovidCare/groupHeroShot.imageset/Contents.json b/CovidSafe/Assets.xcassets/CovidSafe/groupHeroShot.imageset/Contents.json similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/groupHeroShot.imageset/Contents.json rename to CovidSafe/Assets.xcassets/CovidSafe/groupHeroShot.imageset/Contents.json diff --git a/CovidSafe/Assets.xcassets/CovidCare/groupHeroShot.imageset/Illustration.pdf b/CovidSafe/Assets.xcassets/CovidSafe/groupHeroShot.imageset/Illustration.pdf similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/groupHeroShot.imageset/Illustration.pdf rename to CovidSafe/Assets.xcassets/CovidSafe/groupHeroShot.imageset/Illustration.pdf diff --git a/CovidSafe/Assets.xcassets/CovidCare/howItWorks.imageset/Contents.json b/CovidSafe/Assets.xcassets/CovidSafe/howItWorks.imageset/Contents.json similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/howItWorks.imageset/Contents.json rename to CovidSafe/Assets.xcassets/CovidSafe/howItWorks.imageset/Contents.json diff --git a/CovidSafe/Assets.xcassets/CovidCare/howItWorks.imageset/Illustration.pdf b/CovidSafe/Assets.xcassets/CovidSafe/howItWorks.imageset/Illustration.pdf similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/howItWorks.imageset/Illustration.pdf rename to CovidSafe/Assets.xcassets/CovidSafe/howItWorks.imageset/Illustration.pdf diff --git a/CovidSafe/Assets.xcassets/CovidCare/info.imageset/Contents.json b/CovidSafe/Assets.xcassets/CovidSafe/info.imageset/Contents.json similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/info.imageset/Contents.json rename to CovidSafe/Assets.xcassets/CovidSafe/info.imageset/Contents.json diff --git a/CovidSafe/Assets.xcassets/CovidCare/info.imageset/info.pdf b/CovidSafe/Assets.xcassets/CovidSafe/info.imageset/info.pdf similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/info.imageset/info.pdf rename to CovidSafe/Assets.xcassets/CovidSafe/info.imageset/info.pdf diff --git a/CovidSafe/Assets.xcassets/CovidCare/lowPowerMode.imageset/Contents.json b/CovidSafe/Assets.xcassets/CovidSafe/lowPowerMode.imageset/Contents.json similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/lowPowerMode.imageset/Contents.json rename to CovidSafe/Assets.xcassets/CovidSafe/lowPowerMode.imageset/Contents.json diff --git a/CovidSafe/Assets.xcassets/CovidCare/lowPowerMode.imageset/Illustration.pdf b/CovidSafe/Assets.xcassets/CovidSafe/lowPowerMode.imageset/Illustration.pdf similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/lowPowerMode.imageset/Illustration.pdf rename to CovidSafe/Assets.xcassets/CovidSafe/lowPowerMode.imageset/Illustration.pdf diff --git a/CovidSafe/Assets.xcassets/CovidCare/phone.imageset/Contents.json b/CovidSafe/Assets.xcassets/CovidSafe/phone.imageset/Contents.json similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/phone.imageset/Contents.json rename to CovidSafe/Assets.xcassets/CovidSafe/phone.imageset/Contents.json diff --git a/CovidSafe/Assets.xcassets/CovidCare/phone.imageset/smartphone.pdf b/CovidSafe/Assets.xcassets/CovidSafe/phone.imageset/smartphone.pdf similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/phone.imageset/smartphone.pdf rename to CovidSafe/Assets.xcassets/CovidSafe/phone.imageset/smartphone.pdf diff --git a/CovidSafe/Assets.xcassets/CovidCare/privacy.imageset/Contents.json b/CovidSafe/Assets.xcassets/CovidSafe/privacy.imageset/Contents.json similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/privacy.imageset/Contents.json rename to CovidSafe/Assets.xcassets/CovidSafe/privacy.imageset/Contents.json diff --git a/CovidSafe/Assets.xcassets/CovidCare/privacy.imageset/Illustration.pdf b/CovidSafe/Assets.xcassets/CovidSafe/privacy.imageset/Illustration.pdf similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/privacy.imageset/Illustration.pdf rename to CovidSafe/Assets.xcassets/CovidSafe/privacy.imageset/Illustration.pdf diff --git a/CovidSafe/Assets.xcassets/CovidCare/smiley.imageset/Contents.json b/CovidSafe/Assets.xcassets/CovidSafe/smiley.imageset/Contents.json similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/smiley.imageset/Contents.json rename to CovidSafe/Assets.xcassets/CovidSafe/smiley.imageset/Contents.json diff --git a/CovidSafe/Assets.xcassets/CovidCare/smiley.imageset/smile.pdf b/CovidSafe/Assets.xcassets/CovidSafe/smiley.imageset/smile.pdf similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/smiley.imageset/smile.pdf rename to CovidSafe/Assets.xcassets/CovidSafe/smiley.imageset/smile.pdf diff --git a/CovidSafe/Assets.xcassets/CovidCare/uploadDataSelfIsolation.imageset/Contents.json b/CovidSafe/Assets.xcassets/CovidSafe/uploadDataSelfIsolation.imageset/Contents.json similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/uploadDataSelfIsolation.imageset/Contents.json rename to CovidSafe/Assets.xcassets/CovidSafe/uploadDataSelfIsolation.imageset/Contents.json diff --git a/CovidSafe/Assets.xcassets/CovidCare/uploadDataSelfIsolation.imageset/uploadDataSelfIsolation.pdf b/CovidSafe/Assets.xcassets/CovidSafe/uploadDataSelfIsolation.imageset/uploadDataSelfIsolation.pdf similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/uploadDataSelfIsolation.imageset/uploadDataSelfIsolation.pdf rename to CovidSafe/Assets.xcassets/CovidSafe/uploadDataSelfIsolation.imageset/uploadDataSelfIsolation.pdf diff --git a/CovidSafe/Assets.xcassets/CovidCare/uploadDataThankYou.imageset/Contents.json b/CovidSafe/Assets.xcassets/CovidSafe/uploadDataThankYou.imageset/Contents.json similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/uploadDataThankYou.imageset/Contents.json rename to CovidSafe/Assets.xcassets/CovidSafe/uploadDataThankYou.imageset/Contents.json diff --git a/CovidSafe/Assets.xcassets/CovidCare/uploadDataThankYou.imageset/uploadDataThankYou.pdf b/CovidSafe/Assets.xcassets/CovidSafe/uploadDataThankYou.imageset/uploadDataThankYou.pdf similarity index 100% rename from CovidSafe/Assets.xcassets/CovidCare/uploadDataThankYou.imageset/uploadDataThankYou.pdf rename to CovidSafe/Assets.xcassets/CovidSafe/uploadDataThankYou.imageset/uploadDataThankYou.pdf diff --git a/CovidSafe/Assets.xcassets/emptyCheckbox.imageset/Contents.json b/CovidSafe/Assets.xcassets/emptyCheckbox.imageset/Contents.json index 015bb88..9719ece 100644 --- a/CovidSafe/Assets.xcassets/emptyCheckbox.imageset/Contents.json +++ b/CovidSafe/Assets.xcassets/emptyCheckbox.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "consentDeselected.pdf", + "filename" : "Rectangle 29.png", "idiom" : "universal" } ], diff --git a/CovidSafe/Assets.xcassets/emptyCheckbox.imageset/Rectangle 29.png b/CovidSafe/Assets.xcassets/emptyCheckbox.imageset/Rectangle 29.png new file mode 100644 index 0000000..8acb0b3 Binary files /dev/null and b/CovidSafe/Assets.xcassets/emptyCheckbox.imageset/Rectangle 29.png differ diff --git a/CovidSafe/Assets.xcassets/emptyCheckbox.imageset/consentDeselected.pdf b/CovidSafe/Assets.xcassets/emptyCheckbox.imageset/consentDeselected.pdf deleted file mode 100644 index 5fa96db..0000000 --- a/CovidSafe/Assets.xcassets/emptyCheckbox.imageset/consentDeselected.pdf +++ /dev/null @@ -1,127 +0,0 @@ -%PDF-1.7 - -1 0 obj - << >> -endobj - -2 0 obj - << /Length 3 0 R >> -stream -/DeviceRGB CS -/DeviceRGB cs -q -0.000000 20.000000 m -0.000000 22.209139 1.790861 24.000000 4.000000 24.000000 c -20.000000 24.000000 l -22.209139 24.000000 24.000000 22.209139 24.000000 20.000000 c -24.000000 4.000000 l -24.000000 1.790861 22.209139 0.000000 20.000000 0.000000 c -4.000000 0.000000 l -1.790861 0.000000 0.000000 1.790861 0.000000 4.000000 c -0.000000 20.000000 l -h -W* -n -q -1.000000 0.000000 -0.000000 1.000000 0.000000 0.000000 cm -0.000000 0.000000 0.000000 scn -4.000000 22.000000 m -20.000000 22.000000 l -20.000000 26.000000 l -4.000000 26.000000 l -4.000000 22.000000 l -h -22.000000 20.000000 m -22.000000 4.000000 l -26.000000 4.000000 l -26.000000 20.000000 l -22.000000 20.000000 l -h -20.000000 2.000000 m -4.000000 2.000000 l -4.000000 -2.000000 l -20.000000 -2.000000 l -20.000000 2.000000 l -h -2.000000 4.000000 m -2.000000 20.000000 l --2.000000 20.000000 l --2.000000 4.000000 l -2.000000 4.000000 l -h -4.000000 2.000000 m -2.895431 2.000000 2.000000 2.895432 2.000000 4.000000 c --2.000000 4.000000 l --2.000000 0.686291 0.686292 -2.000000 4.000000 -2.000000 c -4.000000 2.000000 l -h -22.000000 4.000000 m -22.000000 2.895432 21.104568 2.000000 20.000000 2.000000 c -20.000000 -2.000000 l -23.313709 -2.000000 26.000000 0.686293 26.000000 4.000000 c -22.000000 4.000000 l -h -20.000000 22.000000 m -21.104568 22.000000 22.000000 21.104568 22.000000 20.000000 c -26.000000 20.000000 l -26.000000 23.313709 23.313707 26.000000 20.000000 26.000000 c -20.000000 22.000000 l -h -4.000000 26.000000 m -0.686291 26.000000 -2.000000 23.313707 -2.000000 20.000000 c -2.000000 20.000000 l -2.000000 21.104568 2.895431 22.000000 4.000000 22.000000 c -4.000000 26.000000 l -h -f -n -Q -Q - -endstream -endobj - -3 0 obj - 1649 -endobj - -4 0 obj - << /Annots [] - /Type /Page - /MediaBox [ 0.000000 0.000000 24.000000 24.000000 ] - /Resources 1 0 R - /Contents 2 0 R - /Parent 5 0 R - >> -endobj - -5 0 obj - << /Kids [ 4 0 R ] - /Count 1 - /Type /Pages - >> -endobj - -6 0 obj - << /Type /Catalog - /Pages 5 0 R - >> -endobj - -xref -0 7 -0000000000 65535 f -0000000010 00000 n -0000000034 00000 n -0000001739 00000 n -0000001762 00000 n -0000001935 00000 n -0000002009 00000 n -trailer -<< /ID [ (some) (id) ] - /Root 6 0 R - /Size 7 ->> -startxref -2068 -%%EOF \ No newline at end of file diff --git a/CovidSafe/Assets.xcassets/selectedCheckbox.imageset/Contents.json b/CovidSafe/Assets.xcassets/selectedCheckbox.imageset/Contents.json index 2d259cb..37accc5 100644 --- a/CovidSafe/Assets.xcassets/selectedCheckbox.imageset/Contents.json +++ b/CovidSafe/Assets.xcassets/selectedCheckbox.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "selectedCheckbox.pdf", + "filename" : "check.pdf", "idiom" : "universal" } ], diff --git a/CovidSafe/Assets.xcassets/selectedCheckbox.imageset/selectedCheckbox.pdf b/CovidSafe/Assets.xcassets/selectedCheckbox.imageset/check.pdf similarity index 60% rename from CovidSafe/Assets.xcassets/selectedCheckbox.imageset/selectedCheckbox.pdf rename to CovidSafe/Assets.xcassets/selectedCheckbox.imageset/check.pdf index be4b5d2..50779e9 100644 --- a/CovidSafe/Assets.xcassets/selectedCheckbox.imageset/selectedCheckbox.pdf +++ b/CovidSafe/Assets.xcassets/selectedCheckbox.imageset/check.pdf @@ -11,7 +11,7 @@ stream /DeviceRGB cs q 1.000000 0.000000 -0.000000 1.000000 0.000000 0.000000 cm -0.000000 0.541176 0.137255 scn +0.000000 0.400000 0.105882 scn 0.000000 20.000000 m 0.000000 22.209139 1.790861 24.000000 4.000000 24.000000 c 20.000000 24.000000 l @@ -26,34 +26,34 @@ f n Q q -1.000000 0.000000 -0.000000 1.000000 4.000000 4.804688 cm +1.000000 0.000000 -0.000000 1.000000 4.000000 3.707031 cm 1.000000 1.000000 1.000000 scn -16.707108 12.488206 m -17.097631 12.878730 17.097631 13.511895 16.707108 13.902419 c -16.316582 14.292944 15.683417 14.292944 15.292893 13.902419 c -16.707108 12.488206 l +17.060659 13.232308 m +17.646446 13.818095 17.646446 14.767842 17.060659 15.353629 c +16.474874 15.939415 15.525126 15.939415 14.939340 15.353629 c +17.060659 13.232308 l h -5.000000 2.195312 m -4.292893 1.488206 l -4.683417 1.097681 5.316583 1.097681 5.707107 1.488206 c -5.000000 2.195312 l +5.000000 3.292969 m +3.939340 2.232308 l +4.525126 1.646523 5.474874 1.646523 6.060660 2.232308 c +5.000000 3.292969 l h -0.707107 7.902419 m -0.316583 8.292944 -0.316583 8.292944 -0.707107 7.902419 c --1.097631 7.511895 -1.097631 6.878730 -0.707107 6.488206 c -0.707107 7.902419 l +1.060660 9.353629 m +0.474874 9.939415 -0.474874 9.939415 -1.060660 9.353629 c +-1.646447 8.767842 -1.646447 7.818095 -1.060660 7.232308 c +1.060660 9.353629 l h -15.292893 13.902419 m -4.292893 2.902419 l -5.707107 1.488206 l -16.707108 12.488206 l -15.292893 13.902419 l +14.939340 15.353629 m +3.939340 4.353629 l +6.060660 2.232308 l +17.060659 13.232308 l +14.939340 15.353629 l h -5.707107 2.902419 m -0.707107 7.902419 l --0.707107 6.488206 l -4.292893 1.488206 l -5.707107 2.902419 l +6.060660 4.353629 m +1.060660 9.353629 l +-1.060660 7.232308 l +3.939340 2.232308 l +6.060660 4.353629 l h f n diff --git a/CovidSafe/Base.lproj/Main.storyboard b/CovidSafe/Base.lproj/Main.storyboard index 596985f..1c84ef8 100644 --- a/CovidSafe/Base.lproj/Main.storyboard +++ b/CovidSafe/Base.lproj/Main.storyboard @@ -20,7 +20,7 @@ - + @@ -29,15 +29,18 @@ - - + - + @@ -95,11 +98,11 @@ - + @@ -473,7 +492,9 @@ - + @@ -739,14 +769,17 @@ -