diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/ContactDiaryOverviewViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/ContactDiaryOverviewViewModel.kt index a0dbcbfaeff4060b8994d3903e953ddc1667cd86..544f637eb2a476a629a997edcbc49dc583e0c54f 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/ContactDiaryOverviewViewModel.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/ContactDiaryOverviewViewModel.kt @@ -82,7 +82,8 @@ class ContactDiaryOverviewViewModel @AssistedInject constructor( .map { personEncounter -> ListItem.Data( R.drawable.ic_contact_diary_person_item, - personEncounter.contactDiaryPerson.fullName + personEncounter.contactDiaryPerson.fullName, + ListItem.Type.PERSON ) } } @@ -96,7 +97,8 @@ class ContactDiaryOverviewViewModel @AssistedInject constructor( .map { locationVisit -> ListItem.Data( R.drawable.ic_contact_diary_location_item, - locationVisit.contactDiaryLocation.locationName + locationVisit.contactDiaryLocation.locationName, + ListItem.Type.LOCATION ) } } diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/adapter/ContactDiaryOverviewNestedAdapter.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/adapter/ContactDiaryOverviewNestedAdapter.kt index 90353e3cb7503b5eb28b688535f3c3eae8030b29..ef8ed0d379f71c73fc990ef0d8404425467ec89d 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/adapter/ContactDiaryOverviewNestedAdapter.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/adapter/ContactDiaryOverviewNestedAdapter.kt @@ -39,6 +39,12 @@ class ContactDiaryOverviewNestedAdapter( { key, _ -> contactDiaryOverviewElementImage.setImageResource(key.drawableId) contactDiaryOverviewElementName.text = key.text + contactDiaryOverviewElementName.contentDescription = when (key.type) { + ListItem.Type.LOCATION -> context.getString(R.string.accessibility_location, key.text) + ListItem.Type.PERSON -> context.getString(R.string.accessibility_person, key.text) + else -> key.text + } + contactDiaryOverviewElementNestedContainer.setOnClickListener { onItemSelectionListener(element) } } } diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/adapter/ListItem.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/adapter/ListItem.kt index 34e64afb21905f5b5002465ed182db3efb0fd14f..52f9784ba768ce77c6c6a674401de5b36c3e3f70 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/adapter/ListItem.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/adapter/ListItem.kt @@ -9,6 +9,11 @@ data class ListItem( data class Data( val drawableId: Int, - val text: String + val text: String, + val type: Type ) + + enum class Type { + LOCATION, PERSON + } }