From 4141f6ce1bbbba17bb2e0f88fcaf59b20dff34c2 Mon Sep 17 00:00:00 2001
From: Alex Paulescu <alex.paulescu@gmail.com>
Date: Wed, 24 Feb 2021 16:02:40 +0200
Subject: [PATCH] Remove trailing commas from attributes list (DEV) #2457
* Removed trailing comma when elements from list were empty.
* Changed takeWhile to filter.
Co-authored-by: Ralf Gehrer <ralfgehrer@users.noreply.github.com>
---
.../ui/overview/adapter/ContactDiaryOverviewNestedAdapter.kt | 2 +-
.../src/main/res/layout/contact_diary_add_person_fragment.xml | 3 +--
2 files changed, 2 insertions(+), 3 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 30de452e3..d71dd76f2 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
@@ -51,6 +51,6 @@ class ContactDiaryOverviewNestedAdapter : BaseAdapter<ContactDiaryOverviewNested
duration?.run { add(toStandardHours().toString()) }
resources?.run { forEach { add(context.getString(it)) } }
circumstances?.run { add(this) }
- }.joinToString()
+ }.filter { it.isNotEmpty() }.joinToString()
}
}
diff --git a/Corona-Warn-App/src/main/res/layout/contact_diary_add_person_fragment.xml b/Corona-Warn-App/src/main/res/layout/contact_diary_add_person_fragment.xml
index 90420e38a..d6c328919 100644
--- a/Corona-Warn-App/src/main/res/layout/contact_diary_add_person_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/contact_diary_add_person_fragment.xml
@@ -62,8 +62,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:imeOptions="actionNext"
- android:inputType="textCapWords"
- app:backgroundTint="@color/colorContactDiaryListItem" />
+ android:inputType="textCapWords" />
</com.google.android.material.textfield.TextInputLayout>
--
GitLab