From 6e925dc6fb45d466f1b1ed0260c1add77abecc48 Mon Sep 17 00:00:00 2001
From: axelherbstreith <75120552+axelherbstreith@users.noreply.github.com>
Date: Mon, 18 Jan 2021 17:37:06 +0100
Subject: [PATCH] Contact Journal Location/Person not announced
(EXPOSUREAPP-4459) (#2129)
* added type announcement
* added enum class for types
* updated to when statement for type decision
---
.../ui/overview/ContactDiaryOverviewViewModel.kt | 6 ++++--
.../overview/adapter/ContactDiaryOverviewNestedAdapter.kt | 6 ++++++
.../contactdiary/ui/overview/adapter/ListItem.kt | 7 ++++++-
3 files changed, 16 insertions(+), 3 deletions(-)
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 a0dbcbfae..544f637eb 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 90353e3cb..ef8ed0d37 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 34e64afb2..52f9784ba 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
+ }
}
--
GitLab