Merge pull request #660 from rokwire/release/2.10.29+1029

Release/2.10.29+1029

CHANGELOG.md

@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## [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).
+- Updated test.monitor.step to test.monitor.step.html with vaccination recommendation. Standardized Html widgets display used for health status content. [#657](https://github.com/rokwire/safer-illinois-app/issues/657).
+
 ## [2.10.28] - 2021-05-28
 ### Changed
 - Vaccination event processing updated in health rules [#651](https://github.com/rokwire/safer-illinois-app/issues/651).

assets/health.rules.json

@@ -7,8 +7,8 @@
 	},
 
 	"intervals": {
-		"DefaultTestMonitorInterval": 4,
-		"UndergraduateTestMonitorInterval": 4,
+		"DefaultTestMonitorInterval": 8,
+		"UndergraduateTestMonitorInterval": 8,
 		"UserTestMonitorInterval": null,
 
 		"TestMonitorInterval": {
@@ -179,7 +179,7 @@
 			"success": {
 				"code": "yellow",
 				"priority": 1,
-				"next_step": "test.monitor.step",
+				"next_step_html": "test.monitor.step.html",
 				"next_step_interval": "TestMonitorInterval",
 				"warning": "test.future.warning"
 			},
@@ -313,7 +313,7 @@
 			"success": {
 				"code": null,
 				"priority": 1,
-				"next_step": "test.monitor.step",
+				"next_step_html": "test.monitor.step.html",
 				"next_step_interval": 1,
 				"warning": "test.future.warning"
 			},
@@ -798,7 +798,7 @@
 			"positive-ip.explanation": "Your Saliva PCR test shows the VIRUS IS DETECTED. Due to the timing of this collection and the detection of virus, this is considered an INFECTIOUS POSITIVE. You require isolation to prevent viral spread to others.",
 			"positive-nip.step.html": "<h3>You are not required to self-isolate unless you have COVID-like symptoms and are directed to do so by your licensed health professional.</h3>",
 			"positive-nip.explanation": "Your Saliva PCR test shows the VIRUS IS DETECTED in your REPEAT POSITIVE at a NON-INFECTIOUS LEVEL.",
-			"test.monitor.step": "Monitor your test results",
+			"test.monitor.step.html": "<h1>Monitor your test results</h1><p>The university encourages you to be vaccinated if you are able to do so. Visit <a href='https://www.vaccinefinder.org'>vaccinefinder.org</a> to find nearby appointments.</p>",
 			"test.now.step": "Get a test now",
 			"test.now.reason": "Your status changed to Orange because you are past due for a test.",
 			"test.another.asap.step": "Get another test asap",
@@ -863,7 +863,7 @@
 			"positive-ip.explanation": "Su prueba de PCR de saliva muestra que el VIRUS ESTÁ DETECTADO. Debido al tiempo de esta recolección y la detección de virus, esto se considera un POSITIVO INFECCIOSO. Necesita aislamiento para evitar la propagación viral a otros.",
 			"positive-nip.step.html": "<h3>No es necesario que se aísle a sí mismo a menos que tenga síntomas similares a los de COVID y su profesional de la salud autorizado le indique que lo haga.</h3>",
 			"positive-nip.explanation": "Su prueba de PCR de saliva muestra que el VIRUS ESTÁ DETECTADO en su REPETICIÓN POSITIVA en un NIVEL NO INFECCIOSO.",
-			"test.monitor.step": "Controle los resultados de su prueba",
+			"test.monitor.step.html": "<h1>Controle los resultados de su prueba</h1><p>La universidad le anima a vacunarse si puede hacerlo. Visite <a href='https://www.vaccinefinder.org'>vacunafinder.org</a> para encontrar citas cercanas.</p>",
 			"test.now.step": "Haz una prueba ahora",
 			"test.now.reason": "Su estado cambió a Naranja porque está atrasado en un examen.",
 			"test.another.asap.step": "Obtenga otra prueba lo antes posible",
@@ -928,7 +928,7 @@
 			"positive-ip.explanation": "您的唾液PCR測試顯示病毒已被檢測到。 由於收集時間和病毒的檢測時間，這被認為是感染陽性。 您需要隔離以防止病毒傳播給他人。",
 			"positive-nip.step.html": "<h3>除非您有類似COVID的症狀並且由您的有執照的衛生專業人員指示這樣做，否則您無需自我隔離。</h3>",
 			"positive-nip.explanation": "您的唾液PCR測試顯示病毒在非陽性水平的重複陽性中被檢測到。",
-			"test.monitor.step": "監控您的測試結果",
+			"test.monitor.step.html": "<h1>監控您的測試結果</h1><p>如果您有能力，大學鼓勵您接種疫苗。 訪問 <a href='https://www.vaccinefinder.org'>vaccinefinder.org</a> 查找附近的約會。</p>",
 			"test.now.step": "立即獲得測試",
 			"test.now.reason": "您的狀態更改為“橙色”，因為您已逾期進行測試。",
 			"test.another.asap.step": "盡快獲得另一個測試",
@@ -993,7 +993,7 @@
 			"positive-ip.explanation": "唾液PCR検査は、感染性レベルにある場合、2回目の検査結果が陽性検査を出す可能性があります。より長い隔離期間が必要かもしれません。",
 			"positive-nip.step.html": "<h6>認可された医療従事者から指示された場合以外は自己隔離する必要やキャンパスで行う検査を60日間受ける必要はありません。Safer Illinoisアプリは、この期間にアクセスを許可するように設定されています。質問や困ったことがある場合は、<a href='mailto:[email protected]'>[email protected]</a> まで連絡してください。</h6>",
 			"positive-nip.explanation": "唾液PCR検査は、不感染性レベルにある場合、2回目の検査結果が陽性検査を出す可能性があります。",
-			"test.monitor.step": "検査結果をモニタリングする",
+			"test.monitor.step.html": "<h1>検査結果をモニタリングする</h1><p>大学は、可能であれば予防接種を受けることを推奨しています。 <a href='https://www.vaccinefinder.org'>vaccinefinder.org</a> にアクセスして、近くの予定を見つけてください。</p>",
 			"test.now.step": "今検査を受ける",
 			"test.now.reason": "検査期日が過ぎたため、ステータスがオレンジに変更されました。",
 			"test.another.asap.step": "今すぐ別の検査を受ける",

lib/ui/health/HealthHomePanel.dart

@@ -413,7 +413,7 @@ class _HealthHomePanelState extends State<HealthHomePanel> implements Notificati
           Container(height: 12,),
           Html(data: eventExplanationHtml, onLinkTap: (url) => _onTapLink(url),
             style: {
-              "body": Style(fontFamily: Styles().fontFamilies.regular, color: Styles().colors.textBackground),
+              "body": Style(fontFamily: Styles().fontFamilies.medium, fontSize: FontSize(16), color: Styles().colors.fillColorPrimary, padding: EdgeInsets.zero, margin: EdgeInsets.zero),
             },
           ),
       ]);
@@ -487,7 +487,7 @@ class _HealthHomePanelState extends State<HealthHomePanel> implements Notificati
           Container(height: 12,),
           Html(data: nextStepHtml, onLinkTap: (url) => _onTapLink(url),
             style: {
-              "body": Style(fontFamily: Styles().fontFamilies.regular, color: Styles().colors.textBackground)
+              "body": Style(fontFamily: Styles().fontFamilies.medium, fontSize: FontSize(16), color: Styles().colors.fillColorPrimary, padding: EdgeInsets.zero, margin: EdgeInsets.zero)
             },
           ),
       ]);
@@ -505,7 +505,7 @@ class _HealthHomePanelState extends State<HealthHomePanel> implements Notificati
           Container(height: 12,),
           Html(data: warningHtml, onLinkTap: (url) => _onTapLink(url),
             style: {
-              "body": Style(fontFamily: Styles().fontFamilies.medium, color: Styles().colors.fillColorPrimary)
+              "body": Style(fontFamily: Styles().fontFamilies.medium, fontSize: FontSize(16), color: Styles().colors.fillColorPrimary, padding: EdgeInsets.zero, margin: EdgeInsets.zero)
             },
           ),
       ]);

lib/ui/health/HealthNextStepsPanel.dart

@@ -99,7 +99,7 @@ class _HealthNextStepsPanelState extends State<HealthNextStepsPanel> {
           Padding(padding: EdgeInsets.only(left: 34, right: 39), child:
             Html(data: nextStepHtml, onLinkTap: (url) => _onTapLink(url),
               style: {
-                "body": Style(fontFamily: Styles().fontFamilies.regular, color: Styles().colors.white)
+                "body": Style(fontFamily: Styles().fontFamilies.medium, fontSize: FontSize(16), color: Styles().colors.white, padding: EdgeInsets.zero, margin: EdgeInsets.zero)
               },
             ),
           ),

pubspec.yaml

@@ -11,7 +11,7 @@ description: Illinois client application.
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 2.10.28+1028
+version: 2.10.29+1029
 
 environment:
   sdk: ">=2.2.0 <3.0.0"