Add ForegroundColorSpan interpretation (#4)

ch4rl3x · Jun 20, 2022 · c897282 · c897282
1 parent b857d93
commit c897282
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/example/src/main/java/de/charlex/compose/htmltext/example/MainActivity.kt b/example/src/main/java/de/charlex/compose/htmltext/example/MainActivity.kt
@@ -6,8 +6,6 @@ import androidx.activity.compose.setContent
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
 import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
@@ -23,6 +21,7 @@ class MainActivity : ComponentActivity() {
                 Column(Modifier.background(color = MaterialTheme.colors.background)) {
                     Greeting()
                     StringGreeting()
+                    ColorText()
                 }
             }
         }
@@ -39,6 +38,11 @@ fun StringGreeting(){
     HtmlText(text = "Hello <b>World</b>. This <i><strike>text</strike>sentence</i> is form<b>att<u>ed</u></b> in simple html. <a href=\"https://github.com/ch4rl3x/HtmlText\">HtmlText</a>")
 }
 
+@Composable
+fun ColorText() {
+    HtmlText(text = "Hello <span style=\"color: #00FFFF\">blue</span> world")
+}
+
 @Preview(showBackground = true)
 @Composable
 fun DefaultPreview() {

diff --git a/html-text/src/main/java/de/charlex/compose/HtmlText.kt b/html-text/src/main/java/de/charlex/compose/HtmlText.kt
@@ -8,6 +8,7 @@ import android.text.style.StrikethroughSpan
 import android.text.style.StyleSpan
 import android.text.style.URLSpan
 import android.text.style.UnderlineSpan
+import android.text.style.ForegroundColorSpan
 import androidx.annotation.StringRes
 import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.foundation.text.InlineTextContent
@@ -218,14 +219,15 @@ fun CharSequence.toAnnotatedString(
 
 fun Spanned.toAnnotatedString(
     urlSpanStyle: SpanStyle = SpanStyle(
-color = Color.Blue,
-textDecoration = TextDecoration.Underline
-)
+        color = Color.Blue,
+        textDecoration = TextDecoration.Underline
+    )
 ): AnnotatedString {
     return buildAnnotatedString {
         append(this@toAnnotatedString.toString())
         val urlSpans = getSpans<URLSpan>()
         val styleSpans = getSpans<StyleSpan>()
+        val colorSpans = getSpans<ForegroundColorSpan>()
         val underlineSpans = getSpans<UnderlineSpan>()
         val strikethroughSpans = getSpans<StrikethroughSpan>()
         urlSpans.forEach { urlSpan ->
@@ -234,6 +236,11 @@ textDecoration = TextDecoration.Underline
             addStyle(urlSpanStyle, start, end)
             addStringAnnotation("url", urlSpan.url, start, end) // NON-NLS
         }
+        colorSpans.forEach { colorSpan ->
+            val start = getSpanStart(colorSpan)
+            val end = getSpanEnd(colorSpan)
+            addStyle(SpanStyle(color = Color(colorSpan.foregroundColor)), start, end)
+        }
         styleSpans.forEach { styleSpan ->
             val start = getSpanStart(styleSpan)
             val end = getSpanEnd(styleSpan)