From 30df30dacc735eea37c4b7ab360bfa756f64b152 Mon Sep 17 00:00:00 2001 From: COVIDSafe Support <64945427+covidsafe-support@users.noreply.github.com> Date: Wed, 9 Jun 2021 17:27:37 -0700 Subject: [PATCH] COVIDSafe code from version 2.7 (#52) --- CovidSafe.xcodeproj/project.pbxproj | 32 +- CovidSafe/Base.lproj/Main.storyboard | 505 ++++++++++-------- CovidSafe/CovidStatisticsViewController.swift | 2 +- CovidSafe/HomeView.xib | 299 +++++------ CovidSafe/PhoneNumberViewController.swift | 8 +- CovidSafe/ar.lproj/Localizable.strings | 2 + CovidSafe/el.lproj/Localizable.strings | 2 + CovidSafe/en.lproj/Localizable.strings | 2 + CovidSafe/it.lproj/Localizable.strings | 2 + CovidSafe/ko.lproj/Localizable.strings | 2 + CovidSafe/pa-IN.lproj/Localizable.strings | 2 + CovidSafe/tr.lproj/Localizable.strings | 2 + CovidSafe/vi.lproj/Localizable.strings | 2 + CovidSafe/zh-Hans.lproj/Localizable.strings | 2 + CovidSafe/zh-Hant.lproj/Localizable.strings | 2 + 15 files changed, 443 insertions(+), 423 deletions(-) diff --git a/CovidSafe.xcodeproj/project.pbxproj b/CovidSafe.xcodeproj/project.pbxproj index 3d9aba3..ff5194b 100644 --- a/CovidSafe.xcodeproj/project.pbxproj +++ b/CovidSafe.xcodeproj/project.pbxproj @@ -1979,7 +1979,7 @@ CODE_SIGN_ENTITLEMENTS = "CovidSafe/Project Bluetrace.entitlements"; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 127; + CURRENT_PROJECT_VERSION = 130; DEVELOPMENT_TEAM = 45792XH5L8; INFOPLIST_FILE = "$(SRCROOT)/CovidSafe/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 10.0; @@ -1987,7 +1987,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2.6; + MARKETING_VERSION = 2.7; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = au.gov.health.covidsafe; PRODUCT_NAME = COVIDSafe; @@ -2063,7 +2063,7 @@ CODE_SIGN_ENTITLEMENTS = "CovidSafe/Project Bluetrace.entitlements"; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 127; + CURRENT_PROJECT_VERSION = 130; DEVELOPMENT_TEAM = 45792XH5L8; INFOPLIST_FILE = "$(SRCROOT)/CovidSafe/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 10.0; @@ -2071,7 +2071,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2.6; + MARKETING_VERSION = 2.7; PRODUCT_BUNDLE_IDENTIFIER = au.gov.health.covidsafe; PRODUCT_NAME = COVIDSafe; PROVISIONING_PROFILE_SPECIFIER = COVIDSafe; @@ -2091,7 +2091,7 @@ CODE_SIGN_ENTITLEMENTS = "CovidSafe/Project Bluetrace.entitlements"; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 126; + CURRENT_PROJECT_VERSION = 130; DEVELOPMENT_TEAM = 45792XH5L8; INFOPLIST_FILE = "$(SRCROOT)/CovidSafe/staging-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 10.0; @@ -2099,7 +2099,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2.6; + MARKETING_VERSION = 2.7; ONLY_ACTIVE_ARCH = YES; OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS -D DEBUG"; PRODUCT_BUNDLE_IDENTIFIER = au.gov.health.covidsafe.uat; @@ -2121,7 +2121,7 @@ CODE_SIGN_ENTITLEMENTS = "CovidSafe/Project Bluetrace.entitlements"; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 126; + CURRENT_PROJECT_VERSION = 130; DEVELOPMENT_TEAM = 45792XH5L8; INFOPLIST_FILE = "$(SRCROOT)/CovidSafe/staging-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 10.0; @@ -2129,7 +2129,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2.6; + MARKETING_VERSION = 2.7; ONLY_ACTIVE_ARCH = YES; OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS -D DEBUG"; PRODUCT_BUNDLE_IDENTIFIER = au.gov.health.covidsafe.uat; @@ -2151,7 +2151,7 @@ CODE_SIGN_ENTITLEMENTS = "CovidSafe/Project Bluetrace.entitlements"; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 126; + CURRENT_PROJECT_VERSION = 130; DEVELOPMENT_TEAM = 45792XH5L8; INFOPLIST_FILE = "$(SRCROOT)/CovidSafe/staging-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 10.0; @@ -2159,7 +2159,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2.6; + MARKETING_VERSION = 2.7; OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS -D DEBUG"; PRODUCT_BUNDLE_IDENTIFIER = au.gov.health.covidsafe.uat; PRODUCT_MODULE_NAME = COVIDSafe; @@ -2181,7 +2181,7 @@ CODE_SIGN_ENTITLEMENTS = "CovidSafe/Project Bluetrace.entitlements"; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 126; + CURRENT_PROJECT_VERSION = 130; DEVELOPMENT_TEAM = 45792XH5L8; INFOPLIST_FILE = "$(SRCROOT)/CovidSafe/staging-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 10.0; @@ -2189,7 +2189,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2.6; + MARKETING_VERSION = 2.7; OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS -D DEBUG"; PRODUCT_BUNDLE_IDENTIFIER = au.gov.health.covidsafe.uat; PRODUCT_MODULE_NAME = COVIDSafe; @@ -2329,7 +2329,7 @@ CODE_SIGN_ENTITLEMENTS = "CovidSafe/Project Bluetrace.entitlements"; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 127; + CURRENT_PROJECT_VERSION = 130; DEVELOPMENT_TEAM = 45792XH5L8; INFOPLIST_FILE = "$(SRCROOT)/CovidSafe/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 10.0; @@ -2337,7 +2337,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2.6; + MARKETING_VERSION = 2.7; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = au.gov.health.covidsafe; PRODUCT_NAME = COVIDSafe; @@ -2357,7 +2357,7 @@ CODE_SIGN_ENTITLEMENTS = "CovidSafe/Project Bluetrace.entitlements"; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 127; + CURRENT_PROJECT_VERSION = 130; DEVELOPMENT_TEAM = 45792XH5L8; INFOPLIST_FILE = "$(SRCROOT)/CovidSafe/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 10.0; @@ -2365,7 +2365,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2.6; + MARKETING_VERSION = 2.7; PRODUCT_BUNDLE_IDENTIFIER = au.gov.health.covidsafe; PRODUCT_NAME = COVIDSafe; PROVISIONING_PROFILE_SPECIFIER = COVIDSafe; diff --git a/CovidSafe/Base.lproj/Main.storyboard b/CovidSafe/Base.lproj/Main.storyboard index 3377d59..21325aa 100644 --- a/CovidSafe/Base.lproj/Main.storyboard +++ b/CovidSafe/Base.lproj/Main.storyboard @@ -1,10 +1,9 @@ - + - - + @@ -13,6 +12,10 @@ + + + + @@ -21,7 +24,7 @@ - + @@ -30,7 +33,7 @@ - + @@ -178,16 +181,15 @@ - - - - - + + + + - - + + @@ -212,6 +214,10 @@ + + + + @@ -220,7 +226,7 @@ - + @@ -229,7 +235,7 @@ - - - - + + + - - - + + + @@ -340,6 +345,10 @@ Together we can help stop the spread and stay healthy. + + + + @@ -348,22 +357,22 @@ Together we can help stop the spread and stay healthy. - + - + - + COVIDSafe needs Bluetooth® enabled to work. By enabling Notifications, you get updates to remind you when COVIDSafe is not active. @@ -402,7 +411,7 @@ Select ‘Proceed' to enable: - - - + + - - - - + + + + @@ -504,6 +512,10 @@ COVIDSafe does not send pairing requests. + + + + @@ -512,7 +524,7 @@ COVIDSafe does not send pairing requests. - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + - - + + - + @@ -766,18 +794,17 @@ They will need to register using their own device and phone number so that COVID - - - + + - - + + - - - + + + @@ -787,6 +814,7 @@ They will need to register using their own device and phone number so that COVID + @@ -799,7 +827,7 @@ They will need to register using their own device and phone number so that COVID - + @@ -813,7 +841,7 @@ They will need to register using their own device and phone number so that COVID - + @@ -829,7 +857,7 @@ They will need to register using their own device and phone number so that COVID