diff --git a/CovidSafe.xcodeproj/project.pbxproj b/CovidSafe.xcodeproj/project.pbxproj index 74c3a13..2b21217 100644 --- a/CovidSafe.xcodeproj/project.pbxproj +++ b/CovidSafe.xcodeproj/project.pbxproj @@ -1973,7 +1973,7 @@ CODE_SIGN_ENTITLEMENTS = "CovidSafe/Project Bluetrace.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 118; + CURRENT_PROJECT_VERSION = 121; DEVELOPMENT_TEAM = 45792XH5L8; INFOPLIST_FILE = "$(SRCROOT)/CovidSafe/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 10.0; @@ -1981,7 +1981,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2.4; + MARKETING_VERSION = 2.5; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = au.gov.health.covidsafe; PRODUCT_NAME = COVIDSafe; @@ -2057,7 +2057,7 @@ CODE_SIGN_ENTITLEMENTS = "CovidSafe/Project Bluetrace.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 118; + CURRENT_PROJECT_VERSION = 121; DEVELOPMENT_TEAM = 45792XH5L8; INFOPLIST_FILE = "$(SRCROOT)/CovidSafe/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 10.0; @@ -2065,7 +2065,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2.4; + MARKETING_VERSION = 2.5; PRODUCT_BUNDLE_IDENTIFIER = au.gov.health.covidsafe; PRODUCT_NAME = COVIDSafe; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -2085,7 +2085,7 @@ CODE_SIGN_ENTITLEMENTS = "CovidSafe/Project Bluetrace.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 118; + CURRENT_PROJECT_VERSION = 120; DEVELOPMENT_TEAM = 45792XH5L8; INFOPLIST_FILE = "$(SRCROOT)/CovidSafe/staging-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 10.0; @@ -2093,7 +2093,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2.4; + MARKETING_VERSION = 2.5; ONLY_ACTIVE_ARCH = YES; OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS -D DEBUG"; PRODUCT_BUNDLE_IDENTIFIER = au.gov.health.covidsafe.uat; @@ -2115,7 +2115,7 @@ CODE_SIGN_ENTITLEMENTS = "CovidSafe/Project Bluetrace.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 118; + CURRENT_PROJECT_VERSION = 120; DEVELOPMENT_TEAM = 45792XH5L8; INFOPLIST_FILE = "$(SRCROOT)/CovidSafe/staging-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 10.0; @@ -2123,7 +2123,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2.4; + MARKETING_VERSION = 2.5; ONLY_ACTIVE_ARCH = YES; OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS -D DEBUG"; PRODUCT_BUNDLE_IDENTIFIER = au.gov.health.covidsafe.uat; @@ -2145,7 +2145,7 @@ CODE_SIGN_ENTITLEMENTS = "CovidSafe/Project Bluetrace.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 118; + CURRENT_PROJECT_VERSION = 120; DEVELOPMENT_TEAM = 45792XH5L8; INFOPLIST_FILE = "$(SRCROOT)/CovidSafe/staging-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 10.0; @@ -2153,7 +2153,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2.4; + MARKETING_VERSION = 2.5; OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS -D DEBUG"; PRODUCT_BUNDLE_IDENTIFIER = au.gov.health.covidsafe.uat; PRODUCT_MODULE_NAME = COVIDSafe; @@ -2175,7 +2175,7 @@ CODE_SIGN_ENTITLEMENTS = "CovidSafe/Project Bluetrace.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 118; + CURRENT_PROJECT_VERSION = 120; DEVELOPMENT_TEAM = 45792XH5L8; INFOPLIST_FILE = "$(SRCROOT)/CovidSafe/staging-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 10.0; @@ -2183,7 +2183,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2.4; + MARKETING_VERSION = 2.5; OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS -D DEBUG"; PRODUCT_BUNDLE_IDENTIFIER = au.gov.health.covidsafe.uat; PRODUCT_MODULE_NAME = COVIDSafe; @@ -2323,7 +2323,7 @@ CODE_SIGN_ENTITLEMENTS = "CovidSafe/Project Bluetrace.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 118; + CURRENT_PROJECT_VERSION = 121; DEVELOPMENT_TEAM = 45792XH5L8; INFOPLIST_FILE = "$(SRCROOT)/CovidSafe/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 10.0; @@ -2331,7 +2331,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2.4; + MARKETING_VERSION = 2.5; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = au.gov.health.covidsafe; PRODUCT_NAME = COVIDSafe; @@ -2351,7 +2351,7 @@ CODE_SIGN_ENTITLEMENTS = "CovidSafe/Project Bluetrace.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 118; + CURRENT_PROJECT_VERSION = 121; DEVELOPMENT_TEAM = 45792XH5L8; INFOPLIST_FILE = "$(SRCROOT)/CovidSafe/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 10.0; @@ -2359,7 +2359,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2.4; + MARKETING_VERSION = 2.5; PRODUCT_BUNDLE_IDENTIFIER = au.gov.health.covidsafe; PRODUCT_NAME = COVIDSafe; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/CovidSafe/Assets.xcassets/CovidSafe/privacy-1.imageset/Contents.json b/CovidSafe/Assets.xcassets/CovidSafe/privacy-1.imageset/Contents.json new file mode 100644 index 0000000..884ec16 --- /dev/null +++ b/CovidSafe/Assets.xcassets/CovidSafe/privacy-1.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "noun_Privacy_3427755 1.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/CovidSafe/Assets.xcassets/CovidSafe/privacy-1.imageset/noun_Privacy_3427755 1.pdf b/CovidSafe/Assets.xcassets/CovidSafe/privacy-1.imageset/noun_Privacy_3427755 1.pdf new file mode 100644 index 0000000..ff22f19 --- /dev/null +++ b/CovidSafe/Assets.xcassets/CovidSafe/privacy-1.imageset/noun_Privacy_3427755 1.pdf @@ -0,0 +1,119 @@ +%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 6.609375 7.249596 cm +0.000000 0.000000 0.000000 scn +5.390625 0.000000 m +2.418235 0.000000 0.000000 2.427468 0.000000 5.411250 c +0.000000 8.395030 2.418235 10.822498 5.390625 10.822498 c +8.363016 10.822498 10.781251 8.395030 10.781251 5.411250 c +10.781251 2.427468 8.363016 0.000000 5.390625 0.000000 c +h +5.390625 9.322498 m +3.245344 9.322498 1.500000 7.567921 1.500000 5.411250 c +1.500000 3.254578 3.245344 1.500000 5.390625 1.500000 c +7.535907 1.500000 9.281251 3.254578 9.281251 5.411250 c +9.281251 7.567921 7.535907 9.322498 5.390625 9.322498 c +h +f +n +Q +q +1.000000 0.000000 -0.000000 1.000000 9.318054 10.421864 cm +0.000000 0.000000 0.000000 scn +1.352765 0.385547 m +0.000000 1.964156 l +1.139015 2.940187 l +1.958718 1.983656 l +4.290327 4.368656 l +5.362920 3.320062 l +2.458593 0.349265 l +2.317218 0.204702 1.775718 0.000000 1.352765 0.385547 c +h +f +n +Q +q +1.000000 0.000000 -0.000000 1.000000 2.531219 0.842299 cm +0.000000 0.000000 0.000000 scn +8.742392 0.366938 m +2.382766 3.341249 -0.146610 10.396500 0.006530 17.017826 c +0.014405 17.360016 0.253702 17.653263 0.587734 17.730232 c +2.381359 18.143858 3.786578 19.433764 3.772797 21.374435 c +3.771062 21.783842 4.112782 22.126451 4.522891 22.126451 c +14.417595 22.126451 l +14.827611 22.126451 15.169282 21.783983 15.167642 21.374624 c +15.127938 19.548841 16.531378 18.029858 18.305408 17.739513 c +18.662971 17.681015 18.927486 17.375671 18.934002 17.014030 c +19.052032 10.477921 16.174471 3.674015 10.233672 0.429001 c +9.983594 0.292406 9.527079 0.000000 8.742392 0.366938 c +h +9.352048 1.735453 m +9.403892 1.712484 9.462813 1.715157 9.513766 1.742954 c +11.380141 2.762438 17.373392 6.792608 17.437517 16.402218 c +15.498251 16.960873 13.982782 18.613827 13.711236 20.628702 c +5.229250 20.628702 l +4.957469 18.612328 3.440078 16.958624 1.498984 16.401047 c +1.488484 10.654922 3.722969 4.235157 9.352048 1.735453 c +8.559766 2.087250 9.403892 1.712439 9.352048 1.735453 c +h +f +n +Q + +endstream +endobj + +3 0 obj + 1991 +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 +0000002081 00000 n +0000002104 00000 n +0000002277 00000 n +0000002351 00000 n +trailer +<< /ID [ (some) (id) ] + /Root 6 0 R + /Size 7 +>> +startxref +2410 +%%EOF \ No newline at end of file diff --git a/CovidSafe/HomeView.xib b/CovidSafe/HomeView.xib index c571eca..0cba1ef 100644 --- a/CovidSafe/HomeView.xib +++ b/CovidSafe/HomeView.xib @@ -1,9 +1,9 @@ - + - + @@ -68,6 +68,11 @@ + + + + + @@ -122,7 +127,7 @@ - + @@ -870,17 +875,150 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +