Use close button on warn others screen (EXPOSUREAPP-4257) (#2040)

* replace with close button

* use toolbar

Co-authored-by: Matthias Urhahn <matthias.urhahn@sap.com>

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/warnothers/SubmissionResultPositiveOtherWarningNoConsentFragment.kt

@@ -41,7 +41,7 @@ class SubmissionResultPositiveOtherWarningNoConsentFragment :
         binding.submissionPositiveOtherWarningNoConsentButtonNext.setOnClickListener {
             viewModel.onConsentButtonClicked()
         }
-        binding.submissionPositiveOtherWarningHeader.headerButtonBack.buttonIcon.setOnClickListener {
+        binding.toolbar.setNavigationOnClickListener {
             viewModel.onBackPressed()
         }
 

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

@@ -18,27 +18,24 @@
         android:fillViewport="true"
         tools:context=".ui.submission.warnothers.SubmissionResultPositiveOtherWarningNoConsentFragment">
 
-        <include
-            android:id="@+id/submission_positive_other_warning_header"
-            layout="@layout/include_header"
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
             android:layout_width="@dimen/match_constraint"
             android:layout_height="wrap_content"
-            app:icon="@{@drawable/ic_back}"
+            style="@style/CWAToolbar.Close"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:title="@{@string/submission_positive_other_warning_title}" />
+            app:title="@string/submission_positive_other_warning_title" />
 
         <ScrollView
             android:id="@+id/content_scrollcontainer"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            app:layout_constraintBottom_toTopOf="@+id/guideline_action"
+            app:layout_constraintBottom_toTopOf="@id/guideline_action"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/submission_positive_other_warning_header"
-            app:layout_constraintVertical_bias="0.0">
+            app:layout_constraintTop_toBottomOf="@id/toolbar">
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
@@ -47,10 +44,10 @@
 
                 <ImageView
                     android:id="@+id/submission_positive_other_warning_hero_illustration"
-                    bind:cwaContentDescription="@{@string/submission_positive_other_illustration_description}"
                     android:layout_width="@dimen/match_constraint"
                     android:layout_height="wrap_content"
                     android:src="@drawable/ic_submission_illustration_other_warning"
+                    android:contentDescription="@string/submission_positive_other_illustration_description"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
@@ -62,12 +59,11 @@
                     android:layout_width="@dimen/match_constraint"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/spacing_normal"
-                    android:accessibilityHeading="true"
                     android:focusable="true"
                     android:text="@string/submission_positive_other_warning_headline"
                     app:layout_constraintEnd_toEndOf="@id/guideline_end"
                     app:layout_constraintStart_toStartOf="@id/guideline_start"
-                    app:layout_constraintTop_toBottomOf="@+id/submission_positive_other_warning_hero_illustration" />
+                    app:layout_constraintTop_toBottomOf="@id/submission_positive_other_warning_hero_illustration" />
 
                 <TextView
                     android:id="@+id/submission_positive_other_warning_text_first_part"
@@ -79,7 +75,7 @@
                     android:text="@string/submission_positive_other_warning_no_consent_body_first_part"
                     app:layout_constraintEnd_toEndOf="@id/guideline_end"
                     app:layout_constraintStart_toStartOf="@id/guideline_start"
-                    app:layout_constraintTop_toBottomOf="@+id/submission_positive_other_warning_headline" />
+                    app:layout_constraintTop_toBottomOf="@id/submission_positive_other_warning_headline" />
 
                 <TextView
                     android:id="@+id/submission_positive_other_warning_text_second_part"
@@ -91,7 +87,7 @@
                     android:text="@string/submission_positive_other_warning_no_consent_body_second_part"
                     app:layout_constraintEnd_toEndOf="@id/guideline_end"
                     app:layout_constraintStart_toStartOf="@id/guideline_start"
-                    app:layout_constraintTop_toBottomOf="@+id/submission_positive_other_warning_text_first_part" />
+                    app:layout_constraintTop_toBottomOf="@id/submission_positive_other_warning_text_first_part" />
 
 
                 <de.rki.coronawarnapp.ui.view.CountryListView
@@ -100,8 +96,8 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/spacing_normal"
                     app:layout_constraintEnd_toEndOf="@+id/guideline_end"
-                    app:layout_constraintStart_toStartOf="@+id/guideline_start"
-                    app:layout_constraintTop_toBottomOf="@+id/submission_positive_other_warning_text_second_part" />
+                    app:layout_constraintStart_toStartOf="@id/guideline_start"
+                    app:layout_constraintTop_toBottomOf="@id/submission_positive_other_warning_text_second_part" />
 
                 <include
                     android:id="@+id/submission_positive_other_privacy"
@@ -109,9 +105,9 @@
                     android:layout_width="@dimen/match_constraint"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/spacing_normal"
-                    app:layout_constraintEnd_toStartOf="@+id/guideline_card_end"
-                    app:layout_constraintStart_toStartOf="@+id/guideline_card_start"
-                    app:layout_constraintTop_toBottomOf="@+id/countryList" />
+                    app:layout_constraintEnd_toStartOf="@id/guideline_card_end"
+                    app:layout_constraintStart_toStartOf="@id/guideline_card_start"
+                    app:layout_constraintTop_toBottomOf="@id/countryList" />
 
                 <include
                     android:id="@+id/submission_no_consent_main_first_point"