Skip to content
This repository has been archived by the owner on Jun 20, 2023. It is now read-only.

Commit

Permalink
Srs type selection missing text (EXPOSUREAPP-14527) (#5788)
Browse files Browse the repository at this point in the history 
* Add subtitle text to srs type selection fragment.

* Ignore missing translation.

* Fix scrolling

Co-authored-by: Mohamed <[email protected]>
  • Loading branch information
@SamuraiKek @mtwalli
SamuraiKek and mtwalli authored Jan 3, 2023
1 parent d8347f3 commit 1e9164c
Show file tree
Hide file tree
Showing 3 changed files with 62 additions and 24 deletions.
79 changes: 56 additions & 23 deletions Corona-Warn-App/src/main/res/layout/fragment_srs_type_selection.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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>
2 changes: 2 additions & 0 deletions Corona-Warn-App/src/main/res/values-de/srs_submission_strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down
5 changes: 4 additions & 1 deletion Corona-Warn-App/src/main/res/values/srs_submission_strings.xml
View file
Original file line number Diff line number Diff line change
@@ -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 -->
Expand Down Expand Up @@ -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 -->
Expand Down

0 comments on commit 1e9164c

Please sign in to comment.