From 25f1a209e5d07979e67b304b1a9f336a341880ce Mon Sep 17 00:00:00 2001
From: Bart Nijland <bartnijland91@gmail.com>
Date: Tue, 13 Jul 2021 13:04:54 +0200
Subject: [PATCH 1/2] Copy export for 217

---
 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 be23a0962..853087c3a 100644
--- a/holder/src/main/res/values-en/strings.xml
+++ b/holder/src/main/res/values-en/strings.xml
@@ -309,10 +309,10 @@
     <string name="my_overview_green_card_server_error_after_retry"><![CDATA[or call the help desk at 0800-1421 (free)]]></string>
     <string name="my_overview_green_card_internet_error"><![CDATA[Connect to the internet to make sure <br\> your QR code works again. <a href="#">Try again</a>]]></string>
     <string name="dialog_faultyvaccination28June_title">Vaccination certificate corrected</string>
-    <string name="dialog_faultyvaccination28June_message">Due to a technical error you’ve wrongly received a Dutch vaccination certificate. This was corrected.</string>
+    <string name="dialog_faultyvaccination28June_message">You’ve wrongly received a Dutch vaccination certificate due to a technical error. This was corrected.</string>
     <string name="dialog_faultyvaccination28June_refresh_error_title">Something went wrong while refreshing your details</string>
     <string name="dialog_faultyvaccination28June_refresh_error_message">Please retrieve your details again via the app.</string>
     <string name="my_overview_qr_placeholder_header">Find your certificate here later</string>
-    <string name="my_overview_qr_placeholder_description"><![CDATA[You can add a certificate if you\'re vaccinated, if you\'ve had corona or by taking a test at an <a href="https://coronacheck.nl/en/testafspraak-in-app">affiliated test location</a>. The app generates a certificate for the Netherlands and one for other countries.<br /></p><p><b>Travelling outside the Netherlands?</b><br />Check <a href="www.nederlandwereldwijd.nl/reizen/reisadviezen">wijsopreis.nl</a> before you leave. There you will find which certificate is valid in the country you’re planning to visit.]]></string>
+    <string name="my_overview_qr_placeholder_description"><![CDATA[You can add a certificate if you\'re vaccinated, if you\'ve had corona or by taking a test at an <a href="https://coronacheck.nl/en/testafspraak-in-app">affiliated test location</a>. The app generates a certificate for the Netherlands and one for other countries.<br /></p><p><b>Travelling outside the Netherlands?</b><br />Check <a href="https://www.nederlandwereldwijd.nl/reizen/reisadviezen">wijsopreis.nl</a> before you leave. There you will find which certificate is valid in the country you’re planning to visit.]]></string>
     <string name="my_overview_add_qr_button">Add certificate</string>
 </resources>
diff --git a/holder/src/main/res/values/strings.xml b/holder/src/main/res/values/strings.xml
index b218ea055..9b88f6795 100644
--- a/holder/src/main/res/values/strings.xml
+++ b/holder/src/main/res/values/strings.xml
@@ -313,6 +313,6 @@
     <string name="dialog_faultyvaccination28June_refresh_error_title">Er is iets misgegaan bij het vernieuwen van je gegevens</string>
     <string name="dialog_faultyvaccination28June_refresh_error_message">Haal je gegevens opnieuw op via de app.</string>
     <string name="my_overview_qr_placeholder_header">Hier komt jouw bewijs</string>
-    <string name="my_overview_qr_placeholder_description"><![CDATA[Je kunt een bewijs toevoegen als je bent gevaccineerd of hersteld. Of als je bent getest bij een <a href="https://coronacheck.nl/nl/testafspraak-in-app">aangesloten testlocatie</a>. De app maakt een Nederlands en een internationaal bewijs.<br /></p><p><b>Reis je buiten Nederland?</b><br />Check <a href="www.nederlandwereldwijd.nl/reizen/reisadviezen">wijsopreis.nl</a> voor vertrek. Daar staat welk bewijs geldig is in het land dat je bezoekt.]]></string>
+    <string name="my_overview_qr_placeholder_description"><![CDATA[Je kunt een bewijs toevoegen als je bent gevaccineerd of hersteld. Of als je bent getest bij een <a href="https://coronacheck.nl/nl/testafspraak-in-app">aangesloten testlocatie</a>. De app maakt een Nederlands en een internationaal bewijs.<br /></p><p><b>Reis je buiten Nederland?</b><br />Check <a href="https://www.nederlandwereldwijd.nl/reizen/reisadviezen">wijsopreis.nl</a> voor vertrek. Daar staat welk bewijs geldig is in het land dat je bezoekt.]]></string>
     <string name="my_overview_add_qr_button">Bewijs toevoegen</string>
 </resources>

From 5ad608305c1290a7389a53c2e201a3345a499f35 Mon Sep 17 00:00:00 2001
From: Bart Nijland <bartnijland91@gmail.com>
Date: Tue, 13 Jul 2021 14:18:18 +0200
Subject: [PATCH 2/2] Remove unused screen

---
 .../ctr/holder/HolderMainFragment.kt          |  6 +-
 .../ui/create_qr/QrExplanationFragment.kt     | 28 --------
 .../res/layout/fragment_qr_explanation.xml    | 66 -------------------
 .../src/main/res/menu/navigation_drawer.xml   |  2 +-
 holder/src/main/res/menu/overview_toolbar.xml |  2 +-
 .../res/navigation/holder_nav_graph_main.xml  | 54 ---------------
 holder/src/main/res/values-en/strings.xml     |  2 -
 holder/src/main/res/values/strings.xml        |  2 -
 8 files changed, 4 insertions(+), 158 deletions(-)
 delete mode 100644 holder/src/main/java/nl/rijksoverheid/ctr/holder/ui/create_qr/QrExplanationFragment.kt
 delete mode 100644 holder/src/main/res/layout/fragment_qr_explanation.xml

diff --git a/holder/src/main/java/nl/rijksoverheid/ctr/holder/HolderMainFragment.kt b/holder/src/main/java/nl/rijksoverheid/ctr/holder/HolderMainFragment.kt
index 86ebff6cb..d776b4e2e 100644
--- a/holder/src/main/java/nl/rijksoverheid/ctr/holder/HolderMainFragment.kt
+++ b/holder/src/main/java/nl/rijksoverheid/ctr/holder/HolderMainFragment.kt
@@ -32,8 +32,7 @@ import nl.rijksoverheid.ctr.shared.utils.Accessibility.setAccessibilityFocus
 class HolderMainFragment : BaseMainFragment(
     R.layout.fragment_main, setOf(
         R.id.nav_my_overview,
-        R.id.nav_about_this_app,
-        R.id.nav_qr_explanation_root
+        R.id.nav_about_this_app
     )
 ) {
 
@@ -160,7 +159,7 @@ class HolderMainFragment : BaseMainFragment(
             .styleTitle(context, R.attr.textAppearanceHeadline6)
         binding.navView.menu.findItem(R.id.nav_settings)
             .styleTitle(context, R.attr.textAppearanceHeadline6)
-        binding.navView.menu.findItem(R.id.nav_qr_explanation_root)
+        binding.navView.menu.findItem(R.id.action_qr_type)
             .styleTitle(context, R.attr.textAppearanceHeadline6)
         binding.navView.menu.findItem(R.id.nav_about_this_app)
             .styleTitle(context, R.attr.textAppearanceBody1)
@@ -169,5 +168,4 @@ class HolderMainFragment : BaseMainFragment(
         binding.navView.menu.findItem(R.id.nav_terms_of_use)
             .styleTitle(context, R.attr.textAppearanceBody1)
     }
-
 }
diff --git a/holder/src/main/java/nl/rijksoverheid/ctr/holder/ui/create_qr/QrExplanationFragment.kt b/holder/src/main/java/nl/rijksoverheid/ctr/holder/ui/create_qr/QrExplanationFragment.kt
deleted file mode 100644
index ef23d7660..000000000
--- a/holder/src/main/java/nl/rijksoverheid/ctr/holder/ui/create_qr/QrExplanationFragment.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *  Copyright (c) 2021 De Staat der Nederlanden, Ministerie van Volksgezondheid, Welzijn en Sport.
- *   Licensed under the EUROPEAN UNION PUBLIC LICENCE v. 1.2
- *
- *   SPDX-License-Identifier: EUPL-1.2
- *
- */
-
-package nl.rijksoverheid.ctr.holder.ui.create_qr
-
-import android.os.Bundle
-import android.view.View
-import androidx.fragment.app.Fragment
-import androidx.navigation.fragment.findNavController
-import nl.rijksoverheid.ctr.holder.R
-import nl.rijksoverheid.ctr.holder.databinding.FragmentQrExplanationBinding
-
-class QrExplanationFragment : Fragment(R.layout.fragment_qr_explanation) {
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        val binding = FragmentQrExplanationBinding.bind(view)
-        binding.button.setOnClickListener {
-            findNavController().navigate(QrExplanationFragmentDirections.actionQrType())
-        }
-    }
-}
diff --git a/holder/src/main/res/layout/fragment_qr_explanation.xml b/holder/src/main/res/layout/fragment_qr_explanation.xml
deleted file mode 100644
index 07a2f20a7..000000000
--- a/holder/src/main/res/layout/fragment_qr_explanation.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fillViewport="true">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:clipToPadding="false"
-        android:paddingBottom="32dp">
-
-        <ImageView
-            android:id="@+id/image"
-            android:layout_width="match_parent"
-            android:layout_height="260dp"
-            android:background="@color/secondary_green"
-            android:contentDescription="@null"
-            android:scaleType="centerInside"
-            android:src="@drawable/illustration_create_qr_big"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <nl.rijksoverheid.ctr.design.views.AccessibilityHeaderWidget
-            android:id="@+id/title"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="16dp"
-            android:layout_marginTop="32dp"
-            android:text="@string/create_qr_explanation_title"
-            android:textAppearance="?attr/textAppearanceHeadline5"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/image" />
-
-        <nl.rijksoverheid.ctr.design.views.HtmlTextViewWidget
-            android:id="@+id/description"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="24dp"
-            android:textAppearance="?attr/textAppearanceBody1"
-            app:enableHtmlLinks="true"
-            app:htmlText="@string/create_qr_explanation_description"
-            app:layout_constraintEnd_toEndOf="@+id/title"
-            app:layout_constraintStart_toStartOf="@+id/title"
-            app:layout_constraintTop_toBottomOf="@+id/title" />
-
-        <Button
-            android:id="@+id/button"
-            style="@style/Widget.App.Button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="32dp"
-            android:text="@string/onboarding_next"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/description"
-            app:layout_constraintVertical_bias="1" />
-
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</ScrollView>
diff --git a/holder/src/main/res/menu/navigation_drawer.xml b/holder/src/main/res/menu/navigation_drawer.xml
index aa27647e2..405bbf3cd 100644
--- a/holder/src/main/res/menu/navigation_drawer.xml
+++ b/holder/src/main/res/menu/navigation_drawer.xml
@@ -9,7 +9,7 @@
             android:title="@string/my_overview" />
 
         <item
-            android:id="@+id/nav_qr_explanation_root"
+            android:id="@+id/action_qr_type"
             android:checkable="false"
             android:title="@string/choose_provider_toolbar" />
 
diff --git a/holder/src/main/res/menu/overview_toolbar.xml b/holder/src/main/res/menu/overview_toolbar.xml
index 9c882dafa..e51be9564 100644
--- a/holder/src/main/res/menu/overview_toolbar.xml
+++ b/holder/src/main/res/menu/overview_toolbar.xml
@@ -10,7 +10,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
-        android:id="@+id/nav_qr_explanation"
+        android:id="@+id/action_qr_type"
         android:icon="@drawable/ic_add"
         android:title=""
         app:contentDescription="@string/my_overview_no_qr_make_qr_button"
diff --git a/holder/src/main/res/navigation/holder_nav_graph_main.xml b/holder/src/main/res/navigation/holder_nav_graph_main.xml
index 0d589dc3d..d61207790 100644
--- a/holder/src/main/res/navigation/holder_nav_graph_main.xml
+++ b/holder/src/main/res/navigation/holder_nav_graph_main.xml
@@ -30,14 +30,6 @@
                 app:popEnterAnim="@anim/fragment_close_enter"
                 app:popExitAnim="@anim/fragment_close_exit" />
 
-            <action
-                android:id="@+id/action_make_appointment"
-                app:destination="@id/nav_make_appointment"
-                app:enterAnim="@anim/fragment_open_enter"
-                app:exitAnim="@anim/fragment_open_exit"
-                app:popEnterAnim="@anim/fragment_close_enter"
-                app:popExitAnim="@anim/fragment_close_exit" />
-
             <action
                 android:id="@+id/action_qr_code"
                 app:destination="@id/nav_qr_code"
@@ -46,14 +38,6 @@
                 app:popEnterAnim="@anim/fragment_close_enter"
                 app:popExitAnim="@anim/fragment_close_exit" />
 
-            <action
-                android:id="@+id/action_create_qr"
-                app:destination="@id/nav_qr_explanation"
-                app:enterAnim="@anim/fragment_open_enter"
-                app:exitAnim="@anim/fragment_open_exit"
-                app:popEnterAnim="@anim/fragment_close_enter"
-                app:popExitAnim="@anim/fragment_close_exit" />
-
             <action
                 android:id="@+id/action_qr_type"
                 app:destination="@id/nav_qr_code_type"
@@ -120,38 +104,6 @@
 
     </dialog>
 
-    <fragment
-        android:id="@+id/nav_qr_explanation_root"
-        android:name="nl.rijksoverheid.ctr.holder.ui.create_qr.QrExplanationFragment"
-        android:label="@string/choose_provider_toolbar"
-        tools:layout="@layout/fragment_qr_explanation">
-
-        <action
-            android:id="@+id/action_qr_type"
-            app:destination="@id/nav_qr_code_type"
-            app:enterAnim="@anim/slide_in_right"
-            app:exitAnim="@anim/slide_out_left"
-            app:popEnterAnim="@anim/slide_in_left"
-            app:popExitAnim="@anim/slide_out_right" />
-
-    </fragment>
-
-    <fragment
-        android:id="@+id/nav_qr_explanation"
-        android:name="nl.rijksoverheid.ctr.holder.ui.create_qr.QrExplanationFragment"
-        android:label="@string/choose_provider_toolbar"
-        tools:layout="@layout/fragment_qr_explanation">
-
-        <action
-            android:id="@+id/action_qr_type"
-            app:destination="@id/nav_qr_code_type"
-            app:enterAnim="@anim/slide_in_right"
-            app:exitAnim="@anim/slide_out_left"
-            app:popEnterAnim="@anim/slide_in_left"
-            app:popExitAnim="@anim/slide_out_right" />
-
-    </fragment>
-
     <fragment
         android:id="@+id/nav_qr_code_type"
         android:name="nl.rijksoverheid.ctr.holder.ui.create_qr.QrCodeTypeFragment"
@@ -464,12 +416,6 @@
 
     </fragment>
 
-    <fragment
-        android:id="@+id/nav_make_appointment"
-        android:name="nl.rijksoverheid.ctr.holder.ui.make_appointment.MakeAppointmentFragment"
-        android:label="@string/test_appointment_info_toolbar_title"
-        tools:layout="@layout/fragment_make_appointment" />
-
     <fragment
         android:id="@+id/nav_about_this_app"
         android:name="nl.rijksoverheid.ctr.design.menu.about.AboutThisAppFragment"
diff --git a/holder/src/main/res/values-en/strings.xml b/holder/src/main/res/values-en/strings.xml
index 853087c3a..fa19a03d6 100644
--- a/holder/src/main/res/values-en/strings.xml
+++ b/holder/src/main/res/values-en/strings.xml
@@ -183,8 +183,6 @@
     <string name="url_accessibility">https://coronacheck.nl/en/accessibility-in-app</string>
     <string name="create_qr_explanation_menu_title">Make QR code</string>
     <string name="create_qr_explanation_menu_title_alternative">Add a QR code</string>
-    <string name="create_qr_explanation_title">Make a QR code</string>
-    <string name="create_qr_explanation_description"><![CDATA[The app makes a QR code in three steps. This QR code is your personal certificate.<br/><br/><b>1. Choose the type of certificate</b><br/>Choose to create a vaccination certificate, a test certificate or a recovery certificate.<br/><br/><b>2. Automatically retrieve data
</b><br/>The app directly retrieves the data of your vaccination, test result or recovery.<br/><br/><b>

3. QR codes are ready
</b><br/>The app generates a QR code for the Netherlands and one for other countries. <br/><br/>]]></string>
     <string name="qr_code_type_title">What kind of certificate would you like to add?</string>
     <string name="qr_code_type_description">Indicate what kind of certificate you would like to add. You can have multiple certificates.</string>
     <string name="qr_code_type_negative_test_title">A test certificate</string>
diff --git a/holder/src/main/res/values/strings.xml b/holder/src/main/res/values/strings.xml
index 9b88f6795..4fd962594 100644
--- a/holder/src/main/res/values/strings.xml
+++ b/holder/src/main/res/values/strings.xml
@@ -183,8 +183,6 @@
     <string name="url_accessibility">https://coronacheck.nl/nl/accessibility-in-app</string>
     <string name="create_qr_explanation_menu_title">QR-code maken</string>
     <string name="create_qr_explanation_menu_title_alternative">Voeg een QR-code toe</string>
-    <string name="create_qr_explanation_title">Een QR-code maken</string>
-    <string name="create_qr_explanation_description"><![CDATA[De app maakt in 3 stappen een QR-code. De QR-code is jouw bewijs.<br/><br/><b>1. Kies het soort bewijs</b><br/>Je kan een vaccinatiebewijs, een testbewijs of een herstelbewijs maken.<br/><br/><b>2. Automatisch gegevens ophalen</b><br/>De app haalt direct de gegevens van je vaccinatie, testuitslag of herstel op.<br/><br/><b>3. QR-codes staan klaar</b><br/>De app maakt twee QR-codes: een QR-code voor Nederland en een internationale.]]></string>
     <string name="qr_code_type_title">Welk bewijs wil je toevoegen?</string>
     <string name="qr_code_type_description">Geef aan wat voor bewijs je wil toevoegen. Je kunt meerdere bewijzen tegelijk hebben.</string>
     <string name="qr_code_type_negative_test_title">Een testbewijs</string>