diff --git a/Corona-Warn-App/src/main/res/layout/fragment_submission_test_result_consent_given.xml b/Corona-Warn-App/src/main/res/layout/fragment_submission_test_result_consent_given.xml index 9586eeacf6d42f64319940fb1333c85718b3dd57..88232e0e144f5b99f75280df3ecd128b7d961c1e 100644 --- a/Corona-Warn-App/src/main/res/layout/fragment_submission_test_result_consent_given.xml +++ b/Corona-Warn-App/src/main/res/layout/fragment_submission_test_result_consent_given.xml @@ -18,7 +18,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <include + <!-- <include android:id="@+id/submission_test_result_consent_given_header" layout="@layout/include_header" android:layout_width="@dimen/match_constraint" @@ -27,8 +27,30 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" + app:title="@{@string/submission_test_result_headline}" /> --> + + <include + android:id="@+id/submission_test_result_consent_header" + layout="@layout/include_header" + android:layout_width="@dimen/match_constraint" + android:layout_height="wrap_content" + app:icon="@{@drawable/ic_close}" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" app:title="@{@string/submission_test_result_headline}" /> + <de.rki.coronawarnapp.ui.view.TestResultSection + android:id="@+id/submission_test_result_section" + android:layout_width="@dimen/match_constraint" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/spacing_small" + android:focusable="true" + android:importantForAccessibility="yes" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/submission_test_result_consent_header" /> + <ProgressBar android:id="@+id/submission_test_result_spinner" style="?android:attr/progressBarStyle" diff --git a/Corona-Warn-App/src/main/res/values-de/strings.xml b/Corona-Warn-App/src/main/res/values-de/strings.xml index 1477754f6ade6f3a392076a97165ad3b5d973cc7..80b80ed8c9a5d7091e405b4d8464737fc7bbf7b0 100644 --- a/Corona-Warn-App/src/main/res/values-de/strings.xml +++ b/Corona-Warn-App/src/main/res/values-de/strings.xml @@ -918,6 +918,8 @@ <string name="submission_test_result_card_positive_title">"SARS-CoV-2 positiv"</string> <!-- YTXT: Body text for test result card positive --> <string name="submission_test_result_card_positive_body">"Das Virus SARS-CoV-2 wurde bei Ihnen nachgewiesen."</string> + <!-- XHED: Page headline for test result with consent given --> + <string name="submission_test_result_consent_given_heading">"Ihr Testergebnis"</string> <!-- Submission Tan --> <!-- XHED: Page title for TAN submission pge --> diff --git a/Corona-Warn-App/src/main/res/values/strings.xml b/Corona-Warn-App/src/main/res/values/strings.xml index c880b947c4ccf4885aa592ad84080de14366960e..d67a93d7ba06954c29b7ad834d6ce5e9c19b53c3 100644 --- a/Corona-Warn-App/src/main/res/values/strings.xml +++ b/Corona-Warn-App/src/main/res/values/strings.xml @@ -922,6 +922,8 @@ <string name="submission_test_result_card_positive_title">"SARS-CoV-2 positive"</string> <!-- YTXT: Body text for test result card positive --> <string name="submission_test_result_card_positive_body">"You have been diagnosed with the SARS-CoV-2 virus."</string> + <!-- XHED: Page headline for test result with consent given --> + <string name="submission_test_result_consent_given_heading">""</string> <!-- Submission Tan --> <!-- XHED: Page title for TAN submission pge -->