From 2c8cdcafd471b549d0a7b2c63204a2a0c570ccb2 Mon Sep 17 00:00:00 2001 From: Bart Nijland Date: Tue, 17 Aug 2021 11:17:32 +0200 Subject: [PATCH 1/4] Copy export --- holder/src/main/res/values-en/strings.xml | 4 ++-- holder/src/main/res/values/strings.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/holder/src/main/res/values-en/strings.xml b/holder/src/main/res/values-en/strings.xml index 4bdcea9cc..0d6d16821 100644 --- a/holder/src/main/res/values-en/strings.xml +++ b/holder/src/main/res/values-en/strings.xml @@ -118,7 +118,7 @@ We\'re starting the app... App out of order - The app is no longer in use. For more information, go to CoronaCheck.nl + The app is not in use at the moment. For more information, go to CoronaCheck.nl Read more on the website Time for an update To continue, install the latest version of the app. @@ -362,7 +362,7 @@ You can create a QR code with the retrieved details. This is your certificate. Retrieved details Are you sure you want to stop? - You can try to add a paper certificate again later. + You can try to add this QR code in the app again later. Yes, stop No, continue Do you want to replace your certificate? diff --git a/holder/src/main/res/values/strings.xml b/holder/src/main/res/values/strings.xml index 03327877f..d7cfede0d 100644 --- a/holder/src/main/res/values/strings.xml +++ b/holder/src/main/res/values/strings.xml @@ -118,7 +118,7 @@ We starten de app voor je op… App buiten werking - De app is niet meer in gebruik. Ga voor meer informatie naar CoronaCheck.nl + Op dit moment is de app niet in gebruik. Ga voor meer informatie naar CoronaCheck.nl Lees meer op de website Tijd voor een update Je hebt de laatste versie van de app nodig om verder te gaan. From 798d27bd5468c97c376b7b50f93274c021773b70 Mon Sep 17 00:00:00 2001 From: Bart Nijland Date: Tue, 17 Aug 2021 11:50:57 +0200 Subject: [PATCH 2/4] Correct toolbar title in your events fragment --- .../ctr/holder/ui/create_qr/ChooseProviderFragment.kt | 2 +- .../rijksoverheid/ctr/holder/ui/create_qr/GetEventsFragment.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/holder/src/main/java/nl/rijksoverheid/ctr/holder/ui/create_qr/ChooseProviderFragment.kt b/holder/src/main/java/nl/rijksoverheid/ctr/holder/ui/create_qr/ChooseProviderFragment.kt index 53b990f66..bb9bf03fc 100644 --- a/holder/src/main/java/nl/rijksoverheid/ctr/holder/ui/create_qr/ChooseProviderFragment.kt +++ b/holder/src/main/java/nl/rijksoverheid/ctr/holder/ui/create_qr/ChooseProviderFragment.kt @@ -164,7 +164,7 @@ class ChooseProviderFragment : DigiDFragment(R.layout.fragment_choose_provider) .toMap(), originType = OriginType.Test ), - toolbarTitle = getString(R.string.your_vaccination_result_toolbar_title) + toolbarTitle = getString(R.string.commercial_test_type_title) ) ) } diff --git a/holder/src/main/java/nl/rijksoverheid/ctr/holder/ui/create_qr/GetEventsFragment.kt b/holder/src/main/java/nl/rijksoverheid/ctr/holder/ui/create_qr/GetEventsFragment.kt index c741757af..489c06b40 100644 --- a/holder/src/main/java/nl/rijksoverheid/ctr/holder/ui/create_qr/GetEventsFragment.kt +++ b/holder/src/main/java/nl/rijksoverheid/ctr/holder/ui/create_qr/GetEventsFragment.kt @@ -196,7 +196,7 @@ class GetEventsFragment: DigiDFragment(R.layout.fragment_get_events) { .toMap(), originType = args.originType ), - toolbarTitle = getString(R.string.your_vaccination_result_toolbar_title) + toolbarTitle = getCopyForOriginType().toolbarTitle ) ) } From fafa96edc2808ff080344f43712f495e1a464735 Mon Sep 17 00:00:00 2001 From: Aiden Shi Date: Tue, 17 Aug 2021 12:13:50 +0200 Subject: [PATCH 3/4] fix wrong comparisons on config lists vaccination info --- .../ui/create_qr/util/VaccinationInfoScreenUtil.kt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/holder/src/main/java/nl/rijksoverheid/ctr/holder/ui/create_qr/util/VaccinationInfoScreenUtil.kt b/holder/src/main/java/nl/rijksoverheid/ctr/holder/ui/create_qr/util/VaccinationInfoScreenUtil.kt index 7695a7280..05aabaab7 100644 --- a/holder/src/main/java/nl/rijksoverheid/ctr/holder/ui/create_qr/util/VaccinationInfoScreenUtil.kt +++ b/holder/src/main/java/nl/rijksoverheid/ctr/holder/ui/create_qr/util/VaccinationInfoScreenUtil.kt @@ -120,15 +120,16 @@ class VaccinationInfoScreenUtilImpl( hpkCode: AppConfig.HpkCode?, event: RemoteEventVaccination ) = - (holderConfig.euManufacturers.firstOrNull { hpkCode?.ma == event.vaccination?.manufacturer }?.name + (holderConfig.euManufacturers.firstOrNull { it.code == event.vaccination?.manufacturer }?.name + ?: holderConfig.euManufacturers.firstOrNull { it.code == hpkCode?.ma }?.name ?: event.vaccination?.manufacturer ?: "") private fun getVaccineTypeAnswer( hpkCode: AppConfig.HpkCode?, event: RemoteEventVaccination - ) = (holderConfig.euVaccinations.firstOrNull { hpkCode?.vp == event.vaccination?.type }?.name - ?: holderConfig.euVaccinations.firstOrNull { it.code == event.vaccination?.type }?.name + ) = (holderConfig.euVaccinations.firstOrNull { it.code == event.vaccination?.type }?.name + ?: holderConfig.euVaccinations.firstOrNull { it.code == hpkCode?.vp }?.name ?: event.vaccination?.type ?: "") @@ -138,8 +139,8 @@ class VaccinationInfoScreenUtilImpl( ): String { val hpkCodeName = hpkCode?.name ?: "" val brand = - holderConfig.euBrands.firstOrNull { hpkCode?.mp == event.vaccination?.brand }?.name - ?: holderConfig.euBrands.firstOrNull { it.code == event.vaccination?.brand }?.name + holderConfig.euBrands.firstOrNull { it.code == event.vaccination?.brand }?.name + ?: holderConfig.euBrands.firstOrNull { it.code == hpkCode?.mp }?.name ?: event.vaccination?.brand ?: "" return when { From a961d4f010bf4447fe846718925f8e42cc5e94ee Mon Sep 17 00:00:00 2001 From: Aiden Shi Date: Tue, 17 Aug 2021 12:35:54 +0200 Subject: [PATCH 4/4] fix vaccination info test --- .../ui/create_qr/util/VaccinationInfoScreenUtilImplTest.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/holder/src/test/java/nl/rijksoverheid/ctr/holder/ui/create_qr/util/VaccinationInfoScreenUtilImplTest.kt b/holder/src/test/java/nl/rijksoverheid/ctr/holder/ui/create_qr/util/VaccinationInfoScreenUtilImplTest.kt index b7f1348ff..44be71370 100644 --- a/holder/src/test/java/nl/rijksoverheid/ctr/holder/ui/create_qr/util/VaccinationInfoScreenUtilImplTest.kt +++ b/holder/src/test/java/nl/rijksoverheid/ctr/holder/ui/create_qr/util/VaccinationInfoScreenUtilImplTest.kt @@ -54,7 +54,7 @@ class VaccinationInfoScreenUtilImplTest : AutoCloseKoinTest() { euManufacturers = listOf( AppConfig.Code( code = "ORG-100030215", - name = "manufacturerName" + name = "Biontech Manufacturing GmbH" ) ) ) @@ -100,7 +100,7 @@ class VaccinationInfoScreenUtilImplTest : AutoCloseKoinTest() { assertEquals("Over jouw vaccinatie", infoScreen.title) assertEquals( - "Deze gegevens van je vaccinatie zijn opgehaald bij GGD:

Naam: Surname
Geboortedatum: 01-08-1982

Ziekteverwekker: COVID-19
Vaccin: Pfizer (Comirnaty)
Type vaccin: type
Producent: manufacturer
Dosis: 1 van 2
Vaccinatiedatum: 1 augustus 2021
Gevaccineerd in: Nederland
Uniek vaccinatienummer: unique
", + "Deze gegevens van je vaccinatie zijn opgehaald bij GGD:

Naam: Surname
Geboortedatum: 01-08-1982

Ziekteverwekker: COVID-19
Vaccin: Pfizer (Comirnaty)
Type vaccin: type
Producent: Biontech Manufacturing GmbH
Dosis: 1 van 2
Vaccinatiedatum: 1 augustus 2021
Gevaccineerd in: Nederland
Uniek vaccinatienummer: unique
", infoScreen.description )