Skip to content
Snippets Groups Projects
Unverified Commit 20cf175b authored by Mohamed Metwalli's avatar Mohamed Metwalli Committed by GitHub
Browse files

Adapt Statistics Info screen (EXPOSUREAPP-7432) (#3472) 


* Adapt new text and sections

* Hide local statistics sections

Co-authored-by: default avatarharambasicluka <64483219+harambasicluka@users.noreply.github.com>
parent 36462b98
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/statistics/ui/StatisticsExplanationFragment.kt
+ 2
− 2
View file @ 20cf175b
...@@ -24,8 +24,8 @@ class StatisticsExplanationFragment : Fragment(R.layout.fragment_statistics_expl ...@@ -24,8 +24,8 @@ class StatisticsExplanationFragment : Fragment(R.layout.fragment_statistics_expl
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState) super.onViewCreated(view, savedInstanceState)
setButtonOnClickListener() setButtonOnClickListener()
binding.statisticsExplanationSevenDayRValueText.setUrl( binding.statisticsFaqText.setUrl(
R.string.statistics_explanation_seven_day_r_value_text, R.string.statistics_faq_text,
R.string.statistics_explanation_seven_day_r_link_label, R.string.statistics_explanation_seven_day_r_link_label,
R.string.statistics_explanation_faq_url R.string.statistics_explanation_faq_url
) )
......
Corona-Warn-App/src/main/res/layout/fragment_statistics_explanation.xml
+ 116
− 15
View file @ 20cf175b
...@@ -93,8 +93,8 @@ ...@@ -93,8 +93,8 @@
<ScrollView <ScrollView
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:paddingBottom="@dimen/spacing_normal"
android:clipToPadding="false" android:clipToPadding="false"
android:paddingBottom="@dimen/spacing_normal"
android:scrollbarStyle="outsideOverlay" android:scrollbarStyle="outsideOverlay"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<ImageView <ImageView
android:id="@+id/interoperability_illustration" android:id="@+id/interoperability_illustration"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -122,6 +122,52 @@ ...@@ -122,6 +122,52 @@
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_illustration_statistics_explanation" /> app:srcCompat="@drawable/ic_illustration_statistics_explanation" />
<TextView
style="@style/headline5"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/guideline_start"
android:layout_marginTop="36dp"
android:layout_marginEnd="@dimen/guideline_end"
android:contentDescription="@string/statistics_explanation_local_seven_day_incidence_title"
android:focusable="true"
android:text="@string/statistics_explanation_local_seven_day_incidence_title"
android:visibility="gone" />
<TextView
style="@style/body2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/guideline_start"
android:layout_marginTop="8dp"
android:layout_marginEnd="@dimen/guideline_end"
android:contentDescription="@string/statistics_explanation_local_seven_day_incidence_text"
android:focusable="true"
android:text="@string/statistics_explanation_local_seven_day_incidence_text"
android:visibility="gone" />
<TextView
style="@style/headline5"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/guideline_start"
android:layout_marginTop="36dp"
android:layout_marginEnd="@dimen/guideline_end"
android:contentDescription="@string/statistics_explanation_seven_day_incidence_title"
android:focusable="true"
android:text="@string/statistics_explanation_seven_day_incidence_title" />
<TextView
style="@style/body2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/guideline_start"
android:layout_marginTop="8dp"
android:layout_marginEnd="@dimen/guideline_end"
android:contentDescription="@string/statistics_explanation_seven_day_incidence_text"
android:focusable="true"
android:text="@string/statistics_explanation_seven_day_incidence_text" />
<TextView <TextView
style="@style/headline5" style="@style/headline5"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -144,6 +190,28 @@ ...@@ -144,6 +190,28 @@
android:focusable="true" android:focusable="true"
android:text="@string/statistics_explanation_confirmed_new_infection_text" /> android:text="@string/statistics_explanation_confirmed_new_infection_text" />
<TextView
style="@style/headline5"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/guideline_start"
android:layout_marginTop="36dp"
android:layout_marginEnd="@dimen/guideline_end"
android:contentDescription="@string/statistics_explanation_seven_day_r_value_title"
android:focusable="true"
android:text="@string/statistics_explanation_seven_day_r_value_title" />
<TextView
style="@style/body2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/guideline_start"
android:layout_marginTop="8dp"
android:layout_marginEnd="@dimen/guideline_end"
android:contentDescription="@string/statistics_explanation_seven_day_r_value_text"
android:focusable="true"
android:text="@string/statistics_explanation_seven_day_r_value_text" />
<TextView <TextView
style="@style/headline5" style="@style/headline5"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -173,9 +241,9 @@ ...@@ -173,9 +241,9 @@
android:layout_marginStart="@dimen/guideline_start" android:layout_marginStart="@dimen/guideline_start"
android:layout_marginTop="36dp" android:layout_marginTop="36dp"
android:layout_marginEnd="@dimen/guideline_end" android:layout_marginEnd="@dimen/guideline_end"
android:contentDescription="@string/statistics_explanation_seven_day_incidence_title" android:contentDescription="@string/statistics_people_vaccinated_at_least_once_title"
android:focusable="true" android:focusable="true"
android:text="@string/statistics_explanation_seven_day_incidence_title" /> android:text="@string/statistics_people_vaccinated_at_least_once_title" />
<TextView <TextView
style="@style/body2" style="@style/body2"
...@@ -184,9 +252,9 @@ ...@@ -184,9 +252,9 @@
android:layout_marginStart="@dimen/guideline_start" android:layout_marginStart="@dimen/guideline_start"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginEnd="@dimen/guideline_end" android:layout_marginEnd="@dimen/guideline_end"
android:contentDescription="@string/statistics_explanation_seven_day_incidence_text" android:contentDescription="@string/statistics_people_vaccinated_at_least_once_text"
android:focusable="true" android:focusable="true"
android:text="@string/statistics_explanation_seven_day_incidence_text" /> android:text="@string/statistics_people_vaccinated_at_least_once_text" />
<TextView <TextView
style="@style/headline5" style="@style/headline5"
...@@ -195,26 +263,59 @@ ...@@ -195,26 +263,59 @@
android:layout_marginStart="@dimen/guideline_start" android:layout_marginStart="@dimen/guideline_start"
android:layout_marginTop="36dp" android:layout_marginTop="36dp"
android:layout_marginEnd="@dimen/guideline_end" android:layout_marginEnd="@dimen/guideline_end"
android:contentDescription="@string/statistics_explanation_seven_day_r_value_title" android:contentDescription="@string/statistics_fully_vaccinated_people_title"
android:focusable="true" android:focusable="true"
android:text="@string/statistics_explanation_seven_day_r_value_title" /> android:text="@string/statistics_fully_vaccinated_people_title" />
<TextView <TextView
android:id="@+id/statistics_explanation_seven_day_r_value_text"
style="@style/body2" style="@style/body2"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/guideline_start" android:layout_marginStart="@dimen/guideline_start"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginEnd="@dimen/guideline_end" android:layout_marginEnd="@dimen/guideline_end"
android:contentDescription="@string/statistics_explanation_seven_day_r_value_text" android:contentDescription="@string/statistics_fully_vaccinated_people_text"
android:focusable="true" android:focusable="true"
android:text="@string/statistics_explanation_seven_day_r_value_text" /> android:text="@string/statistics_fully_vaccinated_people_text" />
<TextView
style="@style/headline5"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/guideline_start"
android:layout_marginTop="36dp"
android:layout_marginEnd="@dimen/guideline_end"
android:contentDescription="@string/statistics_number_of_vaccine_doses_title"
android:focusable="true"
android:text="@string/statistics_number_of_vaccine_doses_title" />
<TextView
style="@style/body2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/guideline_start"
android:layout_marginTop="8dp"
android:layout_marginEnd="@dimen/guideline_end"
android:contentDescription="@string/statistics_number_of_vaccine_doses_text"
android:focusable="true"
android:text="@string/statistics_number_of_vaccine_doses_text" />
<TextView
android:id="@+id/statistics_faq_text"
style="@style/body2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/guideline_start"
android:layout_marginTop="36dp"
android:layout_marginEnd="@dimen/guideline_end"
android:contentDescription="@string/statistics_faq_text"
android:focusable="true"
android:text="@string/statistics_faq_text" />
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/card_divider" android:layout_height="@dimen/card_divider"
android:layout_marginTop="43dp" android:layout_marginTop="24dp"
android:background="@color/dividerColor" /> android:background="@color/dividerColor" />
<TextView <TextView
...@@ -346,7 +447,7 @@ ...@@ -346,7 +447,7 @@
android:layout_marginTop="25dp" android:layout_marginTop="25dp"
android:layout_marginEnd="@dimen/guideline_end"> android:layout_marginEnd="@dimen/guideline_end">
<ImageView <ImageView
android:id="@+id/statistics_explanation_trend_increasing_arrow" android:id="@+id/statistics_explanation_trend_increasing_arrow"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -371,7 +472,7 @@ ...@@ -371,7 +472,7 @@
app:layout_constraintStart_toEndOf="@+id/statistics_explanation_trend_increasing_arrow" app:layout_constraintStart_toEndOf="@+id/statistics_explanation_trend_increasing_arrow"
app:layout_constraintTop_toTopOf="@+id/statistics_explanation_trend_increasing_arrow" /> app:layout_constraintTop_toTopOf="@+id/statistics_explanation_trend_increasing_arrow" />
<ImageView <ImageView
android:id="@+id/statistics_explanation_trend_decreasing_arrow" android:id="@+id/statistics_explanation_trend_decreasing_arrow"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -397,7 +498,7 @@ ...@@ -397,7 +498,7 @@
app:layout_constraintStart_toEndOf="@+id/statistics_explanation_trend_decreasing_arrow" app:layout_constraintStart_toEndOf="@+id/statistics_explanation_trend_decreasing_arrow"
app:layout_constraintTop_toTopOf="@+id/statistics_explanation_trend_decreasing_arrow" /> app:layout_constraintTop_toTopOf="@+id/statistics_explanation_trend_decreasing_arrow" />
<ImageView <ImageView
android:id="@+id/statistics_explanation_trend_stable_arrow" android:id="@+id/statistics_explanation_trend_stable_arrow"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
......
Corona-Warn-App/src/main/res/values-de/strings.xml
+ 22
− 4
View file @ 20cf175b
...@@ -315,7 +315,7 @@ ...@@ -315,7 +315,7 @@
<string name="risk_details_information_body_period_logged_assessment_under_14_days">"Die Corona-Warn-App ist seit %s Tagen installiert. Das Infektionsrisiko wird für Zeiträume berechnet, in denen die Risiko-Ermittlung aktiv ist. Wenn Sie andere Personen getroffen haben und die Risiko-Ermittlung aktiv war, wird Ihr Infektions-Risiko berechnet."</string> <string name="risk_details_information_body_period_logged_assessment_under_14_days">"Die Corona-Warn-App ist seit %s Tagen installiert. Das Infektionsrisiko wird für Zeiträume berechnet, in denen die Risiko-Ermittlung aktiv ist. Wenn Sie andere Personen getroffen haben und die Risiko-Ermittlung aktiv war, wird Ihr Infektions-Risiko berechnet."</string>
<!-- XTXT: risk details - infection period logged information body, over 14 days --> <!-- XTXT: risk details - infection period logged information body, over 14 days -->
<string name="risk_details_information_body_period_logged_assessment_over_14_days">"Wenn die Risiko-Ermittlung zu Zeiten, in denen Sie andere Personen getroffen haben, aktiv war, kann die Berechnung des Infektionsrisikos für diesen Zeitraum erfolgen."</string> <string name="risk_details_information_body_period_logged_assessment_over_14_days">"Wenn die Risiko-Ermittlung zu Zeiten, in denen Sie andere Personen getroffen haben, aktiv war, kann die Berechnung des Infektionsrisikos für diesen Zeitraum erfolgen."</string>
<!-- XHED: risk details - infection period logged information body, below behaviors --> <!-- XTXT: risk details - infection period logged information body, under 14 days --> <!-- XHED: risk details - infection period logged information body, below behaviors --> <!-- XTXT: risk details - infection period logged information body, under 14 days -->
<string name="risk_details_information_body_period_logged_assessment">"Ältere Tage werden automatisch gelöscht, da sie aus Sicht des Infektionsschutzes nicht mehr relevant sind."</string> <string name="risk_details_information_body_period_logged_assessment">"Ältere Tage werden automatisch gelöscht, da sie aus Sicht des Infektionsschutzes nicht mehr relevant sind."</string>
<!-- XTXT: risk details - infection period days logged/14 --> <!-- XTXT: risk details - infection period days logged/14 -->
<string name="risk_details_information_active_tracing_days_circle_progress">"%s/14"</string> <string name="risk_details_information_active_tracing_days_circle_progress">"%s/14"</string>
...@@ -1547,7 +1547,7 @@ ...@@ -1547,7 +1547,7 @@
<!-- XHED: Explanation screen title --> <!-- XHED: Explanation screen title -->
<string name="statistics_explanation_title">"Kennzahlen"</string> <string name="statistics_explanation_title">"Kennzahlen"</string>
<!-- XHED: Explanation screen subtitle --> <!-- XHED: Explanation screen subtitle -->
<string name="statistics_explanation_subtitle">"Erklärung der bundesweiten Statistiken"</string> <string name="statistics_explanation_subtitle">"Erklärung der Statistiken"</string>
<!-- XHED: Explanation screen confirmed new infections title --> <!-- XHED: Explanation screen confirmed new infections title -->
<string name="statistics_explanation_confirmed_new_infection_title">"Bestätigte Neuinfektionen"</string> <string name="statistics_explanation_confirmed_new_infection_title">"Bestätigte Neuinfektionen"</string>
<!-- XTXT: Explanation screen confirmed new infections text --> <!-- XTXT: Explanation screen confirmed new infections text -->
...@@ -1555,7 +1555,7 @@ ...@@ -1555,7 +1555,7 @@
<!-- XHED: Explanation screen warned persons title --> <!-- XHED: Explanation screen warned persons title -->
<string name="statistics_explanation_warned_persons_title">"Warnende Personen"</string> <string name="statistics_explanation_warned_persons_title">"Warnende Personen"</string>
<!-- XTXT: Explanation screen warned persons text --> <!-- XTXT: Explanation screen warned persons text -->
<string name="statistics_explanation_warned_persons_text">"Anzahl der Corona-positiv getesteten Personen, die mithilfe der App ihre Mitmenschen gewarnt haben"</string> <string name="statistics_explanation_warned_persons_text">"Anzahl der über einen PCR-Test Corona-positiv getesteten Personen, die mithilfe der App ihre Mitmenschen gewarnt haben."</string>
<!-- XHED: Explanation screen seven day incidence title --> <!-- XHED: Explanation screen seven day incidence title -->
<string name="statistics_explanation_seven_day_incidence_title">"7-Tage-Inzidenz"</string> <string name="statistics_explanation_seven_day_incidence_title">"7-Tage-Inzidenz"</string>
<!-- XTXT: Explanation screen seven day incidence text --> <!-- XTXT: Explanation screen seven day incidence text -->
...@@ -1563,7 +1563,7 @@ ...@@ -1563,7 +1563,7 @@
<!-- XHED: Explanation screen seven day r-value title --> <!-- XHED: Explanation screen seven day r-value title -->
<string name="statistics_explanation_seven_day_r_value_title">"7-Tage-R-Wert"</string> <string name="statistics_explanation_seven_day_r_value_title">"7-Tage-R-Wert"</string>
<!-- XTXT: Explanation screen seven day r-value text --> <!-- XTXT: Explanation screen seven day r-value text -->
<string name="statistics_explanation_seven_day_r_value_text">"Die Reproduktionszahl R gibt an, wie viele Personen im Durchschnitt von einer infizierten Person angesteckt wurden. Der aktuelle Wert berücksichtigt Daten bis vor 5 Tagen.\n\nWeitere Informationen finden Sie in den FAQ:\nFAQ zu Statistiken."</string> <string name="statistics_explanation_seven_day_r_value_text">"Die Reproduktionszahl R gibt an, wie viele Personen im Durchschnitt von einer infizierten Person angesteckt wurden. Der aktuelle Wert berücksichtigt Daten bis vor 5 Tagen."</string>
<!-- XTXT: Explanation screen seven day r-value link label - the characters have to match the last part of the text label above --> <!-- XTXT: Explanation screen seven day r-value link label - the characters have to match the last part of the text label above -->
<string name="statistics_explanation_seven_day_r_link_label">"FAQ zu Statistiken"</string> <string name="statistics_explanation_seven_day_r_link_label">"FAQ zu Statistiken"</string>
<!-- XHED: Explanation screen legend title --> <!-- XHED: Explanation screen legend title -->
...@@ -1621,6 +1621,24 @@ ...@@ -1621,6 +1621,24 @@
<!-- Applied Vaccination Dose Rates Statistics Card --> <!-- Applied Vaccination Dose Rates Statistics Card -->
<!-- XHED: Title for applied vaccination dose rates --> <!-- XHED: Title for applied vaccination dose rates -->
<string name="statistics_applied_vaccination_dose_rates_card_title">"Verabreichte Impfdosen"</string> <string name="statistics_applied_vaccination_dose_rates_card_title">"Verabreichte Impfdosen"</string>
<!-- XTXT: Statistics local 7 days title -->
<string name="statistics_explanation_local_seven_day_incidence_title">"Lokale 7-Tage-Inzidenz"</string>
<!-- XTXT: Statistics local 7 days text -->
<string name="statistics_explanation_local_seven_day_incidence_text">"Gesamtzahl der bestätigten Neuinfektionen der letzten 7 Tage (nach Meldedatum) pro 100.000 Einwohner im konfigurierten Kreis oder Bundesland."</string>
<!-- XTXT: Statistics number of vaccine doses title -->
<string name="statistics_number_of_vaccine_doses_title">"Verabreichte Impfdosen"</string>
<!-- XTXT: Statistics number of vaccine doses text -->
<string name="statistics_number_of_vaccine_doses_text">"Anzahl der Impfdosen, die bisher bundesweit verabreicht wurden."</string>
<!-- XTXT: Statistics number of fully vaccinated people title -->
<string name="statistics_fully_vaccinated_people_title">"Vollständig geimpfte Personen"</string>
<!-- XTXT: Statistics number of fully vaccinated people text -->
<string name="statistics_fully_vaccinated_people_text">"Anzahl der an das RKI übermittelten Personen, die die alle notwendigen Impfdosen erhalten haben."</string>
<!-- XTXT: Statistics number of vaccinated people at least title -->
<string name="statistics_people_vaccinated_at_least_once_title">"Mindestens einmal geimpfte Personen"</string>
<!-- XTXT: Statistics number of vaccinated people at least text -->
<string name="statistics_people_vaccinated_at_least_once_text">"Anzahl der an das RKI übermittelten Personen, die die erste Impfdosis erhalten haben."</string>
<!-- XTXT: Statistics FAQ text -->
<string name="statistics_faq_text">"Weitere Informationen finden Sie in den FAQ:\n\nFAQ zu Statistiken"</string>
<!-- #################################### <!-- ####################################
Button Tooltips for Accessibility Button Tooltips for Accessibility
......
Corona-Warn-App/src/main/res/values/strings.xml
+ 18
− 0
View file @ 20cf175b
...@@ -1621,6 +1621,24 @@ ...@@ -1621,6 +1621,24 @@
<!-- Applied Vaccination Dose Rates Statistics Card --> <!-- Applied Vaccination Dose Rates Statistics Card -->
<!-- XHED: Title for applied vaccination dose rates --> <!-- XHED: Title for applied vaccination dose rates -->
<string name="statistics_applied_vaccination_dose_rates_card_title">"Verabreichte Impfdosen"</string> <string name="statistics_applied_vaccination_dose_rates_card_title">"Verabreichte Impfdosen"</string>
<!-- XTXT: Statistics local 7 days title -->
<string name="statistics_explanation_local_seven_day_incidence_title">"Lokale 7-Tage-Inzidenz"</string>
<!-- XTXT: Statistics local 7 days text -->
<string name="statistics_explanation_local_seven_day_incidence_text">"Gesamtzahl der bestätigten Neuinfektionen der letzten 7 Tage (nach Meldedatum) pro 100.000 Einwohner im konfigurierten Kreis oder Bundesland."</string>
<!-- XTXT: Statistics number of vaccine doses title -->
<string name="statistics_number_of_vaccine_doses_title">"Verabreichte Impfdosen"</string>
<!-- XTXT: Statistics number of vaccine doses text -->
<string name="statistics_number_of_vaccine_doses_text">"Anzahl der Impfdosen, die bisher bundesweit verabreicht wurden."</string>
<!-- XTXT: Statistics number of fully vaccinated people title -->
<string name="statistics_fully_vaccinated_people_title">"Vollständig geimpfte Personen"</string>
<!-- XTXT: Statistics number of fully vaccinated people text -->
<string name="statistics_fully_vaccinated_people_text">"Anzahl der an das RKI übermittelten Personen, die die alle notwendigen Impfdosen erhalten haben."</string>
<!-- XTXT: Statistics number of vaccinated people at least title -->
<string name="statistics_people_vaccinated_at_least_once_title">"Mindestens einmal geimpfte Personen"</string>
<!-- XTXT: Statistics number of vaccinated people at least text -->
<string name="statistics_people_vaccinated_at_least_once_text">"Anzahl der an das RKI übermittelten Personen, die die erste Impfdosis erhalten haben."</string>
<!-- XTXT: Statistics FAQ text -->
<string name="statistics_faq_text">"Weitere Informationen finden Sie in den FAQ:\n\nFAQ zu Statistiken"</string>
<!-- #################################### <!-- ####################################
Button Tooltips for Accessibility Button Tooltips for Accessibility
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment