diff --git a/Corona-Warn-App/src/main/assets/privacy_de.html b/Corona-Warn-App/src/main/assets/privacy_de.html index 13ae1234fefb3da1a60c526cf6749e780f4a5ca3..63a4b1600197d9781595e47c175918a8c6ca74f2 100644 --- a/Corona-Warn-App/src/main/assets/privacy_de.html +++ b/Corona-Warn-App/src/main/assets/privacy_de.html @@ -199,7 +199,7 @@ Smartphone nicht über diese Zufalls-IDs identifiziert werden kann. Die von Ihrem Smartphone ausgesendeten eigenen Begegnungsdaten und die aufgezeichneten Begegnungsdaten der Personen, mit denen Sie Kontakt hatten, - werden auf Ihrem Smartphone gespeichert und jeweils nach 14 Tage gelöscht. + werden auf Ihrem Smartphone gespeichert und jeweils nach 14 Tagen gelöscht. Auf die gleiche Weise werden Ihre ausgesendeten Begegnungsdaten verarbeitet, wenn sie von den Smartphones anderer App-Nutzer aufgezeichnet werden. @@ -808,4 +808,4 @@ </p> <p> Stand: 16.12.2020 -</p> \ No newline at end of file +</p> diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/adapter/ContactDiaryOverviewAdapter.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/adapter/ContactDiaryOverviewAdapter.kt index 3e3c3a730f25006b120c4930900c60bf1bd83b9e..f802f1833b09a3c8fa863feca7ebc5e737d13a04 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/adapter/ContactDiaryOverviewAdapter.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/adapter/ContactDiaryOverviewAdapter.kt @@ -36,14 +36,10 @@ class ContactDiaryOverviewAdapter( override val viewBinding: Lazy<ContactDiaryOverviewListItemBinding> = lazy { ContactDiaryOverviewListItemBinding.bind(itemView) } - private val nestedItemAdapter = ContactDiaryOverviewNestedAdapter() - - init { - viewBinding.value.contactDiaryOverviewNestedRecyclerView.adapter = nestedItemAdapter - } - override val onBindData: ContactDiaryOverviewListItemBinding.(item: ListItem, payloads: List<Any>) -> Unit = { item, _ -> + val nestedItemAdapter = ContactDiaryOverviewNestedAdapter(item, onItemSelectionListener) + viewBinding.value.contactDiaryOverviewNestedRecyclerView.adapter = nestedItemAdapter contactDiaryOverviewElementName.text = dateFormatter(item.date) contactDiaryOverviewElementName.contentDescription = dateFormatterForAccessibility(item.date) contactDiaryOverviewElementBody.setOnClickListener { onItemSelectionListener(item) } 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 e7835cb12fd5efa22917f93f221e2fca51bbf74b..90353e3cb7503b5eb28b688535f3c3eae8030b29 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 @@ -7,8 +7,10 @@ import de.rki.coronawarnapp.databinding.ContactDiaryOverviewNestedListItemBindin import de.rki.coronawarnapp.ui.lists.BaseAdapter import de.rki.coronawarnapp.util.lists.BindableVH -class ContactDiaryOverviewNestedAdapter : - BaseAdapter<ContactDiaryOverviewNestedAdapter.NestedItemViewHolder>() { +class ContactDiaryOverviewNestedAdapter( + private val element: ListItem, + private val onItemSelectionListener: (ListItem) -> Unit +) : BaseAdapter<ContactDiaryOverviewNestedAdapter.NestedItemViewHolder>() { private val dataList: MutableList<ListItem.Data> = mutableListOf() @@ -19,12 +21,13 @@ class ContactDiaryOverviewNestedAdapter : override fun onCreateBaseVH(parent: ViewGroup, viewType: Int): NestedItemViewHolder = NestedItemViewHolder(parent) - override fun onBindBaseVH(holder: NestedItemViewHolder, position: Int, payloads: MutableList<Any>) = + override fun onBindBaseVH(holder: NestedItemViewHolder, position: Int, payloads: MutableList<Any>) { holder.bind(dataList[position], payloads) + } override fun getItemCount(): Int = dataList.size - class NestedItemViewHolder(parent: ViewGroup) : + inner class NestedItemViewHolder(parent: ViewGroup) : BaseAdapter.VH(R.layout.contact_diary_overview_nested_list_item, parent), BindableVH<ListItem.Data, ContactDiaryOverviewNestedListItemBinding> { override val viewBinding: @@ -36,6 +39,7 @@ class ContactDiaryOverviewNestedAdapter : { key, _ -> contactDiaryOverviewElementImage.setImageResource(key.drawableId) contactDiaryOverviewElementName.text = key.text + contactDiaryOverviewElementNestedContainer.setOnClickListener { onItemSelectionListener(element) } } } } diff --git a/Corona-Warn-App/src/main/res/layout/home_card_container_layout.xml b/Corona-Warn-App/src/main/res/layout/home_card_container_layout.xml index 1809655e6b811e720cecca58235289fa6854cddb..b5797d7801ccae01562c5366ba67f8bd88afcc6e 100644 --- a/Corona-Warn-App/src/main/res/layout/home_card_container_layout.xml +++ b/Corona-Warn-App/src/main/res/layout/home_card_container_layout.xml @@ -11,5 +11,5 @@ android:layout_marginBottom="@dimen/spacing_tiny" android:foreground="?selectableItemBackground" android:focusable="true" - app:cardElevation="@dimen/elevation_strong" + app:cardElevation="@dimen/elevation_weak" app:cardCornerRadius="@dimen/radius_card" /> diff --git a/Corona-Warn-App/src/main/res/values-de/strings.xml b/Corona-Warn-App/src/main/res/values-de/strings.xml index 6dcd85511c2475683201ad340f66f7fbe7549634..7f7e633ef28db861686870de9fb19832f16713c8 100644 --- a/Corona-Warn-App/src/main/res/values-de/strings.xml +++ b/Corona-Warn-App/src/main/res/values-de/strings.xml @@ -586,7 +586,7 @@ <!-- XHED: settings(notification) - multiline headline below illustration, inactive --> <string name="settings_notifications_headline_inactive">"Mitteilungen sind deaktiviert"</string> <!-- XTXT: settings(notification) - text in row on settings overview --> - <string name="settings_notifications_body_description">"Erlauben Sie automatische Benachrichtigungen zu COVID-19-Risikostatus."</string> + <string name="settings_notifications_body_description">"Erlauben Sie automatische Benachrichtigungen zu Ihrem COVID-19-Risikostatus."</string> <!-- YTXT: settings(notification) - description text when it notifications are enabled --> <string name="settings_notifications_body_active">"Legen Sie fest, zu welchen Themen Sie informiert bleiben möchten."</string> <!-- XTXT: settings(notification) - explains what the user has to do to activate settings -->