From 9902e8ce267430936aae00f6938b75b6bd6ed4d9 Mon Sep 17 00:00:00 2001 From: Saeed Noshadi Date: Mon, 14 Nov 2022 15:35:13 +0330 Subject: [PATCH 1/3] show all authors in the news card --- .../apps/nowinandroid/core/ui/NewsResourceCard.kt | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt b/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt index 36e5ff60a..f260353d8 100644 --- a/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt +++ b/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt @@ -16,6 +16,7 @@ package com.google.samples.apps.nowinandroid.core.ui +import android.util.Log import androidx.compose.foundation.background import androidx.compose.foundation.horizontalScroll import androidx.compose.foundation.layout.Arrangement @@ -156,12 +157,17 @@ fun NewsResourceAuthors( authors: List ) { if (authors.isNotEmpty()) { - // Only display first author for now - val author = authors[0] + // display all authors + val authorName = StringBuilder() + authors.forEachIndexed { index, author -> + authorName + .append(author.name) + .append(if (index == authors.lastIndex) "" else ", ") + } - val authorNameFormatted = author.name.uppercase(Locale.getDefault()) + val authorNameFormatted = "$authorName".uppercase(Locale.getDefault()) - val authorImageUrl = author.imageUrl + val authorImageUrl = authors[0].imageUrl val authorImageModifier = Modifier .clip(CircleShape) From 16ce94962e31054b9ca89dd0fbaf7651e551c0b9 Mon Sep 17 00:00:00 2001 From: Saeed Noshadi Date: Mon, 14 Nov 2022 15:40:50 +0330 Subject: [PATCH 2/3] remove unused import --- .../google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt b/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt index f260353d8..0b308bd91 100644 --- a/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt +++ b/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt @@ -16,7 +16,6 @@ package com.google.samples.apps.nowinandroid.core.ui -import android.util.Log import androidx.compose.foundation.background import androidx.compose.foundation.horizontalScroll import androidx.compose.foundation.layout.Arrangement From 4152160b27a27f27b9b65c01a183de88f0800bad Mon Sep 17 00:00:00 2001 From: Saeed Noshadi Date: Tue, 15 Nov 2022 13:52:56 +0330 Subject: [PATCH 3/3] replace StringBuilder with joinToString --- .../apps/nowinandroid/core/ui/NewsResourceCard.kt | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt b/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt index 0b308bd91..16e86c192 100644 --- a/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt +++ b/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt @@ -157,14 +157,9 @@ fun NewsResourceAuthors( ) { if (authors.isNotEmpty()) { // display all authors - val authorName = StringBuilder() - authors.forEachIndexed { index, author -> - authorName - .append(author.name) - .append(if (index == authors.lastIndex) "" else ", ") - } - - val authorNameFormatted = "$authorName".uppercase(Locale.getDefault()) + val authorNameFormatted = + authors.joinToString(separator = ", ") { author -> author.name } + .uppercase(Locale.getDefault()) val authorImageUrl = authors[0].imageUrl