From 6952217222baa15349fa3a9a852777e8717cb786 Mon Sep 17 00:00:00 2001
From: axelherbstreith <75120552+axelherbstreith@users.noreply.github.com>
Date: Tue, 19 Jan 2021 15:22:00 +0100
Subject: [PATCH] Contact Journal Day date is not announced (EXPOSUREAPP-4457)
(#2146)
* changed talk back annoucement
* added day view announcement
* added missing quotation marks to accessibility strings
* linting
Co-authored-by: Ralf Gehrer <ralfgehrer@users.noreply.github.com>
---
.../ui/day/ContactDiaryDayViewModel.kt | 4 +++-
.../res/layout/contact_diary_day_fragment.xml | 1 +
.../res/values-de/contact_diary_strings.xml | 20 ++++++++++---------
.../main/res/values/contact_diary_strings.xml | 2 ++
4 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/ContactDiaryDayViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/ContactDiaryDayViewModel.kt
index 82b5775e5..8f7cd9cc5 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/ContactDiaryDayViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/ContactDiaryDayViewModel.kt
@@ -4,6 +4,7 @@ import android.content.Context
import androidx.lifecycle.asLiveData
import com.squareup.inject.assisted.Assisted
import com.squareup.inject.assisted.AssistedInject
+import de.rki.coronawarnapp.R
import de.rki.coronawarnapp.contactdiary.ui.day.tabs.ContactDiaryDayTab
import de.rki.coronawarnapp.contactdiary.util.getLocale
import de.rki.coronawarnapp.contactdiary.util.toFormattedDay
@@ -27,7 +28,8 @@ class ContactDiaryDayViewModel @AssistedInject constructor(
val uiState = displayedDay.map { day ->
UIState(
dayText = { day.toFormattedDay(it.getLocale()) },
- dayTextContentDescription = { day.toFormattedDayForAccessibility(it.getLocale()) })
+ dayTextContentDescription = { day.toFormattedDayForAccessibility(it.getLocale()) +
+ it.getString(R.string.accessibility_day_view_header) })
}.asLiveData()
fun onCreateButtonClicked(activeTab: ContactDiaryDayTab) {
diff --git a/Corona-Warn-App/src/main/res/layout/contact_diary_day_fragment.xml b/Corona-Warn-App/src/main/res/layout/contact_diary_day_fragment.xml
index 215a15ab1..b00a8bde2 100644
--- a/Corona-Warn-App/src/main/res/layout/contact_diary_day_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/contact_diary_day_fragment.xml
@@ -15,6 +15,7 @@
android:layout_height="wrap_content"
android:background="@drawable/contact_diary_background"
android:elevation="@dimen/elevation_weak"
+ android:focusable="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
diff --git a/Corona-Warn-App/src/main/res/values-de/contact_diary_strings.xml b/Corona-Warn-App/src/main/res/values-de/contact_diary_strings.xml
index cefdccb11..0f2d5cd37 100644
--- a/Corona-Warn-App/src/main/res/values-de/contact_diary_strings.xml
+++ b/Corona-Warn-App/src/main/res/values-de/contact_diary_strings.xml
@@ -100,22 +100,24 @@
<string name="contact_diary_delete_person_title">"Wollen Sie wirklich diese Person entfernen?"</string>
<!-- XTXT: location (description for screen readers) -->
- <string name="accessibility_location">Ort %s</string>
+ <string name="accessibility_location">"Ort %s"</string>
<!-- XTXT: person (description for screen readers) -->
- <string name="accessibility_person">Person %s</string>
+ <string name="accessibility_person">"Person %s"</string>
<!-- XTXT: location is not selected (description for screen readers) -->
- <string name="accessibility_location_unselected">Ort %s ist nicht ausgewählt</string>
+ <string name="accessibility_location_unselected">"Ort %s ist nicht ausgewählt"</string>
<!-- XTXT: person is not selected (description for screen readers) -->
- <string name="accessibility_person_unselected">Person %s ist nicht ausgewählt</string>
+ <string name="accessibility_person_unselected">"Person %s ist nicht ausgewählt"</string>
<!-- XTXT: location is selected (description for screen readers) -->
- <string name="accessibility_location_selected">Ort %s ist ausgewählt</string>
+ <string name="accessibility_location_selected">"Ort %s ist ausgewählt"</string>
<!-- XTXT: person is selected (description for screen readers) -->
- <string name="accessibility_person_selected">Person %s ist ausgewählt</string>
+ <string name="accessibility_person_selected">"Person %s ist ausgewählt"</string>
+ <!-- XTXT: Day View headline (description for screen readers) -->
+ <string name="accessibility_day_view_header">"Tagesansicht"</string>
<!-- XTXT: Select (description for screen readers) -->
- <string name="accessibility_action_select">Auswählen</string>
+ <string name="accessibility_action_select">"Auswählen"</string>
<!-- XTXT: Deselect (description for screen readers) -->
- <string name="accessibility_action_deselect">Auswahl aufheben</string>
+ <string name="accessibility_action_deselect">"Auswahl aufheben"</string>
<!-- XTXT: Edit (description for screen readers) -->
- <string name="accessibility_edit">Bearbeiten</string>
+ <string name="accessibility_edit">"Bearbeiten"</string>
</resources>
diff --git a/Corona-Warn-App/src/main/res/values/contact_diary_strings.xml b/Corona-Warn-App/src/main/res/values/contact_diary_strings.xml
index e85a9af17..76c77988f 100644
--- a/Corona-Warn-App/src/main/res/values/contact_diary_strings.xml
+++ b/Corona-Warn-App/src/main/res/values/contact_diary_strings.xml
@@ -118,6 +118,8 @@
<string name="accessibility_location_selected">"Place %s is selected"</string>
<!-- XTXT: person is selected (description for screen readers) -->
<string name="accessibility_person_selected">"Person %s is selected"</string>
+ <!-- XTXT: Day View headline (description for screen readers) -->
+ <string name="accessibility_day_view_header"></string>
<!-- XTXT: Select (description for screen readers) -->
<string name="accessibility_action_select">"Select"</string>
--
GitLab