From fb3365478a4bb8cd0624c95d944ffcee82ae1972 Mon Sep 17 00:00:00 2001 From: Sergey Vlasenko Date: Thu, 18 Apr 2024 16:51:28 +0300 Subject: [PATCH] fix removeUnderline flags in getSpannedTextWithUrls --- .../ru/touchin/roboswag/components/utils/spans/SpanUtils.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/src/main/java/ru/touchin/roboswag/components/utils/spans/SpanUtils.kt b/utils/src/main/java/ru/touchin/roboswag/components/utils/spans/SpanUtils.kt index 6d60745..e451ccb 100644 --- a/utils/src/main/java/ru/touchin/roboswag/components/utils/spans/SpanUtils.kt +++ b/utils/src/main/java/ru/touchin/roboswag/components/utils/spans/SpanUtils.kt @@ -16,11 +16,11 @@ import ru.touchin.extensions.indexesOf */ fun String.getSpannedTextWithUrls( removeUnderline: Boolean = true, - flags: Int = HtmlCompat.FROM_HTML_MODE_COMPACT + htmlFormatFlags: Int = HtmlCompat.FROM_HTML_MODE_COMPACT ): Spanned { // HtmlCompat.fromHtml doesn't respect line breaks val text = this.replace(lineBreakRegex, "
") - val spannableText = SpannableString(HtmlCompat.fromHtml(text, flags)) + val spannableText = SpannableString(HtmlCompat.fromHtml(text, htmlFormatFlags)) // Linkify removes all previous URLSpan's, we need to save all created spans for reapply after Linkify val spans = spannableText.getUrlSpans() @@ -29,7 +29,7 @@ fun String.getSpannedTextWithUrls( spannableText.setSpan(it.span, it.start, it.end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE) } - if (!removeUnderline) { + if (removeUnderline) { spannableText.getUrlSpans() .forEach { urlSpan -> spannableText.removeSpan(urlSpan.span) -- 2.40.1