From 2b979064f875f74683d0ca557d1a15b473d1e76b Mon Sep 17 00:00:00 2001
From: Alex Paulescu <alex.paulescu@gmail.com>
Date: Tue, 23 Feb 2021 17:53:32 +0200
Subject: [PATCH] Resize diary home screen attributes when empty (DEV) (#2441)
* Attributes view disappears when empty.
* Fixed lint.
Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>
---
.../adapter/ContactDiaryOverviewNestedAdapter.kt | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
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 1846b0868..30de452e3 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
@@ -1,5 +1,6 @@
package de.rki.coronawarnapp.contactdiary.ui.overview.adapter
+import android.view.View
import android.view.ViewGroup
import de.rki.coronawarnapp.R
import de.rki.coronawarnapp.contactdiary.util.clearAndAddAll
@@ -31,18 +32,18 @@ class ContactDiaryOverviewNestedAdapter : BaseAdapter<ContactDiaryOverviewNested
override val viewBinding: Lazy<ContactDiaryOverviewNestedListItemBinding> =
lazy { ContactDiaryOverviewNestedListItemBinding.bind(itemView) }
- override val onBindData: ContactDiaryOverviewNestedListItemBinding.(
- item: ListItem.Data,
- payloads: List<Any>
- ) -> Unit = { key, _ ->
+ override val onBindData: ContactDiaryOverviewNestedListItemBinding.(item: ListItem.Data, payloads: List<Any>)
+ -> Unit = { key, _ ->
contactDiaryOverviewElementImage.setImageResource(key.drawableId)
contactDiaryOverviewElementName.text = key.name
contactDiaryOverviewElementName.contentDescription = when (key.type) {
ListItem.Type.LOCATION -> context.getString(R.string.accessibility_location, key.name)
ListItem.Type.PERSON -> context.getString(R.string.accessibility_person, key.name)
}
- contactDiaryOverviewElementAttributes.text =
- getAttributes(key.duration, key.attributes, key.circumstances)
+ val attributes = getAttributes(key.duration, key.attributes, key.circumstances)
+ if (attributes.isNotEmpty()) {
+ contactDiaryOverviewElementAttributes.text = attributes
+ } else contactDiaryOverviewElementAttributes.visibility = View.GONE
}
private fun getAttributes(duration: Duration?, resources: List<Int>?, circumstances: String?): String =
--
GitLab