From 84bfb428eabe486e3eda5c15f8b1aa54fc6d2c39 Mon Sep 17 00:00:00 2001
From: VaiTon <eyadlorenzo@gmail.com>
Date: Fri, 6 Aug 2021 17:31:11 +0200
Subject: [PATCH] fix: categories did not have a link in
 CategoryProductHelper.kt

Closes https://github.com/openfoodfacts/openfoodfacts-androidapp/issues/4129
---
 .../features/product/view/CategoryProductHelper.kt        | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/view/CategoryProductHelper.kt b/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/view/CategoryProductHelper.kt
index 6fdde04b89de..e33087cb69e5 100644
--- a/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/view/CategoryProductHelper.kt
+++ b/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/view/CategoryProductHelper.kt
@@ -43,8 +43,10 @@ object CategoryProductHelper {
             .append(" ")
             .apply {
                 // Add all the categories to text view and link them to wikidata is possible
-                append(categories.joinToString { getCategoriesTag(it, fragment, apiClient) })
-
+                categories.map { getCategoriesTag(it, fragment, apiClient) }.forEachIndexed { i, el ->
+                    append(el)
+                    if (i != categories.size) append(", ")
+                }
             }
 
         if (categories.any { it.categoryTag == "en:alcoholic-beverages" }) {
@@ -56,7 +58,7 @@ object CategoryProductHelper {
         category: CategoryName,
         fragment: BaseFragment,
         apiClient: WikiDataApiClient
-    ): CharSequence {
+    ): SpannableStringBuilder {
         val clickableSpan = object : ClickableSpan() {
             override fun onClick(view: View) {
                 if (category.isWikiDataIdPresent == true) {