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 82b5775e5401e38f438399d8944f5e08b2417021..8f7cd9cc526fe839e26f3ecf37bb20e58fb897c0 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 215a15ab12efdac8ebf93df66bf8cf01de2c6f60..b00a8bde2e668726e502cf044d516c850689968b 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 cefdccb11b77dbbf6a2759ff368ce3153c8b6795..0f2d5cd370b62a41592091738dd3ae373f00f22a 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 e85a9af171158d039b5c9fd1ad223c6139c0cdd4..76c77988fccd56018c4590840690deebbb2f24a3 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>