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 88232e0e144f5b99f75280df3ecd128b7d961c1e..921e40c9867782aa7dfdec75bb59b4dd94ea3b0c 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,19 +18,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
- <!-- <include
- android:id="@+id/submission_test_result_consent_given_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}" /> -->
-
<include
- android:id="@+id/submission_test_result_consent_header"
+ android:id="@+id/submission_test_result_consent_given_header"
layout="@layout/include_header"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
@@ -38,7 +27,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
- app:title="@{@string/submission_test_result_headline}" />
+ app:title="@{@string/submission_test_result_consent_given_heading}" />
<de.rki.coronawarnapp.ui.view.TestResultSection
android:id="@+id/submission_test_result_section"
@@ -49,7 +38,31 @@
android:importantForAccessibility="yes"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/submission_test_result_consent_header" />
+ app:layout_constraintTop_toBottomOf="@+id/submission_test_result_consent_given_header" />
+
+ <TextView
+ android:id="@+id/submission_test_result_consent_given_subtitle"
+ style="@style/headline6"
+ android:accessibilityHeading="true"
+ android:layout_width="@dimen/match_constraint"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/spacing_medium"
+ android:text="@string/submission_test_result_consent_given_subtitle"
+ app:layout_constraintEnd_toEndOf="@+id/guideline_end"
+ app:layout_constraintStart_toStartOf="@+id/guideline_start"
+ app:layout_constraintTop_toBottomOf="@+id/submission_test_result_section" />
+
+ <TextView
+ android:id="@+id/submission_test_result_consent_given_body"
+ style="@style/body1"
+ android:accessibilityHeading="true"
+ android:layout_width="@dimen/match_constraint"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/spacing_medium"
+ android:text="@string/submission_test_result_consent_given_body"
+ app:layout_constraintEnd_toEndOf="@+id/guideline_end"
+ app:layout_constraintStart_toStartOf="@+id/guideline_start"
+ app:layout_constraintTop_toBottomOf="@+id/submission_test_result_consent_given_subtitle" />
<ProgressBar
android:id="@+id/submission_test_result_spinner"
@@ -62,21 +75,6 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
- <include
- android:id="@+id/submission_test_result_consent_given_content"
- layout="@layout/include_submission_test_result"
- android:accessibilityLiveRegion="assertive"
- android:importantForAccessibility="yes"
- android:layout_width="@dimen/match_constraint"
- android:layout_height="@dimen/match_constraint"
- android:layout_marginBottom="@dimen/button_padding_top_bottom"
- android:visibility="@{FormatterSubmissionHelper.formatTestResultVisible(uiState.deviceUiState)}"
- app:layout_constraintBottom_toTopOf="@+id/include_submission_test_result_consent_given_buttons"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/submission_test_result_consent_given_header"
- app:uiState="@{uiState}" />
-
<androidx.constraintlayout.widget.Barrier
android:id="@+id/include_submission_test_result_consent_given_buttons"
android:layout_width="wrap_content"
@@ -91,7 +89,6 @@
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:text="@string/submission_test_result_positive_continue_button_with_symptoms"
- android:visibility="@{FormatterSubmissionHelper.formatTestResultPositiveStepsVisible(uiState.deviceUiState)}"
app:layout_constraintBottom_toTopOf="@+id/submission_test_result_button__consent_given_continue_without_symptoms"
app:layout_constraintEnd_toStartOf="@+id/guideline_end"
app:layout_constraintStart_toStartOf="@id/guideline_start"
@@ -99,11 +96,10 @@
<Button
android:id="@+id/submission_test_result_button_consent_given_continue_without_symptoms"
- style="@style/buttonLight"
+ style="@style/buttonPrimary"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
- android:text="@string/submission_test_result_positive_continue_button_wo_symptoms"
- android:visibility="@{FormatterSubmissionHelper.formatTestResultPositiveStepsVisible(uiState.deviceUiState)}"
+ android:text="@string/submission_test_result_consent_given_breakup_button"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/guideline_end"
app:layout_constraintStart_toStartOf="@id/guideline_start"
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 80b80ed8c9a5d7091e405b4d8464737fc7bbf7b0..2d988dabd6b5f724913c9b89781fe2a041f4fa8c 100644
--- a/Corona-Warn-App/src/main/res/values-de/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-de/strings.xml
@@ -920,6 +920,14 @@
<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>
+ <!-- XHED: Subtitle text for test result card with consent given -->
+ <string name="submission_test_result_consent_given_subtitle">"Vielen Dank, dass Sie mithelfen, die Verbreitung von Corona zu bekämpfen."</string>
+ <!-- YTXT: body text for test result card with consent given -->
+ <string name="submission_test_result_consent_given_body">"<b>Ihre Mitmenschen werden jetzt gewarnt.</b> <br/><br/>Bitte helfen Sie nun, die Genauigkeit der Warnungen zu verbessern. Geben Sie hierfür im nächsten Schritt an, wann Sie erstmals Symptome hatten. Sie können diesen Schritt jederzeit abbrechen."</string>
+ <!-- XBUT: button text for the 'break up' button option on test result consent given page -->
+ <string name="submission_test_result_consent_given_breakup_button">"Beenden"</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 d67a93d7ba06954c29b7ad834d6ce5e9c19b53c3..7d4ea7632e253da112394f4f41220f28d91c1da6 100644
--- a/Corona-Warn-App/src/main/res/values/strings.xml
+++ b/Corona-Warn-App/src/main/res/values/strings.xml
@@ -924,6 +924,11 @@
<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>
+ <!-- YTXT: Subtitle text for test result card with consent given -->
+ <string name="submission_test_result_consent_given_subtitle">""</string>
+ <!-- YTXT: body text for test result card with consent given -->
+ <string name="submission_test_result_consent_given_body">""</string>
+
<!-- Submission Tan -->
<!-- XHED: Page title for TAN submission pge -->