From ab26263131afb832c06ddaf7767a75d0d8492b75 Mon Sep 17 00:00:00 2001 From: "Isaac J. Galvan" Date: Mon, 25 Jan 2021 08:57:18 -0600 Subject: [PATCH 1/5] changed order of onboarding --- assets/flexUI.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/flexUI.json b/assets/flexUI.json index 603203ca..6e1c4361 100644 --- a/assets/flexUI.json +++ b/assets/flexUI.json @@ -1,7 +1,7 @@ { "content": { - "onboarding": ["get_started", "organization", "notifications_auth", "location_auth", "bluetooth_auth", "roles", "login_netid", "login_phone", "verify_phone", "confirm_phone", - "covid19_intro", "covid19_how_it_works", "health_disclosure", "covid19_consent", "covid19_qrcode", "covid19_final"], + "onboarding": ["get_started", "organization", "health_disclosure", "notifications_auth", "location_auth", "bluetooth_auth", "roles", "login_netid", "login_phone", "verify_phone", "confirm_phone", + "covid19_intro", "covid19_how_it_works", "covid19_consent", "covid19_qrcode", "covid19_final"], "settings": ["user_info", "connect", "customizations", "connected", "notifications", "covid19", "privacy", "account", "feedback"], "settings.connect": ["netid", "phone"], From 3e3ca4fc9ca3cd05512729f21848b9929b3b2557 Mon Sep 17 00:00:00 2001 From: "Isaac J. Galvan" Date: Mon, 25 Jan 2021 09:01:56 -0600 Subject: [PATCH 2/5] updated changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d768ccc..763289d3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## Unreleased +- Updated order of panel shown during onboarding [#503](https://github.com/rokwire/safer-illinois-app/issues/503) ## [2.9.6] - 2021-1-22 ### Fixed From a6dc87d5fd2c82d7344cdfd4803252373e1b5cea Mon Sep 17 00:00:00 2001 From: Mihail Varbanov Date: Tue, 26 Jan 2021 11:29:08 +0200 Subject: [PATCH 3/5] Version 2.9.7 --- CHANGELOG.md | 2 ++ pubspec.yaml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 763289d3..c539a189 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## Unreleased + +## [2.9.7] - 2021-1-26 - Updated order of panel shown during onboarding [#503](https://github.com/rokwire/safer-illinois-app/issues/503) ## [2.9.6] - 2021-1-22 diff --git a/pubspec.yaml b/pubspec.yaml index 15ae5344..cfc025fe 100644 --- a/pubspec.yaml +++ b/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.9.6+906 +version: 2.9.7+907 environment: sdk: ">=2.2.0 <3.0.0" From 481cd8874b8da2faca85cf0338a42d3bfa9543dc Mon Sep 17 00:00:00 2001 From: Mihail Varbanov Date: Tue, 26 Jan 2021 15:55:54 +0200 Subject: [PATCH 4/5] Use nextStepDate in local time when making the calculations for displayNextStepDate. --- lib/model/Health.dart | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/lib/model/Health.dart b/lib/model/Health.dart index da717118..9ed63291 100644 --- a/lib/model/Health.dart +++ b/lib/model/Health.dart @@ -165,7 +165,7 @@ class Covid19StatusBlob { String displayNextStepDate({String format = _nextStepDateFormat}) { if (nextStepDateUtc != null) { - DateTime nextStepMidnightLocal = AppDateTime.midnight(nextStepDateUtc); + DateTime nextStepMidnightLocal = AppDateTime.midnight(nextStepDateUtc.toLocal()); if (nextStepMidnightLocal == AppDateTime.todayMidnightLocal) { return Localization().getStringEx('model.explore.time.today', 'Today').toLowerCase(); } @@ -391,13 +391,7 @@ class Covid19History { } DateTime get dateMidnightLocal { - if (dateUtc != null) { - DateTime dateLocal = dateUtc.toLocal(); - return DateTime(dateLocal.year, dateLocal.month, dateLocal.day); - } - else { - return null; - } + return (dateUtc != null) ? AppDateTime.midnight(dateUtc.toLocal()) : null; } bool matchEvent(Covid19Event event) { From e365e6ce7f36ccd6c22545c099ea9ba4f76588c0 Mon Sep 17 00:00:00 2001 From: Mihail Varbanov Date: Tue, 26 Jan 2021 16:06:56 +0200 Subject: [PATCH 5/5] Updated CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c539a189..0825f07c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [2.9.7] - 2021-1-26 - Updated order of panel shown during onboarding [#503](https://github.com/rokwire/safer-illinois-app/issues/503) +- Apply nextStepDate in local time when making the calculations for displayNextStepDate. ## [2.9.6] - 2021-1-22 ### Fixed