From 1e9164ce695b6548a7fe558624e3f27d42df319e Mon Sep 17 00:00:00 2001
From: Alex Paulescu <alex.paulescu@gmail.com>
Date: Tue, 3 Jan 2023 17:11:57 +0200
Subject: [PATCH] Srs type selection missing text (EXPOSUREAPP-14527) (#5788)

* Add subtitle text to srs type selection fragment.

* Ignore missing translation.

* Fix scrolling

Co-authored-by: Mohamed <mohamed.metwalli@sap.com>
---
 .../layout/fragment_srs_type_selection.xml    | 79 +++++++++++++------
 .../res/values-de/srs_submission_strings.xml  |  2 +
 .../res/values/srs_submission_strings.xml     |  5 +-
 3 files changed, 62 insertions(+), 24 deletions(-)

diff --git a/Corona-Warn-App/src/main/res/layout/fragment_srs_type_selection.xml b/Corona-Warn-App/src/main/res/layout/fragment_srs_type_selection.xml
index 57c556ed5a2..617cad6be32 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_srs_type_selection.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_srs_type_selection.xml
@@ -17,32 +17,65 @@
         app:layout_constraintTop_toTopOf="parent"
         app:title="@string/srs_type_selection_header" />
 
-    <TextView
-        android:id="@+id/srs_type_selection_introduction"
-        style="@style/subtitleMedium"
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/srs_type_selection_scrollview"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/spacing_normal"
-        android:layout_marginTop="@dimen/spacing_small"
-        android:layout_marginEnd="@dimen/spacing_normal"
-        android:focusable="true"
-        android:text="@string/srs_type_selection_introduction_text"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/toolbar" />
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/typeList"
-        android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_marginTop="@dimen/spacing_normal"
-        android:orientation="vertical"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        app:layout_constraintBottom_toTopOf="@+id/type_selection_next_button"
+        app:layout_constraintBottom_toTopOf="@id/type_selection_next_button"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/srs_type_selection_introduction"
-        tools:listitem="@layout/srs_type_selection_adapter_item" />
+        app:layout_constraintTop_toBottomOf="@id/toolbar">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/srs_type_selection_scrollview_constraint"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:id="@+id/srs_type_selection_introduction"
+                style="@style/subtitle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/spacing_normal"
+                android:layout_marginTop="@dimen/spacing_small"
+                android:layout_marginEnd="@dimen/spacing_normal"
+                android:focusable="true"
+                android:text="@string/srs_type_selection_introduction_text"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/srs_stype_selection_subtitle"
+                style="@style/subtitleMedium"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/spacing_normal"
+                android:layout_marginTop="@dimen/spacing_small"
+                android:layout_marginEnd="@dimen/spacing_normal"
+                android:focusable="true"
+                android:text="@string/srs_type_selection_subtitle_text"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/srs_type_selection_introduction" />
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/typeList"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/spacing_small"
+                android:nestedScrollingEnabled="false"
+                android:orientation="vertical"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/srs_stype_selection_subtitle"
+                tools:listitem="@layout/srs_type_selection_adapter_item" />
+
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </androidx.core.widget.NestedScrollView>
 
     <Button
         android:id="@+id/type_selection_next_button"
@@ -55,5 +88,5 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/typeList" />
+        app:layout_constraintTop_toBottomOf="@id/srs_type_selection_scrollview" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/Corona-Warn-App/src/main/res/values-de/srs_submission_strings.xml b/Corona-Warn-App/src/main/res/values-de/srs_submission_strings.xml
index 499bf989d46..794370a1bba 100644
--- a/Corona-Warn-App/src/main/res/values-de/srs_submission_strings.xml
+++ b/Corona-Warn-App/src/main/res/values-de/srs_submission_strings.xml
@@ -61,6 +61,8 @@
     <string name="srs_type_selection_header">"Art des Tests"</string>
     <!-- XTXT: Type selection introduction -->
     <string name="srs_type_selection_introduction_text">Bitte wählen Sie die Art des Tests aus, auf dessen Grundlage Sie warnen.</string>
+    <!-- XTXT: Type selection subtitle -->
+    <string name="srs_type_selection_subtitle_text">Die Angabe der Art des Tests dient nur der statistischen Auswertung. Die Angabe ist freiwillig. Sie wird nicht mit der Warnung oder Ihrer Identität verbunden. Wenn Sie keine Angabe machen wollen, wählen Sie „Keine Angabe“.</string>
     <!-- XTXT: Type selection button rat registered no result text -->
     <string name="srs_rat_registered_no_result_text">Antigen-Schnelltest in der App registriert, aber kein Ergebnis erhalten</string>
     <!-- XTXT: Type selection button rat not registered text -->
diff --git a/Corona-Warn-App/src/main/res/values/srs_submission_strings.xml b/Corona-Warn-App/src/main/res/values/srs_submission_strings.xml
index 361a9cfcd7f..2b611b9fe64 100644
--- a/Corona-Warn-App/src/main/res/values/srs_submission_strings.xml
+++ b/Corona-Warn-App/src/main/res/values/srs_submission_strings.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?><resources>
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
 
     <!-- Home screen register test card -->
     <!-- XHED: Register test card title -->
@@ -60,6 +61,8 @@
     <string name="srs_type_selection_header">"Test Type"</string>
     <!-- XTXT: Type selection introduction -->
     <string name="srs_type_selection_introduction_text">"Please select the type of the test that is the basis for the warning."</string>
+    <!-- XTXT: Type selection subtitle -->
+    <string name="srs_type_selection_subtitle_text">Die Angabe der Art des Tests dient nur der statistischen Auswertung. Die Angabe ist freiwillig. Sie wird nicht mit der Warnung oder Ihrer Identität verbunden. Wenn Sie keine Angabe machen wollen, wählen Sie „Keine Angabe“.</string>
     <!-- XTXT: Type selection button rat registered no result text -->
     <string name="srs_rat_registered_no_result_text">"Rapid antigen test registered in the app, but no result received"</string>
     <!-- XTXT: Type selection button rat not registered text -->