Request covid certificate screen (EXPOSUREAPP-7426) (#3314)

* Initial commit

* Adapt new design

* Swap text and input

* Show dialogs and adjust text

* Adjust visibility

* Some cleaning

* TODOs and text adjustments

* Revert Navigation changes

* Lint

* Add way for testing

* Adjust testing Navigation

* Fix typos

* Review comments

Co-authored-by: BMItter <Berndus@gmx.de>

Corona-Warn-App/src/main/res/layout/fragment_submission_qr_code_scan.xml

@@ -41,16 +41,19 @@
         app:layout_constraintStart_toStartOf="@id/submission_qr_code_scan_preview"
         app:layout_constraintTop_toBottomOf="@id/submission_qr_code_scan_guideline_center" />
 
-    <ProgressBar
+    <com.google.android.material.progressindicator.CircularProgressIndicator
         android:id="@+id/submission_qr_code_scan_spinner"
-        style="?android:attr/progressBarStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/spacing_normal"
+        android:indeterminate="true"
         android:visibility="gone"
+        app:hideAnimationBehavior="inward"
+        app:indicatorColor="@color/colorAccent"
         app:layout_constraintEnd_toEndOf="@+id/submission_qr_code_scan_body"
         app:layout_constraintStart_toStartOf="@+id/submission_qr_code_scan_body"
-        app:layout_constraintTop_toBottomOf="@+id/submission_qr_code_scan_body" />
+        app:layout_constraintTop_toBottomOf="@+id/submission_qr_code_scan_body"
+        app:trackColor="@android:color/transparent" />
 
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/submission_qr_code_scan_toolbar"

Corona-Warn-App/src/main/res/navigation/nav_graph.xml

@@ -394,6 +394,10 @@
         app:popUpTo="@id/mainFragment"
         app:popUpToInclusive="false" />
 
+    <action
+        android:id="@+id/action_submissionTestResultGreenCertificateFragment"
+        app:destination="@id/requestGreenCertificateFragment" />
+
     <action
         android:id="@+id/action_to_submissionTestResultAvailableFragment"
         app:destination="@id/submissionTestResultAvailableFragment"
@@ -812,10 +816,19 @@
             app:argType="string" />
         <argument
             android:name="correctionLevel"
-            app:argType="com.google.zxing.qrcode.decoder.ErrorCorrectionLevel"
-            android:defaultValue="Q" />
+            android:defaultValue="Q"
+            app:argType="com.google.zxing.qrcode.decoder.ErrorCorrectionLevel" />
     </fragment>
     <action
         android:id="@+id/action_global_qrCodeFullScreenFragment"
         app:destination="@id/qrCodeFullScreenFragment" />
+    <fragment
+        android:id="@+id/requestGreenCertificateFragment"
+        android:name="de.rki.coronawarnapp.ui.submission.greencertificate.RequestGreenCertificateFragment"
+        android:label="fragment_request_green_certificate"
+        tools:layout="@layout/fragment_request_green_certificate">
+        <argument
+            android:name="testType"
+            app:argType="de.rki.coronawarnapp.coronatest.type.CoronaTest$Type" />
+    </fragment>
 </navigation>

Corona-Warn-App/src/main/res/values-de/green_certificate_strings.xml

 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
+    <!-- XTXT: Request green certificate title -->
+    <string name="request_green_certificate_title">COVID-19-Testzertifikat</string>
+    <!-- XTXT: Request green certificate subtitle -->
+    <string name="request_green_certificate_subtitle">Sie können über die App ein offizielles digitales Testzertifikat anfordern, das anschließend in der App hinzugefügt wird.</string>
+    <!-- XTXT: Request green certificate body section 1 -->
+    <string name="request_green_certificate_body_1">Das Testzertifikat wird nur bei einem negativen Testergebnis ausgestellt.</string>
+    <!-- XTXT: Request green certificate body section 2 -->
+    <string name="request_green_certificate_body_2">Das Testzertifikat gilt innerhalb der EU als gültiger Nachweis eines negativen Testergebnisses (z.B. für Reisen).</string>
+    <!-- XTXT: Request green certificate body section 3 -->
+    <string name="request_green_certificate_body_3">Das Testzertifikat enthält Daten, die der Prüf-App die Validierung Ihres Zertifikats erlauben.</string>
+    <!-- XBUT: Request green certificate agree button -->
+    <string name="request_green_certificate_agree_button">Testzertifikat Anfordern</string>
+    <!-- XBUT: Request green certificate disagree button -->
+    <string name="request_green_certificate_disagree_button">Nein Danke</string>
+    <!-- XTXT: Request green certificate birth date description -->
+    <string name="request_green_certificate_birthdate_description">Zur Sicherheit wird Ihr Testergebnis mit Ihrem Geburtsdatum geschützt. Das Testergebnis kann nur bei korrekt angegebenem Geburtstdatum zugestellt werden.</string>
+    <!-- XTXT: Request green certificate birth date hint -->
+    <string name="request_green_certificate_birthdate_hint">Geburtsdatum</string>
+    <!-- XTXT: Request green certificate exit dialog title -->
+    <string name="request_gc_dialog_title">Registrierung abbrechen</string>
+    <!-- XTXT: Request green certificate exit dialog message -->
+    <string name="request_gc_dialog_message">Wenn Sie die Test-Registrierung abbrechen, können Sie Ihr Testergebnis nicht in der App erhalten.</string>
+    <!-- XBUT: Request green certificate exit dialog negative button -->
+    <string name="request_gc_dialog_positive_button">OK</string>
+    <!-- XBUT: Request green certificate exit dialog negative button -->
+    <string name="request_gc_dialog_negative_button">Abbrechen</string>
+</resources>
\ No newline at end of file

Corona-Warn-App/src/main/res/values-de/legal_strings.xml

@@ -180,4 +180,22 @@
     <string name="vaccination_privacy_card_third_bulletpoint_title_text" translatable="false">"Wenn Sie den QR-Code in der App vorzeigen und dieser mit der Prüf-App gescannt wird, können andere Personen nachvollziehen, ob Ihr Impfschutz vollständig ist. Bei der Prüfung werden in der offiziellen Prüf-App auch Ihr Name und Ihr Geburtsdatum angezeigt."</string>
     <!-- XTXT: First bulletpoint title for privacy card -->
     <string name="vaccination_privacy_card_fourth_bulletpoint_title_text" translatable="false">"Sie haben jederzeit die Möglichkeit, Impfzertifikate in der App wieder zu entfernen. Bis dahin bleiben die Impfzertifikate auf Ihrem Smartphone gespeichert."</string>
+
+    <!--    Green Certificate -->
+    <!-- XTXT: Request GC title for privacy card -->
+    <string name="request_green_certificate_privacy_title">Datenschutz und Datensicherheit</string>
+    <!-- XTXT: Request GC bullet point 1 for privacy card -->
+    <string name="request_green_certificate_privacy_section_1" translatable="false">Die Anforderung und Verwendung des digitalen COVID-19-Testzertifikats ist freiwillig. Der Nachweis eines negativen Testzertifikats kann auch auf andere Weise erbracht werden.</string>
+    <!-- XTXT: Request GC bullet point 3 for privacy card -->
+    <string name="request_green_certificate_privacy_section_2" translatable="false">Zur Erstellung Ihres Testzertifikats werden Daten einmalig verschlüsselt an das RKI übermittelt. Das RKI signiert die Daten elektronisch, um die Gültigkeit zu bestätigen. Die Daten werden beim RKI nicht gespeichert.</string>
+    <!-- XTXT: Request GC extra bullet point PCR test  for privacy card -->
+    <string name="request_green_certificate_privacy_pcr_extra_section" translatable="false">Um sicherzustellen, dass niemand mit Ihrem QR-Code Ihr Testergebnis abrufen kann, wird es mit Ihrem Geburtsdatum geschützt. Ihr Geburtsdatum wird verschlüsselt an das Labor übermittelt, um das Testergebnis abzurufen.</string>
+    <!-- XTXT: Request GC bullet point 3 for privacy card -->
+    <string name="request_green_certificate_privacy_section_3" translatable="false">Das COVID-19-Testzertifikat enthält die Daten über Ihren Corona-Test. Zum Nachweis des negativen Testergebnisses in den gesetzlich vorgesehenen Fällen genügt das Vorzeigen des QR-Codes in der App. Stellen Sie das Testzertifikat niemandem zur Verfügung, wenn Sie nicht wollen, dass die Daten ausgelesen werden.</string>
+    <!-- XTXT: Request GC bullet point 4 for privacy card -->
+    <string name="request_green_certificate_privacy_section_4" translatable="false">Wenn Sie den QR-Code des Testzertifikats in der App vorzeigen und dieser mit der Prüf-App gescannt wird, können andere Personen Ihr Testergebnis nachvollziehen. Bei der Prüfung werden in der offiziellen Prüf-App auch Ihr Name und Ihr Geburtsdatum angezeigt.</string>
+    <!-- XTXT: Request GC bullet point 5 for privacy card -->
+    <string name="request_green_certificate_privacy_section_5" translatable="false">Sie haben jederzeit die Möglichkeit, Testzertifikate in der App wieder zu entfernen. Bis dahin bleiben die Testzertifikate auf Ihrem Smartphone gespeichert.</string>    <!-- XTXT: Request GC bullet point 1 for privacy card -->
+    <!-- XTXT: Request GC legal information section for privacy card -->
+    <string name="request_green_certificate_privacy_legal_information" translatable="false">Ausführliche Hinweise zur Datenverarbeitung finden Sie in der Datenschutzerklärung</string>
 </resources>

Corona-Warn-App/src/main/res/values-tr/legal_strings.xml

@@ -36,7 +36,7 @@
     <string name="submission_no_consent_your_consent_subsection_body_second_part">"<b>Uygulama test sonucunuzu, karşılaştığınız kullanıcıları uyarmak için paylaşır. Bu yukarıda belirtilen ülkelerdeki Korona Uygulamasının kullanıcıları ve aynı zamanda aynı etkinlikte ya da yerde bulunduğunuz kullanıcılar için geçerlidir. Hızlı test durumunda sadece Korona Uyarı Uygulamasının kullanıcıları uyarılır. Semptomlarınızın başladığına ilişkin ek bilgiler verirseniz bu veriler de paylaşılır.</b>"</string>
     <!-- YTXT: Body for keys submission no consent text third part-->
     <string name="submission_no_consent_your_consent_subsection_body_third_part">"Sonraki adımada, rastgele kimiliklerinize erişim onayı verin."</string>
-     <!-- YTXT: Body for keys submission no consent text fourth part-->
+    <!-- YTXT: Body for keys submission no consent text fourth part-->
     <string name="submission_no_consent_your_consent_subsection_body_fourth_part">"Uyarı gerçekleştikten sonra, Uygulamayı silerek verdiğiniz rıza beyanını da geri alabilirsiniz."</string>
 
     <!-- XTXT: Title for legal information of the contact diary onboarding screen -->
@@ -178,4 +178,21 @@
     <!-- XTXT: First bulletpoint title for privacy card -->
     <string name="vaccination_privacy_card_fourth_bulletpoint_title_text" translatable="false">"Aşı sertifikasını istediğiniz zaman Uygulamadan kaldırma seçeneğiniz vardır. Bunu yapıncaya kadar aşı sertifikaları akıllı telefonunuzda kayıtlı kalacaktır."</string>
 
+    <!--    Green Certificate -->
+    <!-- XTXT: Request GC title for privacy card -->
+    <string name="request_green_certificate_privacy_title" translatable="false">Veri gizliliği ve veri güvenliği</string>
+    <!-- XTXT: Request GC bullet point 1 for privacy card -->
+    <string name="request_green_certificate_privacy_section_1" translatable="false">Dijital COVID-19 test sertifikasının talep etmek ve kullanmak isteğe bağlıdır. Yapılan testin negatif çıktığına ilişkin sertifikanın kanıtı, başka yollarla da sağlanabilir.</string>
+    <!-- XTXT: Request GC bullet point 2 for privacy card -->
+    <string name="request_green_certificate_privacy_section_2" translatable="false">Verileriniz, test sertifikanızı oluşturmak üzere bir kez şifrelenir ve RKI’ye aktarılır. RKI, bu verilerin geçerliliğini onaylamak için onları elektronik olarak imzalar. Veriler RKI’de saklanmaz.</string>
+    <!-- XTXT: Request GC extra bullet point PCR test  for privacy card -->
+    <string name="request_green_certificate_privacy_pcr_extra_section" translatable="false">Hiç kimsenin QR kodunuz üzerinden test sonucunuza erişememesi için test sonucunuz, doğum tarihinizle korunur. Doğum tarihiniz şifrelenir ve test sonucunu çağırmak üzere ilgili laboratuvara gönderilir.</string>
+    <!-- XTXT: Request GC bullet point 3 for privacy card -->
+    <string name="request_green_certificate_privacy_section_3" translatable="false">COVID-19 test sertifikası, yaptırdığınız Korona testinize ilişkin verileri içerir. Yasal açıdan zorunlu durumlarda ilgili test sonucunu kanıtlamak için, Uygulamadaki QR kodu göstermeniz yeterli olacaktır. Söz konusu verilerin okunmasını istemiyorsanız, test sertifikasını hiç kimseye göstermeyin.</string>
+    <!-- XTXT: Request GC bullet point 4 for privacy card -->
+    <string name="request_green_certificate_privacy_section_4" translatable="false">Eğer Uygulamada test sertifikasına ilişkin QR kodu gösterirseniz ve bu bir kontrol uygulamasıyla taranırsa, diğer kişiler sizin test sertifikanızı öğrenebilir. Kontrol işlemi sırasında adınız ve doğum tarihiniz de resmi kontrol uygulamasında görüntülenecektir.</string>
+    <!-- XTXT: Request GC bullet point 5 for privacy card -->
+    <string name="request_green_certificate_privacy_section_5" translatable="false">Test sertifikasını istediğiniz zaman Uygulamadan kaldırma seçeneğiniz vardır. Bunu yapıncaya kadar test sertifikaları akıllı telefonunuzda kayıtlı kalacaktır.</string>
+    <!-- XTXT: Request GC legal information section for privacy card -->
+    <string name="request_green_certificate_privacy_legal_information" translatable="false">Veri işleme ile ilgili ayrıntılı bilgileri Veri Gizliliği Beyanında bulabilirsiniz</string>
 </resources>

Corona-Warn-App/src/main/res/values/green_certificate_strings.xml

 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" tools:ignore="MissingTranslation">
-
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
+    <!-- XTXT: Request green certificate title -->
+    <string name="request_green_certificate_title">COVID-19-Testzertifikat</string>
+    <!-- XTXT: Request green certificate subtitle -->
+    <string name="request_green_certificate_subtitle">Sie können über die App ein offizielles digitales Testzertifikat anfordern, das anschließend in der App hinzugefügt wird.</string>
+    <!-- XTXT: Request green certificate body section 1 -->
+    <string name="request_green_certificate_body_1">Das Testzertifikat wird nur bei einem negativen Testergebnis ausgestellt.</string>
+    <!-- XTXT: Request green certificate body section 2 -->
+    <string name="request_green_certificate_body_2">Das Testzertifikat gilt innerhalb der EU als gültiger Nachweis eines negativen Testergebnisses (z.B. für Reisen).</string>
+    <!-- XTXT: Request green certificate body section 3 -->
+    <string name="request_green_certificate_body_3">Das Testzertifikat enthält Daten, die der Prüf-App die Validierung Ihres Zertifikats erlauben.</string>
+    <!-- XBUT: Request green certificate agree button -->
+    <string name="request_green_certificate_agree_button">Testzertifikat Anfordern</string>
+    <!-- XBUT: Request green certificate disagree button -->
+    <string name="request_green_certificate_disagree_button">Nein Danke</string>
+    <!-- XTXT: Request green certificate birth date description -->
+    <string name="request_green_certificate_birthdate_description">Zur Sicherheit wird Ihr Testergebnis mit Ihrem Geburtsdatum geschützt. Das Testergebnis kann nur bei korrekt angegebenem Geburtstdatum zugestellt werden.</string>
+    <!-- XTXT: Request green certificate birth date hint -->
+    <string name="request_green_certificate_birthdate_hint">Geburtsdatum</string>
+    <!-- XTXT: Request green certificate exit dialog title -->
+    <string name="request_gc_dialog_title">Registrierung abbrechen</string>
+    <!-- XTXT: Request green certificate exit dialog message -->
+    <string name="request_gc_dialog_message">Wenn Sie die Test-Registrierung abbrechen, können Sie Ihr Testergebnis nicht in der App erhalten.</string>
+    <!-- XBUT: Request green certificate exit dialog negative button -->
+    <string name="request_gc_dialog_positive_button">OK</string>
+    <!-- XBUT: Request green certificate exit dialog negative button -->
+    <string name="request_gc_dialog_negative_button">Abbrechen</string>
 </resources>
\ No newline at end of file

Corona-Warn-App/src/main/res/values/legal_strings.xml

@@ -179,4 +179,21 @@
     <!-- XTXT: First bulletpoint title for privacy card -->
     <string name="vaccination_privacy_card_fourth_bulletpoint_title_text" translatable="false">"You have the possibility to delete vaccination certificates in the app at any time. Until then, the vaccination certificates will be stored on your smartphone."</string>
 
+    <!--    Green Certificate -->
+    <!-- XTXT: Request GC title for privacy card -->
+    <string name="request_green_certificate_privacy_title" translatable="false">Data protection and data security</string>
+    <!-- XTXT: Request GC bullet point 1 for privacy card -->
+    <string name="request_green_certificate_privacy_section_1" translatable="false">Requesting and using a digital COVID-19 test certificate is voluntary. There are other ways to prove that you have a negative test certificate.</string>
+    <!-- XTXT: Request GC bullet point 2 for privacy card -->
+    <string name="request_green_certificate_privacy_section_2" translatable="false">To create your test certificate, data is transmitted once in encrypted form to the RKI. The RKI signs this data electronically to confirm its validity. The RKI will not store the data.</string>
+    <!-- XTXT: Request GC extra bullet point PCR test  for privacy card -->
+    <string name="request_green_certificate_privacy_pcr_extra_section" translatable="false">To ensure that no one with your QR code can retrieve your test result, it is protected with your date of birth. Your date of birth is transmitted in encrypted form to the laboratory in order to retrieve the test result.</string>
+    <!-- XTXT: Request GC bullet point 3 for privacy card -->
+    <string name="request_green_certificate_privacy_section_3" translatable="false">The COVID-19 test certificate contains the data about your coronavirus test. In cases where you are required by law to prove a negative test result, it is sufficient to show the QR code in the app. Do not provide the test certificate to anyone if you do not want the data to be read.</string>
+    <!-- XTXT: Request GC bullet point 4 for privacy card -->
+    <string name="request_green_certificate_privacy_section_4" translatable="false">If you present the QR code of the test certificate in the app and it is scanned using the verification app, others will be able to find out your test result. During verification, the official verification app will also display your name and date of birth.</string>
+    <!-- XTXT: Request GC bullet point 5 for privacy card -->
+    <string name="request_green_certificate_privacy_section_5" translatable="false">You have the possibility to delete test certificates in the app at any time. Until then, the test certificates will be stored on your smartphone.</string>
+    <!-- XTXT: Request GC legal information section for privacy card -->
+    <string name="request_green_certificate_privacy_legal_information" translatable="false">Detailed information about this data processing is available in the privacy notice</string>
 </resources>

Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/submission/qrcode/scan/SubmissionQRCodeScanViewModelTest.kt

@@ -56,13 +56,13 @@ class SubmissionQRCodeScanViewModelTest : BaseTest() {
     }
 
     private fun createViewModel() = SubmissionQRCodeScanViewModel(
-        TestDispatcherProvider(),
-        cameraSettings,
-        qrCodeRegistrationStateProcessor,
         isConsentGiven = true,
-        submissionRepository,
-        qrCodeValidator,
-        analyticsKeySubmissionCollector
+        dispatcherProvider = TestDispatcherProvider(),
+        cameraSettings = cameraSettings,
+        qrCodeRegistrationStateProcessor = qrCodeRegistrationStateProcessor,
+        submissionRepository = submissionRepository,
+        qrCodeValidator = qrCodeValidator,
+        analyticsKeySubmissionCollector = analyticsKeySubmissionCollector
     )
 
     @Test