From 499e533ac2bc49dbf88368fe68ff54f726ebad27 Mon Sep 17 00:00:00 2001
From: William Durand <will+git@drnd.me>
Date: Thu, 8 Feb 2024 13:10:49 +0100
Subject: [PATCH] Bug 1870362 - Add underline to each link in the add-on
 details view

---
 .../org/mozilla/fenix/addons/AddonDetailsBindingDelegate.kt  | 5 +++++
 .../mozilla/fenix/addons/AddonDetailsBindingDelegateTest.kt  | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/addons/AddonDetailsBindingDelegate.kt b/app/src/main/java/org/mozilla/fenix/addons/AddonDetailsBindingDelegate.kt
index 3ff2f85f6..fef044b05 100644
--- a/app/src/main/java/org/mozilla/fenix/addons/AddonDetailsBindingDelegate.kt
+++ b/app/src/main/java/org/mozilla/fenix/addons/AddonDetailsBindingDelegate.kt
@@ -22,6 +22,7 @@ import mozilla.components.feature.addons.ui.updatedAtDate
 import mozilla.components.support.ktx.android.content.getColorFromAttr
 import org.mozilla.fenix.R
 import org.mozilla.fenix.databinding.FragmentAddOnDetailsBinding
+import org.mozilla.fenix.ext.addUnderline
 import java.text.DateFormat
 import java.text.NumberFormat
 import java.util.Locale
@@ -70,6 +71,7 @@ class AddonDetailsBindingDelegate(
 
             if (addon.ratingUrl.isNotBlank()) {
                 binding.reviewCount.setTextColor(binding.root.context.getColorFromAttr(R.attr.textAccent))
+                binding.reviewCount.addUnderline()
                 binding.reviewCount.setOnClickListener {
                     interactor.openWebsite(addon.ratingUrl.toUri())
                 }
@@ -85,6 +87,7 @@ class AddonDetailsBindingDelegate(
             return
         }
 
+        binding.homePageLabel.addUnderline()
         binding.homePageLabel.setOnClickListener {
             interactor.openWebsite(addon.homepageUrl.toUri())
         }
@@ -134,6 +137,7 @@ class AddonDetailsBindingDelegate(
 
         if (author.url.isNotBlank()) {
             binding.authorText.setTextColor(binding.root.context.getColorFromAttr(R.attr.textAccent))
+            binding.authorText.addUnderline()
             binding.authorText.setOnClickListener {
                 interactor.openWebsite(author.url.toUri())
             }
@@ -181,6 +185,7 @@ class AddonDetailsBindingDelegate(
             return
         }
 
+        binding.detailUrl.addUnderline()
         binding.detailUrl.setOnClickListener {
             interactor.openWebsite(addon.detailUrl.toUri())
         }
diff --git a/app/src/test/java/org/mozilla/fenix/addons/AddonDetailsBindingDelegateTest.kt b/app/src/test/java/org/mozilla/fenix/addons/AddonDetailsBindingDelegateTest.kt
index 8df9a2a29..91f27b9e9 100644
--- a/app/src/test/java/org/mozilla/fenix/addons/AddonDetailsBindingDelegateTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/addons/AddonDetailsBindingDelegateTest.kt
@@ -85,7 +85,7 @@ class AddonDetailsBindingDelegateTest {
                 ratingUrl = "https://example.org/",
             ),
         )
-        assertEquals("100", binding.reviewCount.text)
+        assertEquals("100", binding.reviewCount.text.toString())
 
         binding.reviewCount.performClick()
 
@@ -163,7 +163,7 @@ class AddonDetailsBindingDelegateTest {
             baseAddon.copy(author = Addon.Author(name = "Sarah Jane", url = "https://example.org/")),
         )
 
-        assertEquals("Sarah Jane", binding.authorText.text)
+        assertEquals("Sarah Jane", binding.authorText.text.toString())
         assertEquals(testContext.getColorFromAttr(R.attr.textAccent), binding.authorText.currentTextColor)
 
         binding.authorText.performClick()