Merge pull request #559 from rokwire/release/v2.9.18+918

Release/v2.9.18+918

CHANGELOG.md

@@ -6,6 +6,46 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## [2.9.18] - 2021-03-09
+### Added
+- Fire Analytics events in Pending Family Members popup.
+- Added terms and conditions to Pending Family Members popup [#557](https://github.com/rokwire/safer-illinois-app/issues/557).
+
+### Changed
+- Minor text changes in Pending Family Members popup.
+
+## [2.9.17] - 2021-03-04
+### Added
+- Added email or phone in Family Members list entry [#549](https://github.com/rokwire/safer-illinois-app/issues/549).
+
+### Changed
+- Renamed all occurences of "Reject" with "Revoke" in Family Members panel [#553](https://github.com/rokwire/safer-illinois-app/issues/553).
+
+## [2.9.16] - 2021-03-02
+### Fixed
+- Fixed "Remove My Information" processing [#547](https://github.com/rokwire/safer-illinois-app/issues/547).
+
+## [2.9.15] - 2021-02-26
+### Added
+- Implemented PullToRefresh feature in Home panel [#544](https://github.com/rokwire/safer-illinois-app/issues/544).
+
+### Changed
+- Load family member test price from health rules constants [#542](https://github.com/rokwire/safer-illinois-app/issues/542).
+
+## [2.9.14] - 2021-02-23
+### Added
+- Introduced Family members panel [#537](https://github.com/rokwire/safer-illinois-app/issues/537).
+
+## [2.9.13] - 2021-02-22
+### Changed
+- Updated Positive IP & NIP step & explanation strings [#529](https://github.com/rokwire/safer-illinois-app/issues/529).
+- Make POSITIVE-NIP COVID-19 PCR test result like the regular "PCR.negative" test result [#532](https://github.com/rokwire/safer-illinois-app/issues/532).
+- Introduced Approve Family member panel [#534](https://github.com/rokwire/safer-illinois-app/issues/534).
+
+### Added
+- Added camera usage mention in disclosure screen [#530](https://github.com/rokwire/safer-illinois-app/issues/530).
+- Handled family members requests [#534](https://github.com/rokwire/safer-illinois-app/issues/534).
+
 ## [2.9.12] - 2021-02-09
 ### Changed
 - Increased connectivity plugin version [#519](https://github.com/rokwire/safer-illinois-app/issues/519).

assets/flexUI.json

@@ -12,7 +12,7 @@
 		"settings.notifications": ["covid19"],
 		"settings.covid19": ["exposure_notifications", "provider_test_result", "qr_code"],
 		"settings.privacy": ["statement"],
-		"settings.account": ["personal_info"],
+		"settings.account": ["personal_info", "family_members"],
 
 		"info_center": ["stay_healthy", "your_health"],
 		"info_center.stay_healthy" : ["recent_event", "next_step", "symptom_checkin", "add_test_result"],

assets/strings.en.json

@@ -188,6 +188,7 @@
 	"panel.settings.home.user_info.title.sufix": "Welcome to Illinois",
 	"panel.settings.home.account.title": "Your Account",
 	"panel.settings.home.account.personal_info.title": "Personal Info",
+	"panel.settings.home.account.family_members.title": "Family Members",
 	"panel.settings.home.account.options.payment": "Payment",
 	"panel.settings.home.customizations.role.title": "Who you are",
 	"panel.settings.home.customizations.manage_interests.title": "Manage your interests",
@@ -262,6 +263,7 @@
 	"panel.profile_info.dialog.remove_my_information.subtitle": "Are you sure?",
 	"panel.profile_info.dialog.remove_my_information.yes.title": "Yes",
 	"panel.profile_info.dialog.remove_my_information.no.title": "No",
+	"panel.profile_info.dialog.remove_my_information.message.failed": "Failed to remove your information",
 
 	"panel.covid19_passport.header.title": "COVID-19",
 	"panel.covid19_passport.button.close.title": "Close",
@@ -412,8 +414,8 @@
 	"panel.health.onboarding.covid19.disclosure.label.title": "Information Usage Disclosure",
 	"panel.health.onboarding.covid19.disclosure.label.description1": "The Safer Illinois app uses:",
 	"panel.health.onboarding.covid19.disclosure.label.content1": "1. Bluetooth to enable opt-in exposure notifications of close contact with individuals that test positive for COVID-19.",
-	"panel.health.onboarding.covid19.disclosure.label.content2": "2. Photos to allow a user to import their personal encryption key (QR code) into the app.",
-	"panel.health.onboarding.covid19.disclosure.label.content3": "3. Videos to allow a user to import their personal encryption key (QR code) into the app.",
+	"panel.health.onboarding.covid19.disclosure.label.content2": "2. Camera to allow a user to import their personal encryption key (QR code) into the app.",
+	"panel.health.onboarding.covid19.disclosure.label.content3": "3. Photos and Videos to allow a user to import their personal encryption key (QR code) into the app.",
 	"panel.health.onboarding.covid19.disclosure.label.content4": "4. Files (external storage read and write) to allow a user to import their personal encryption key (QR code) into the app.",
 	"panel.health.onboarding.covid19.disclosure.label.content5": "5. Location services on your device must be turned on to activate the Bluetooth low energy technology necessary for the exposure notification function of the Application to work in the background. However, the Application does not access, collect, or store any location data, including GPS data. If location services on your device are turned off, the Application will perform the limited functions of storing and providing information about COVID-19 test results, any voluntarily reported symptoms, and building access status.",
 	"panel.health.onboarding.covid19.disclosure.label.description2": "YOUR INFORMATION AND HOW WE USE IT",
@@ -692,6 +694,25 @@
 	"panel.health.symptoms.label.error.submit": "Failed to submit symptoms.",
 	"panel.health.symptoms.label.error.no_selection": "Please select at least one symptom",
 
+	"panel.health.covid19.pending_family_member.label.text.statement1": "%s seeks your authorization to participate in Shield CU COVID-19 testing",
+	"panel.health.covid19.pending_family_member.label.text.statement2": "If you approve, your University account will be billed %s for each test taken.",
+	"panel.health.covid19.pending_family_member.label.text.terms.title": "Terms and Conditions",
+	"panel.health.covid19.pending_family_member.label.text.terms.html": "<p>The person named above has self-identified as a family or household member (“Family Member”) and has requested access to the COVID-19 testing services provided by the University of Illinois (“University”). By touching the “I Approve” button below, you agree that:</p><p>1. You are a University employee currently eligible for COVID-19 testing by the University;<br>2. Family Member is a family member in your household; and<br>3. You are responsible for any unpaid fees incurred by Family Member in obtaining COVID-19 testing services from the University.</p><p>You also agree that you are accepting responsibility on behalf of the Family Member if the Family Member is a minor under age 18 and you are the parent or legal guardian of the Family Member.</p><p>If you believe the person named above is improperly requesting access and/or has improperly obtained your University Identification Number (UIN), please contact <a href='mailto:[email protected]'>[email protected]</a>.</p>",
+	"panel.health.covid19.pending_family_member.button.approve.title": "I Approve",
+	"panel.health.covid19.pending_family_member.button.disapprove.title": "I Disapprove",
+	"panel.health.covid19.pending_family_member.label.text.error": "Failed to submit",
+
+	"panel.health.covid19.family_members.heading.title": "Family Members",
+	"panel.health.covid19.family_members.label.load_failed": "Failed to load family members",
+	"panel.health.covid19.family_members.label.submit_failed": "Failed to update status",
+	"panel.health.covid19.family_members.label.empty": "No family members",
+	"panel.health.covid19.family_members.label.status.accepted": "ACCEPTED",
+	"panel.health.covid19.family_members.label.status.revoked": "REVOKED",
+	"panel.health.covid19.family_members.label.status.pending": "PENDING",
+	"panel.health.covid19.family_members.label.status.unknown": "UNKNOWN",
+	"panel.health.covid19.family_members.button.accept.title": "Accept",
+	"panel.health.covid19.family_members.button.revoke.title": "Revoke",
+
 	"model.explore.time.today": "Today",
 	"model.explore.time.tomorrow": "Tomorrow",
 	"model.explore.time.at": "at",

assets/strings.es.json

@@ -188,6 +188,7 @@
 	"panel.settings.home.user_info.title.sufix": "Bienvenido a Illinois",
 	"panel.settings.home.account.title": "Su cuenta",
 	"panel.settings.home.account.personal_info.title": "Información personal",
+	"panel.settings.home.account.family_members.title": "Miembros de la familia",
 	"panel.settings.home.account.options.payment": "Pago",
 	"panel.settings.home.customizations.role.title": "Quién eres",
 	"panel.settings.home.customizations.manage_interests.title": "Administre sus intereses",
@@ -262,6 +263,7 @@
 	"panel.profile_info.dialog.remove_my_information.subtitle": "¿Está seguro?",
 	"panel.profile_info.dialog.remove_my_information.yes.title": "Sí",
 	"panel.profile_info.dialog.remove_my_information.no.title": "No",
+	"panel.profile_info.dialog.remove_my_information.message.failed": "No se pudo eliminar su información",
 
 	"panel.covid19_passport.header.title": "COVID-19",
 	"panel.covid19_passport.button.close.title": "Cerrar",
@@ -411,8 +413,8 @@
 	"panel.health.onboarding.covid19.disclosure.label.title": "Information Usage Disclosure",
 	"panel.health.onboarding.covid19.disclosure.label.description1": "The Safer Illinois app uses:",
 	"panel.health.onboarding.covid19.disclosure.label.content1": "1. Bluetooth to enable opt-in exposure notifications of close contact with individuals that test positive for COVID-19.",
-	"panel.health.onboarding.covid19.disclosure.label.content2": "2. Photos to allow a user to import their personal encryption key (QR code) into the app.",
-	"panel.health.onboarding.covid19.disclosure.label.content3": "3. Videos to allow a user to import their personal encryption key (QR code) into the app.",
+	"panel.health.onboarding.covid19.disclosure.label.content2": "2. Camera to allow a user to import their personal encryption key (QR code) into the app.",
+	"panel.health.onboarding.covid19.disclosure.label.content3": "3. Photos and Videos to allow a user to import their personal encryption key (QR code) into the app.",
 	"panel.health.onboarding.covid19.disclosure.label.content4": "4. Files (external storage read and write) to allow a user to import their personal encryption key (QR code) into the app.",
 	"panel.health.onboarding.covid19.disclosure.label.content5": "5. Location services on your device must be turned on to activate the Bluetooth low energy technology necessary for the exposure notification function of the Application to work in the background. However, the Application does not access, collect, or store any location data, including GPS data. If location services on your device are turned off, the Application will perform the limited functions of storing and providing information about COVID-19 test results, any voluntarily reported symptoms, and building access status.",
 	"panel.health.onboarding.covid19.disclosure.label.description2": "YOUR INFORMATION AND HOW WE USE IT",
@@ -691,6 +693,25 @@
 	"panel.health.symptoms.label.error.submit": "Error al enviar los síntomas.",
 	"panel.health.symptoms.label.error.no_selection": "Please select at least one symptom",
 
+	"panel.health.covid19.pending_family_member.label.text.statement1": "%s seeks your authorization to participate in Shield CU COVID-19 testing",
+	"panel.health.covid19.pending_family_member.label.text.statement2": "If you approve, your University account will be billed %s for each test taken.",
+	"panel.health.covid19.pending_family_member.label.text.terms.title": "Terms and Conditions",
+	"panel.health.covid19.pending_family_member.label.text.terms.html": "<p>The person named above has self-identified as a family or household member (“Family Member”) and has requested access to the COVID-19 testing services provided by the University of Illinois (“University”). By touching the “I Approve” button below, you agree that:</p><p>1. You are a University employee currently eligible for COVID-19 testing by the University;<br>2. Family Member is a family member in your household; and<br>3. You are responsible for any unpaid fees incurred by Family Member in obtaining COVID-19 testing services from the University.</p><p>You also agree that you are accepting responsibility on behalf of the Family Member if the Family Member is a minor under age 18 and you are the parent or legal guardian of the Family Member.</p><p>If you believe the person named above is improperly requesting access and/or has improperly obtained your University Identification Number (UIN), please contact <a href='mailto:[email protected]'>[email protected]</a>.</p>",
+	"panel.health.covid19.pending_family_member.button.approve.title": "I Approve",
+	"panel.health.covid19.pending_family_member.button.disapprove.title": "I Disapprove",
+	"panel.health.covid19.pending_family_member.label.text.error": "Failed to submit",
+
+	"panel.health.covid19.family_members.heading.title": "Family Members",
+	"panel.health.covid19.family_members.label.load_failed": "Failed to load family members",
+	"panel.health.covid19.family_members.label.submit_failed": "Failed to update status",
+	"panel.health.covid19.family_members.label.empty": "No family members",
+	"panel.health.covid19.family_members.label.status.accepted": "ACCEPTED",
+	"panel.health.covid19.family_members.label.status.revoked": "REVOKED",
+	"panel.health.covid19.family_members.label.status.pending": "PENDING",
+	"panel.health.covid19.family_members.label.status.unknown": "UNKNOWN",
+	"panel.health.covid19.family_members.button.accept.title": "Accept",
+	"panel.health.covid19.family_members.button.revoke.title": "Revoke",
+
 	"model.explore.time.today": "Hoy",
 	"model.explore.time.tomorrow": "Mañana",
 	"model.explore.time.at": "a",

assets/strings.zh.json

@@ -188,6 +188,7 @@
 	"panel.settings.home.user_info.title.sufix": "欢迎来到伊利诺伊州",
 	"panel.settings.home.account.title": "您的帳戶",
 	"panel.settings.home.account.personal_info.title": "个人信息",
+	"panel.settings.home.account.family_members.title": "家庭成員",
 	"panel.settings.home.account.options.payment": "支付",
 	"panel.settings.home.customizations.role.title": "你是",
 	"panel.settings.home.customizations.manage_interests.title": "管理您的兴趣",
@@ -262,6 +263,7 @@
 	"panel.profile_info.dialog.remove_my_information.subtitle": "确定吗?",
 	"panel.profile_info.dialog.remove_my_information.yes.title": "是的",
 	"panel.profile_info.dialog.remove_my_information.no.title": "不",
+	"panel.profile_info.dialog.remove_my_information.message.failed": "無法刪除您的信息",
 
 	"panel.covid19_passport.header.title": "COVID-19",
 	"panel.covid19_passport.button.close.title": "關",
@@ -411,8 +413,8 @@
 	"panel.health.onboarding.covid19.disclosure.label.title": "Information Usage Disclosure",
 	"panel.health.onboarding.covid19.disclosure.label.description1": "The Safer Illinois app uses:",
 	"panel.health.onboarding.covid19.disclosure.label.content1": "1. Bluetooth to enable opt-in exposure notifications of close contact with individuals that test positive for COVID-19.",
-	"panel.health.onboarding.covid19.disclosure.label.content2": "2. Photos to allow a user to import their personal encryption key (QR code) into the app.",
-	"panel.health.onboarding.covid19.disclosure.label.content3": "3. Videos to allow a user to import their personal encryption key (QR code) into the app.",
+	"panel.health.onboarding.covid19.disclosure.label.content2": "2. Camera to allow a user to import their personal encryption key (QR code) into the app.",
+	"panel.health.onboarding.covid19.disclosure.label.content3": "3. Photos and Videos to allow a user to import their personal encryption key (QR code) into the app.",
 	"panel.health.onboarding.covid19.disclosure.label.content4": "4. Files (external storage read and write) to allow a user to import their personal encryption key (QR code) into the app.",
 	"panel.health.onboarding.covid19.disclosure.label.content5": "5. Location services on your device must be turned on to activate the Bluetooth low energy technology necessary for the exposure notification function of the Application to work in the background. However, the Application does not access, collect, or store any location data, including GPS data. If location services on your device are turned off, the Application will perform the limited functions of storing and providing information about COVID-19 test results, any voluntarily reported symptoms, and building access status.",
 	"panel.health.onboarding.covid19.disclosure.label.description2": "YOUR INFORMATION AND HOW WE USE IT",
@@ -691,6 +693,25 @@
 	"panel.health.symptoms.label.error.submit": "未能提交症状.",
 	"panel.health.symptoms.label.error.no_selection": "Please select at least one symptom",
 
+	"panel.health.covid19.pending_family_member.label.text.statement1": "%s seeks your authorization to participate in Shield CU COVID-19 testing",
+	"panel.health.covid19.pending_family_member.label.text.statement2": "If you approve, your University account will be billed %s for each test taken.",
+	"panel.health.covid19.pending_family_member.label.text.terms.title": "Terms and Conditions",
+	"panel.health.covid19.pending_family_member.label.text.terms.html": "<p>The person named above has self-identified as a family or household member (“Family Member”) and has requested access to the COVID-19 testing services provided by the University of Illinois (“University”). By touching the “I Approve” button below, you agree that:</p><p>1. You are a University employee currently eligible for COVID-19 testing by the University;<br>2. Family Member is a family member in your household; and<br>3. You are responsible for any unpaid fees incurred by Family Member in obtaining COVID-19 testing services from the University.</p><p>You also agree that you are accepting responsibility on behalf of the Family Member if the Family Member is a minor under age 18 and you are the parent or legal guardian of the Family Member.</p><p>If you believe the person named above is improperly requesting access and/or has improperly obtained your University Identification Number (UIN), please contact <a href='mailto:[email protected]'>[email protected]</a>.</p>",
+	"panel.health.covid19.pending_family_member.button.approve.title": "I Approve",
+	"panel.health.covid19.pending_family_member.button.disapprove.title": "I Disapprove",
+	"panel.health.covid19.pending_family_member.label.text.error": "Failed to submit",
+
+	"panel.health.covid19.family_members.heading.title": "Family Members",
+	"panel.health.covid19.family_members.label.load_failed": "Failed to load family members",
+	"panel.health.covid19.family_members.label.submit_failed": "Failed to update status",
+	"panel.health.covid19.family_members.label.empty": "No family members",
+	"panel.health.covid19.family_members.label.status.accepted": "ACCEPTED",
+	"panel.health.covid19.family_members.label.status.revoked": "REVOKED",
+	"panel.health.covid19.family_members.label.status.pending": "PENDING",
+	"panel.health.covid19.family_members.label.status.unknown": "UNKNOWN",
+	"panel.health.covid19.family_members.button.accept.title": "Accept",
+	"panel.health.covid19.family_members.button.revoke.title": "Revoke",
+
 	"model.explore.time.today": "今天",
 	"model.explore.time.tomorrow": "明天",
 	"model.explore.time.at": "在",