diff --git a/design/src/main/res/drawable/ic_warning.xml b/design/src/main/res/drawable/ic_warning.xml
new file mode 100644
index 000000000..44711718e
--- /dev/null
+++ b/design/src/main/res/drawable/ic_warning.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
diff --git a/holder/src/main/java/nl/rijksoverheid/ctr/holder/menu/MenuViewModel.kt b/holder/src/main/java/nl/rijksoverheid/ctr/holder/menu/MenuViewModel.kt
index bc0570dfc..5aefc21a8 100644
--- a/holder/src/main/java/nl/rijksoverheid/ctr/holder/menu/MenuViewModel.kt
+++ b/holder/src/main/java/nl/rijksoverheid/ctr/holder/menu/MenuViewModel.kt
@@ -114,7 +114,7 @@ class MenuViewModelImpl(
MenuSection(
menuItems = listOf(
MenuSection.MenuItem(
- icon = R.drawable.ic_menu_info,
+ icon = R.drawable.ic_warning,
color = R.color.error,
title = R.string.holder_menu_resetApp,
onClick = MenuSection.MenuItem.OnClick.ResetApp
diff --git a/holder/src/main/java/nl/rijksoverheid/ctr/holder/your_events/utils/RecoveryInfoScreenUtil.kt b/holder/src/main/java/nl/rijksoverheid/ctr/holder/your_events/utils/RecoveryInfoScreenUtil.kt
index 0f21bd447..d372c9014 100644
--- a/holder/src/main/java/nl/rijksoverheid/ctr/holder/your_events/utils/RecoveryInfoScreenUtil.kt
+++ b/holder/src/main/java/nl/rijksoverheid/ctr/holder/your_events/utils/RecoveryInfoScreenUtil.kt
@@ -47,6 +47,8 @@ class RecoveryInfoScreenUtilImpl(
val validFromDate = event.recovery?.validFrom?.formatDayMonthYear() ?: ""
val validUntilDate = event.recovery?.validUntil?.formatDayMonthYear() ?: ""
+ val isPaperCertificate = europeanCredential != null
+
val title =
if (europeanCredential != null) resources.getString(R.string.your_vaccination_explanation_toolbar_title) else resources.getString(
R.string.your_test_result_explanation_toolbar_title
@@ -110,7 +112,13 @@ class RecoveryInfoScreenUtilImpl(
),
"
",
createdLine(
- resources.getString(R.string.recovery_explanation_description_unique_test_identifier),
+ resources.getString(
+ if (isPaperCertificate) {
+ R.string.holder_dcc_test_identifier
+ } else {
+ R.string.your_test_result_explanation_description_unique_identifier
+ }
+ ),
event.unique
),
if (europeanCredential != null && addExplanation) {
diff --git a/holder/src/main/java/nl/rijksoverheid/ctr/holder/your_events/utils/TestInfoScreenUtil.kt b/holder/src/main/java/nl/rijksoverheid/ctr/holder/your_events/utils/TestInfoScreenUtil.kt
index 2be789175..0094ed4be 100644
--- a/holder/src/main/java/nl/rijksoverheid/ctr/holder/your_events/utils/TestInfoScreenUtil.kt
+++ b/holder/src/main/java/nl/rijksoverheid/ctr/holder/your_events/utils/TestInfoScreenUtil.kt
@@ -78,11 +78,13 @@ class TestInfoScreenUtilImpl(
val country = getCountry(event.negativeTest?.country)
+ val isPaperCertificate = europeanCredential != null
+
val title =
if (europeanCredential != null) resources.getString(R.string.your_vaccination_explanation_toolbar_title) else resources.getString(
R.string.your_test_result_explanation_toolbar_title
)
- val header = if (europeanCredential != null) {
+ val header = if (isPaperCertificate) {
resources.getString(R.string.paper_proof_event_explanation_header)
} else {
resources.getString(R.string.your_test_result_explanation_description_header)
@@ -152,7 +154,13 @@ class TestInfoScreenUtilImpl(
},
"
",
createdLine(
- resources.getString(R.string.your_test_result_explanation_description_unique_identifier),
+ resources.getString(
+ if (isPaperCertificate) {
+ R.string.holder_dcc_test_identifier
+ } else {
+ R.string.your_test_result_explanation_description_unique_identifier
+ }
+ ),
unique
),
if (europeanCredential != null && addExplanation) {
diff --git a/holder/src/main/res/values-en/strings.xml b/holder/src/main/res/values-en/strings.xml
index ce197daad..a8a4facfd 100644
--- a/holder/src/main/res/values-en/strings.xml
+++ b/holder/src/main/res/values-en/strings.xml
@@ -7,6 +7,7 @@
Read more
Login was cancelled
You can try to add a paper certificate again later.
+ Unique certificate identifier:
Doing so will stop the creation of your certificate. You will have to retrieve your test result again later.
Doing so will stop the creation of your certificate. You will have to retrieve your test result again later.
Cancel
@@ -255,7 +256,7 @@
Name:
Date of birth*:
Disease targeted:
- Type of test:
+ Test type:
Test name:
Test date:
Test result:
diff --git a/holder/src/main/res/values/strings.xml b/holder/src/main/res/values/strings.xml
index 5ea454f8c..38506786a 100644
--- a/holder/src/main/res/values/strings.xml
+++ b/holder/src/main/res/values/strings.xml
@@ -7,6 +7,7 @@
Lees meer
Inloggen afgebroken
Je kunt later opnieuw proberen deze QR-code in de app te zetten.
+ Uniek certificaatnummer:
Hierdoor stop je het maken van een bewijs en moet je later opnieuw je testuitslag ophalen.
Hierdoor stop je het maken van een bewijs en moet je later opnieuw je testuitslag ophalen.
Annuleer
@@ -255,7 +256,7 @@
Naam / Name:
Geboortedatum / Date of birth*:
Ziekteverwekker / Disease targeted:
- Type test / Type of test:
+ Type test / Test type:
Testnaam / Test name:
Testdatum / Test date:
Testuitslag / Test result:
diff --git a/holder/src/test/java/nl/rijksoverheid/ctr/qrcodes/utils/QrInfoScreenUtilImplTest.kt b/holder/src/test/java/nl/rijksoverheid/ctr/qrcodes/utils/QrInfoScreenUtilImplTest.kt
index 59e3e18b9..538c11af3 100644
--- a/holder/src/test/java/nl/rijksoverheid/ctr/qrcodes/utils/QrInfoScreenUtilImplTest.kt
+++ b/holder/src/test/java/nl/rijksoverheid/ctr/qrcodes/utils/QrInfoScreenUtilImplTest.kt
@@ -52,7 +52,7 @@ class QrInfoScreenUtilImplTest : AutoCloseKoinTest() {
val infoScreen = infoScreenUtil.getForEuropeanTestQr(json)
assertEquals(
- "In jouw internationale QR-code staan de volgende gegevens:
Naam / Name:
ten Bouwer, Bob
Geboortedatum / Date of birth*:
18-08-1991
Ziekteverwekker / Disease targeted:
COVID-19
Type test / Type of test:
LP6464-4
Testdatum / Test date:
dinsdag 10 augustus 2021 05:10 CEST
Testuitslag / Test result:
negatief (geen coronavirus vastgesteld) / negative (no coronavirus detected)
Testlocatie / Test location:
Facility approved by the State of The Netherlands
Getest in / Tested in:
Nederland / The Netherlands
Afgever certificaat / Certificate issuer:
Ministerie van VWS / Ministry of Health, Welfare and Sport
Uniek certificaatnummer / Unique certificate identifier:
URN:UCI:01:NL:PJ7JLSZ4KRGX5O2E7OD342#E
",
+ "In jouw internationale QR-code staan de volgende gegevens:
Naam / Name:
ten Bouwer, Bob
Geboortedatum / Date of birth*:
18-08-1991
Ziekteverwekker / Disease targeted:
COVID-19
Type test / Test type:
LP6464-4
Testdatum / Test date:
dinsdag 10 augustus 2021 05:10 CEST
Testuitslag / Test result:
negatief (geen coronavirus vastgesteld) / negative (no coronavirus detected)
Testlocatie / Test location:
Facility approved by the State of The Netherlands
Getest in / Tested in:
Nederland / The Netherlands
Afgever certificaat / Certificate issuer:
Ministerie van VWS / Ministry of Health, Welfare and Sport
Uniek certificaatnummer / Unique certificate identifier:
URN:UCI:01:NL:PJ7JLSZ4KRGX5O2E7OD342#E
",
infoScreen.description
)
assertEquals(