Merge pull request #673 from rokwire/release/v2.10.31+1031

Release/v2.10.31+1031

CHANGELOG.md

@@ -6,6 +6,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## [2.10.31] - 2021-07-17
+### Changed
+- Upgrade to Flutter 2.2.2 [#664](https://github.com/rokwire/safer-illinois-app/issues/664).
+- Health rules updated to handle properly PCR positive event on vaccinated users [#668](https://github.com/rokwire/safer-illinois-app/issues/668).
+### Fixed
+- Fix gradle build for Android [#670](https://github.com/rokwire/safer-illinois-app/issues/670).
+- Check string parameters match case insensitively [#668](https://github.com/rokwire/safer-illinois-app/issues/668).
+
+
+## [2.10.30] - 2021-06-16
+### Added
+- Added Consent Health Provider Vaccine Information flag and related UI [#661](https://github.com/rokwire/safer-illinois-app/issues/661).
+
 ## [2.10.29] - 2021-06-09
 ### Changed
 - Changed testing interval to once-weekly for building access [#655](https://github.com/rokwire/safer-illinois-app/issues/655).

README.md

@@ -3,7 +3,7 @@ The official COVID-19 app of the University of Illinois. Powered by the [Rokwire
 
 ## Requirements
 
-### [Flutter](https://flutter.dev/docs/get-started/install) v2.0.6
+### [Flutter](https://flutter.dev/docs/get-started/install) v2.2.2
 
 ### [Android Studio](https://developer.android.com/studio) 3.6+
 
@@ -135,4 +135,3 @@ $ flutter build apk
 $ flutter build ios
 ```
 NB: You may need to update singing & capabilities content for Runner project by opening /ios/Runner.xcworkspace from Xcode
-

android/app/build.gradle

@@ -172,4 +172,9 @@ dependencies {
     implementation 'com.github.weliem:blessed-android:1.19'
 
     implementation 'com.google.android.gms:play-services-vision-common:19.0.2'
+
+    // Temporary fix Gradle 4.2.0 &  https://stackoverflow.com/questions/67612499/could-not-find-com-google-firebasefirebase-ml-vision
+    implementation platform('com.google.firebase:firebase-bom:28.0.1')
+    implementation 'com.google.android.gms:play-services-vision:20.1.3'
+    // Endfix
 }

android/build.gradle

@@ -16,7 +16,7 @@
 
 buildscript {
     ext {
-        gradle_version = '3.5.3'
+        gradle_version = '4.2.0'
         kotlin_version = '1.3.61'
     }
     repositories {

android/gradle/wrapper/gradle-wrapper.properties

@@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip

assets/flexUI.json

@@ -18,7 +18,7 @@
 		"settings.connected.netid": ["info", "disconnect", "connect"],
 		"settings.connected.phone": ["info", "disconnect", "verify"],
 		"settings.notifications": ["covid19"],
-		"settings.covid19": ["exposure_notifications", "provider_test_result", "qr_code"],
+		"settings.covid19": ["exposure_notifications", "provider_test_result", "provider_vaccine_info", "qr_code"],
 		"settings.privacy": ["statement"],
 		"settings.account": ["personal_info", "family_members"],
 

assets/health.rules.json

@@ -77,15 +77,23 @@
 				"interval": { "min": 0, "max": 10, "scope": "future" }
 			},
 			"success": {
-				"condition": "require-test",
+				"condition": "require-vaccine",
 				"params": {
-					"interval": { "min": 11, "max": null, "scope": "future" }
+					"interval": { "scope": "past" },
+					"vaccine": "effective"
 				},
 				"success": null,
 				"fail": {
-					"code": "red",
-					"priority": 11,
-					"next_step": "test.now.step"
+					"condition": "require-test",
+					"params": {
+						"interval": { "min": 11, "max": null, "scope": "future" }
+					},
+					"success": null,
+					"fail": {
+						"code": "red",
+						"priority": 11,
+						"next_step": "test.now.step"
+					}
 				}
 			},
 			"fail": {
@@ -101,16 +109,24 @@
 				"interval": { "min": 0, "max": 8, "scope": "future" }
 			},
 			"success": {
-				"condition": "require-test",
+				"condition": "require-vaccine",
 				"params": {
-					"interval": { "min": 9, "max": null, "scope": "future" }
+					"interval": { "scope": "past" },
+					"vaccine": "effective"
 				},
 				"success": null,
 				"fail": {
-					"code": "red",
-					"priority": 11,
-					"next_step": "test.now.step",
-					"fcm_topic": "PCR.positive-IP"
+					"condition": "require-test",
+					"params": {
+						"interval": { "min": 9, "max": null, "scope": "future" }
+					},
+					"success": null,
+					"fail": {
+						"code": "red",
+						"priority": 11,
+						"next_step": "test.now.step",
+						"fcm_topic": "PCR.positive-IP"
+					}
 				}
 			},
 			"fail": {
@@ -244,7 +260,13 @@
 				"interval": { "scope": "past" },
 				"vaccine": "effective"
 			},
-			"success": "vaccinated",
+			"success": {
+				"code": "green",
+				"priority": -4,
+				"next_step_html": "vaccinated.step.html",
+				"reason": "vaccinated.reason",
+				"fcm_topic": "vaccinated"
+			},
 			"fail": {
 				"condition": "require-test",
 				"params": {
@@ -342,17 +364,17 @@
 				"fail": {
 					"code": "yellow",
 					"priority": 12,
-					"next_step": "You are exempted from testing until {next_step_date}",
+					"next_step": "exempt-on.until.step",
 					"next_step_interval": "ExemptInterval",
-					"reason": "Your status changed to Yellow because you are exempted from testing until {next_step_date}",
+					"reason": "exempt-on.until.reason",
 					"fcm_topic": "exempt"
 				}
 			},
 			"fail": {
 				"code": "yellow",
 				"priority": 12,
-				"next_step": "You are exempted from testing",
-				"reason": "Your status changed to Yellow because you are exempted from testing",
+				"next_step": "exempt-on.step",
+				"reason": "exempt-on.reason",
 				"fcm_topic": "exempt"
 			}
 		},
@@ -367,14 +389,14 @@
 				"code": "green",
 				"priority": -4,
 				"next_step_html": "vaccinated.step.html",
-				"reason": "Your status changed to Green because your exempt from testing status was canceled",
+				"reason": "exempt-off.green.reason",
 				"fcm_topic": "vaccinated"
 			},
 			"fail": {
 				"code": "orange",
 				"priority": -1,
 				"next_step": "test.now.step",
-				"reason": "Your status changed to Orange because your exempt from testing status was canceled"
+				"reason": "exempt-off.orange.reason"
 			}
 		},
 
@@ -388,7 +410,7 @@
 				"code": "green",
 				"priority": -4,
 				"next_step_html": "vaccinated.step.html",
-				"reason": "Your status changed to Green because your exempt from testing status was canceled",
+				"reason": "vaccinated.reason",
 				"fcm_topic": "vaccinated"
 			},
 			"fail": {
@@ -818,6 +840,12 @@
 			"vaccinated.reason": "Your status changed to Green because your vaccination is already effective.",
 			"quarantine-on.step": "Stay at home and avoid contacts",
 			"quarantine-on.reason": "Your status changed to Orange because the Public Health department placed you in Quarantine.",
+			"exempt-on.step": "You are exempted from testing",
+			"exempt-on.reason": "Your status changed to Yellow because you are exempted from testing",
+			"exempt-on.until.step": "You are exempted from testing until {next_step_date}",
+			"exempt-on.until.reason": "Your status changed to Yellow because you are exempted from testing until {next_step_date}",
+			"exempt-off.orange.reason": "Your status changed to Orange because your exempt from testing status was canceled",
+			"exempt-off.green.reason": "Your status changed to Green because your exempt from testing status was canceled",
 			"release.step": "Take a SHIELD Saliva Test",
 			"release.reason": "Your status changed to Orange because the Public Health department requires you to take a test.",
 
@@ -883,6 +911,12 @@
 			"vaccinated.reason": "Su estado cambió a Verde porque su vacunación ya es efectiva.",
 			"quarantine-on.step": "Quédese en casa y evite los contactos",
 			"quarantine-on.reason": "Su estado cambió a Orange porque el departamento de Salud Pública lo puso en cuarentena.",
+			"exempt-on.step": "Estas exenta de pruebas",
+			"exempt-on.reason": "Su estado cambió a amarillo porque está exento de la prueba",
+			"exempt-on.until.step": "Está exenta de realizar pruebas hasta {next_step_date}",
+			"exempt-on.until.reason": "Su estado cambió a amarillo porque está exento de la prueba hasta el {next_step_date}",
+			"exempt-off.orange.reason": "Su estado cambió a Orange porque se canceló su estado de exención de la prueba",
+			"exempt-off.green.reason": "Su estado cambió a verde porque se canceló su estado de exención de la prueba",
 			"release.step": "Realice una prueba de saliva SHIELD",
 			"release.reason": "Su estado cambió a Orange porque el departamento de Salud Pública requiere que tome una prueba.",
 
@@ -948,6 +982,12 @@
 			"vaccinated.reason": "您的狀態已更改為“綠色”，因為您的疫苗接種已經有效。",
 			"quarantine-on.step": "呆在家裡，避免接觸",
 			"quarantine-on.reason": "您的狀態更改為“橙色”，因為公共衛生部門已將您隔離。",
+			"exempt-on.step": "您免於測試",
+			"exempt-on.reason": "您的狀態更改為黃色，因為您免於測試",
+			"exempt-on.until.step": "您可以在 {next_step_date} 之前免於測試",
+			"exempt-on.until.reason": "您的狀態已更改為黃色，因為您可以在 {next_step_date} 之前免於測試",
+			"exempt-off.orange.reason": "您的狀態更改為橙色，因為您的免試狀態已被取消",
+			"exempt-off.green.reason": "您的狀態更改為綠色，因為您的免試狀態已被取消",
 			"release.step": "參加SHIELD唾液測試",
 			"release.reason": "您的狀態更改為“橙色”，因為公共衛生部門要求您進行測試。",
 
@@ -1013,6 +1053,12 @@
 			"vaccinated.reason": "予防接種がすでに有効になっているため、ステータスが緑に変わりました。",
 			"quarantine-on.step": "家にいて、他の人との接触を避けてください。",
 			"quarantine-on.reason": "Public Health departmentにより隔離状態に置かれているため、ステータスがオレンジに変更されました。",
+			"exempt-on.step": "あなたはテストから免除されています",
+			"exempt-on.reason": "テストが免除されているため、ステータスが黄色に変わりました",
+			"exempt-on.until.step": "{next_step_date}までテストが免除されます",
+			"exempt-on.until.reason": "{next_step_date}までテストが免除されているため、ステータスが黄色に変更されました",
+			"exempt-off.orange.reason": "テストステータスの免除がキャンセルされたため、ステータスがオレンジに変更されました",
+			"exempt-off.green.reason": "テストステータスの免除がキャンセルされたため、ステータスが緑に変更されました",
 			"release.step": "SHIELD唾液検査を受けてください",
 			"release.reason": "Public Health departmentにより隔離状態に置かれているため、ステータスがオレンジに変更されました。",
 

assets/strings.en.json

@@ -218,7 +218,8 @@
 	"panel.settings.home.button.feedback.title": "Submit Feedback",
 	"panel.settings.home.button.feedback.hint": "",
 	"panel.settings.home.covid19.exposure_notifications": "Exposure Notifications",
-	"panel.settings.home.covid19.provider_test_result": "Health Provider Test Results and Vaccine Information",
+	"panel.settings.home.covid19.provider_test_result": "Health Provider Test Results",
+	"panel.settings.home.covid19.provider_vaccine_info": "Health Provider Vaccine Information",
 	"panel.settings.home.covid19.title": "COVID-19",
 	"panel.settings.home.covid19.qr_code.button.title": "QR Code",
 	"panel.settings.home.covid19.transfer.button.title": "Transfer",
@@ -423,7 +424,7 @@
 	"panel.health.onboarding.covid19.how_it_works.line1.title": "Testing and limiting exposure are key to slowing the spread of COVID-19.",
 	"panel.health.onboarding.covid19.how_it_works.line2.title": "You can use this app to:",
 	"panel.health.onboarding.covid19.how_it_works.line3.title": "Self-report your COVID-19 symptoms and in doing so update your status.",
-	"panel.health.onboarding.covid19.how_it_works.line4.title": "Automatically receive test results from your healthcare provider.",
+	"panel.health.onboarding.covid19.how_it_works.line4.title": "Automatically receive test results and vaccine information from your healthcare provider.",
 	"panel.health.onboarding.covid19.how_it_works.line5.title": "Allow your phone to send exposure notifications when you’ve been in proximity to people who test positive.",
 	"panel.health.onboarding.covid19.how_it_works.button.next.title": "Next",
 	"panel.health.onboarding.covid19.how_it_works.button.next.hint": "",
@@ -461,11 +462,14 @@
 	"panel.health.onboarding.covid19.consent.label.title": "Consent for COVID-19 features",
 	"panel.health.onboarding.covid19.consent.label.description": "Exposure Notifications",
 	"panel.health.onboarding.covid19.consent.label.content1": "If you consent to exposure notifications, you allow your phone to send an anonymous Bluetooth signal to nearby Safer Illinois app users who are also using this feature. Your phone will receive and record a signal from their phones as well. If one of those users tests positive for COVID-19 in the next 14 days, the app will alert you to your potential exposure and advise you on next steps. Your identity and health status will remain anonymous, as will the identity and health status of all other users.",
-	"panel.health.onboarding.covid19.consent.check_box.label.participate": "I consent to participate in the Exposure Notification System (requires Bluetooth to be ON).",
-	"panel.health.onboarding.covid19.consent.check_box.label.allow": "I consent to allow my healthcare provider to provide my test results and vaccine information.",
+	"panel.health.onboarding.covid19.consent.check_box.label.exposure": "I consent to participate in the Exposure Notification System (requires Bluetooth to be ON).",
+	"panel.health.onboarding.covid19.consent.check_box.label.test": "I consent to allow my healthcare provider to provide my test results.",
+	"panel.health.onboarding.covid19.consent.check_box.label.vaccine": "I consent to allow my healthcare provider to provide my vaccine information.",
 	"panel.health.onboarding.covid19.consent.label.content2": "Automatic Test Results",
 	"panel.health.onboarding.covid19.consent.label.content3": "I consent to connect test results from my healthcare provider with the Safer Illinois app.",
-	"panel.health.onboarding.covid19.consent.label.content4": "Your participation in these COVID-19 features is voluntary, and you can stop at any time",
+	"panel.health.onboarding.covid19.consent.label.content4": "Automatic Vaccine Information",
+	"panel.health.onboarding.covid19.consent.label.content5": "I consent to connect vaccine information from my healthcare provider with the Safer Illinois app.",
+	"panel.health.onboarding.covid19.consent.label.content6": "Your participation in these COVID-19 features is voluntary, and you can stop at any time",
 	"panel.health.onboarding.covid19.consent.button.consent.title": "Next",
 	"panel.health.onboarding.covid19.consent.button.consent.hint": "",
 	"panel.health.onboarding.covid19.consent.button.scroll_to_continue.title": "Scroll to Continue",

assets/strings.es.json

@@ -218,7 +218,8 @@
 	"panel.settings.home.button.feedback.title": "Enviar comentarios",
 	"panel.settings.home.button.feedback.hint": "",
 	"panel.settings.home.covid19.exposure_notifications": "Notificaciones de exposición",
-	"panel.settings.home.covid19.provider_test_result": "Resultados de las pruebas del proveedor de servicios de salud e información sobre las vacunas",
+	"panel.settings.home.covid19.provider_test_result": "Resultados de la prueba del proveedor de salud",
+	"panel.settings.home.covid19.provider_vaccine_info": "Información sobre vacunas del proveedor de salud",
 	"panel.settings.home.covid19.title": "COVID-19",
 	"panel.settings.home.covid19.qr_code.button.title": "Código QR",
 	"panel.settings.home.covid19.transfer.button.title": "Transferir",
@@ -423,7 +424,7 @@
 	"panel.health.onboarding.covid19.how_it_works.line1.title": "Las pruebas y la limitación de la exposición son clave para frenar la propagación de COVID-19.",
 	"panel.health.onboarding.covid19.how_it_works.line2.title": "Proporcione cualquier síntoma de COVID-19 que esté experimentando, reciba o ingrese automáticamente los resultados de las pruebas de su proveedor de atención médica, y permita que su teléfono le envíe notificaciones de exposición a usted y a las personas con las que ha estado en contacto durante los últimos 14 días.",
 	"panel.health.onboarding.covid19.how_it_works.line3.title": "Autoinforme sus síntomas de COVID-19 y, al hacerlo, actualice su estado.",
-	"panel.health.onboarding.covid19.how_it_works.line4.title": "Reciba automáticamente los resultados de las pruebas de su proveedor de atención médica.",
+	"panel.health.onboarding.covid19.how_it_works.line4.title": "Reciba automáticamente los resultados de las pruebas y la información de la vacuna de su proveedor de atención médica.",
 	"panel.health.onboarding.covid19.how_it_works.line5.title": "Permita que su teléfono envíe notificaciones de exposición cuando haya estado cerca de personas que dieron positivo en la prueba.",
 	"panel.health.onboarding.covid19.how_it_works.button.next.title": "Próximo",
 	"panel.health.onboarding.covid19.how_it_works.button.next.hint": "",
@@ -461,11 +462,14 @@
 	"panel.health.onboarding.covid19.consent.label.title": "Consentimientos especiales para las características de COVID-19",
 	"panel.health.onboarding.covid19.consent.label.description": "Notificaciones de exposición",
 	"panel.health.onboarding.covid19.consent.label.content1": "Si acepta las notificaciones de exposición, permite que su teléfono envíe una señal anónima de Bluetooth a los usuarios cercanos de la aplicación Safer Illinois que también usan esta función. Su teléfono también recibirá y grabará una señal de sus teléfonos. Si uno de esos usuarios da positivo por COVID-19 en los próximos 14 días, la aplicación lo alertará sobre su posible exposición y le aconsejará sobre los próximos pasos. Su identidad y estado de salud permanecerán anónimos, al igual que la identidad y el estado de salud de todos los demás usuarios.",
-	"panel.health.onboarding.covid19.consent.check_box.label.participate": "Doy mi consentimiento para participar en el Sistema de notificación de exposición (requiere que Bluetooth esté activado).",
-	"panel.health.onboarding.covid19.consent.check_box.label.allow": "Doy mi consentimiento para que mi proveedor de atención médica proporcione los resultados de mis pruebas y la información de la vacuna.",
+	"panel.health.onboarding.covid19.consent.check_box.label.exposure": "Doy mi consentimiento para participar en el Sistema de notificación de exposición (requiere que Bluetooth esté activado).",
+	"panel.health.onboarding.covid19.consent.check_box.label.test": "Doy mi consentimiento para que mi proveedor de atención médica proporcione los resultados de mi prueba.",
+	"panel.health.onboarding.covid19.consent.check_box.label.vaccine": "Doy mi consentimiento para que mi proveedor de atención médica proporcione la información de mi vacuna.",
 	"panel.health.onboarding.covid19.consent.label.content2": "Resultados automáticos de prueba",
 	"panel.health.onboarding.covid19.consent.label.content3": "Doy mi consentimiento para conectar los resultados de las pruebas de mi proveedor de atención médica con la aplicación Safer Illinois.",
-	"panel.health.onboarding.covid19.consent.label.content4": "Su participación es voluntaria y puede detenerse en cualquier momento",
+	"panel.health.onboarding.covid19.consent.label.content4": "Información automática de vacunas",
+	"panel.health.onboarding.covid19.consent.label.content5": "Doy mi consentimiento para conectar la información de la vacuna de mi proveedor de atención médica con la aplicación Safer Illinois.",
+	"panel.health.onboarding.covid19.consent.label.content6": "Su participación es voluntaria y puede detenerse en cualquier momento",
 	"panel.health.onboarding.covid19.consent.button.consent.title": "Próximo",
 	"panel.health.onboarding.covid19.consent.button.consent.hint": "",
 	"panel.health.onboarding.covid19.consent.button.scroll_to_continue.title": "Desplácese para continuar",