Remove underline (#1296)

Co-authored-by: Isabel Martin <arkariang@gmail.com>
kickstarter · Jun 17, 2021 · 4bb43e3 · 4bb43e3
1 parent 101b1c2
commit 4bb43e3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/app/src/main/java/com/kickstarter/libs/utils/extensions/StringExt.kt b/app/src/main/java/com/kickstarter/libs/utils/extensions/StringExt.kt
@@ -2,6 +2,7 @@
 package com.kickstarter.libs.utils.extensions
 
 import android.util.Patterns
+import org.jsoup.Jsoup
 import java.util.Locale
 
 const val MINIMUM_PASSWORD_LENGTH = 6
@@ -53,3 +54,7 @@ fun String.trimAllWhitespace(): String {
  * Returns a string wrapped in parentheses.
  */
 fun String.wrapInParentheses() = "($this)"
+
+fun String.parseHtmlTag(): String {
+    return Jsoup.parse(this).text()
+}
diff --git a/app/src/main/java/com/kickstarter/ui/extensions/TextViewExt.kt b/app/src/main/java/com/kickstarter/ui/extensions/TextViewExt.kt
@@ -14,13 +14,13 @@ import androidx.core.content.ContextCompat
 import org.jsoup.Jsoup
 import java.util.Locale
 
-fun TextView.makeLinks(vararg links: Pair<String, View.OnClickListener>, @ColorRes linkColor: Int = -1) {
+fun TextView.makeLinks(vararg links: Pair<String, View.OnClickListener>, @ColorRes linkColor: Int = -1, isUnderlineText: Boolean = true) {
     val spannableString = SpannableString(this.text)
     var startIndexOfLink = -1
     for (link in links) {
         val clickableSpan = object : ClickableSpan() {
             override fun updateDrawState(textPaint: TextPaint) {
-                textPaint.isUnderlineText = true
+                textPaint.isUnderlineText = isUnderlineText
                 if (linkColor != -1)
                     textPaint.color = ContextCompat.getColor(context, linkColor)
             }

diff --git a/app/src/main/java/com/kickstarter/ui/views/CommentCard.kt b/app/src/main/java/com/kickstarter/ui/views/CommentCard.kt
@@ -12,6 +12,7 @@ import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
 import com.kickstarter.R
 import com.kickstarter.databinding.CommentCardBinding
+import com.kickstarter.libs.utils.extensions.parseHtmlTag
 import com.kickstarter.libs.utils.extensions.setAllOnClickListener
 import com.kickstarter.ui.extensions.loadCircleImage
 import com.kickstarter.ui.extensions.makeLinks
@@ -53,13 +54,14 @@ class CommentCard @JvmOverloads constructor(
         binding.flaggedMessage.parseHtmlTag()
         binding.flaggedMessage.makeLinks(
             Pair(
-                context.resources.getString(R.string.Learn_more_about_comment_guidelines),
+                context.resources.getString(R.string.Learn_more_about_comment_guidelines).parseHtmlTag(),
                 OnClickListener {
                     onCommentCardClickedListener?.onCommentGuideLinesClicked(it)
                 },
 
             ),
-            linkColor = R.color.kds_create_500
+            linkColor = R.color.kds_create_500,
+            isUnderlineText = false
         )
     }