From c8873052f928ce5e37bd4ab55297358717cc6bce Mon Sep 17 00:00:00 2001 From: Luca Nicoletti Date: Tue, 19 Mar 2024 13:36:53 +0000 Subject: [PATCH] Add capability to handle unordered list --- README.md | 6 ++++++ art/ul-screenshot.png | Bin 0 -> 35616 bytes .../compose/htmltext/example/MainActivity.kt | 8 ++++++++ .../de/charlex/compose/material/HtmlText.kt | 12 +++++++++++- .../de/charlex/compose/material3/HtmlText.kt | 12 +++++++++++- 5 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 art/ul-screenshot.png diff --git a/README.md b/README.md index 7fa7e62..4b59b25 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,11 @@ Text composable to show html text from resources <font color="#FF0000"> - Colored text (Markdown does not allow a preview here)
<font color="red"> - Colored text (Markdown does not allow a preview here)

+**Additional**
+<ul><li></li></ul> - Unordered lists + • Item + • Item + ## MaterialTheme colors in HtmlText To use colors like `MaterialTheme.colors.primary` in `HtmlText`, map simple colors. ```kotlin @@ -93,6 +98,7 @@ HtmlText(textId = R.string.hello_world) # Preview ![HtmlText](https://github.com/ch4rl3x/HtmlText/blob/main/art/screenshot.png) +![HtmlText with unordered list](https://github.com/ch4rl3x/HtmlText/blob/main/art/ul-screenshot.png) That's it! diff --git a/art/ul-screenshot.png b/art/ul-screenshot.png new file mode 100644 index 0000000000000000000000000000000000000000..b5731dd4fda9db54b39522e30f2fab3ead1e70a7 GIT binary patch literal 35616 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 O{8^Y;o6`5Voc|~B&nEH! literal 0 HcmV?d00001 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 index f6a4253..32cb49e 100644 --- a/example/src/main/java/de/charlex/compose/htmltext/example/MainActivity.kt +++ b/example/src/main/java/de/charlex/compose/htmltext/example/MainActivity.kt @@ -32,6 +32,7 @@ class MainActivity : ComponentActivity() { MultipleLinks() ReturnLink() ReturnLinks() + UnorderedList() } } } @@ -120,3 +121,10 @@ fun ReturnLinks() { } ) } + +@Composable +fun UnorderedList() { + HtmlText( + text = "Unordered list
  • Item
  • Item
  • Item
    • ", + ) +} diff --git a/material-html-text/src/main/java/de/charlex/compose/material/HtmlText.kt b/material-html-text/src/main/java/de/charlex/compose/material/HtmlText.kt index 52f8c9f..b40edd7 100644 --- a/material-html-text/src/main/java/de/charlex/compose/material/HtmlText.kt +++ b/material-html-text/src/main/java/de/charlex/compose/material/HtmlText.kt @@ -3,7 +3,9 @@ package de.charlex.compose.material import android.graphics.Typeface import android.os.Build.VERSION.SDK_INT import android.text.Html +import android.text.SpannableStringBuilder import android.text.Spanned +import android.text.style.BulletSpan import android.text.style.ForegroundColorSpan import android.text.style.StrikethroughSpan import android.text.style.StyleSpan @@ -42,6 +44,7 @@ import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.TextUnit import androidx.core.text.getSpans +import androidx.core.text.toSpannable /** * Simple Text composable to show the text with html styling from string resources. @@ -312,7 +315,14 @@ fun Spanned.toAnnotatedString( colorMapping: Map = emptyMap(), ): AnnotatedString { return buildAnnotatedString { - append(this@toAnnotatedString.toString()) + val bulletSpans = getSpans() + val spannableStringBuilder = SpannableStringBuilder.valueOf(this@toAnnotatedString) + bulletSpans.forEach { bulletSpan -> + val start = getSpanStart(bulletSpan) + spannableStringBuilder.insert(start, " • ") + spannableStringBuilder.removeSpan(bulletSpan) + } + append(spannableStringBuilder.toSpannable()) val urlSpans = getSpans() val styleSpans = getSpans() val colorSpans = getSpans() diff --git a/material3-html-text/src/main/java/de/charlex/compose/material3/HtmlText.kt b/material3-html-text/src/main/java/de/charlex/compose/material3/HtmlText.kt index 8d91fde..894276b 100644 --- a/material3-html-text/src/main/java/de/charlex/compose/material3/HtmlText.kt +++ b/material3-html-text/src/main/java/de/charlex/compose/material3/HtmlText.kt @@ -3,7 +3,9 @@ package de.charlex.compose.material3 import android.graphics.Typeface import android.os.Build.VERSION.SDK_INT import android.text.Html +import android.text.SpannableStringBuilder import android.text.Spanned +import android.text.style.BulletSpan import android.text.style.ForegroundColorSpan import android.text.style.StrikethroughSpan import android.text.style.StyleSpan @@ -42,6 +44,7 @@ import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.TextUnit import androidx.core.text.getSpans +import androidx.core.text.toSpannable /** * Simple Text composable to show the text with html styling from string resources. @@ -312,7 +315,14 @@ fun Spanned.toAnnotatedString( colorMapping: Map = emptyMap(), ): AnnotatedString { return buildAnnotatedString { - append(this@toAnnotatedString.toString()) + val bulletSpans = getSpans() + val spannableStringBuilder = SpannableStringBuilder.valueOf(this@toAnnotatedString) + bulletSpans.forEach { bulletSpan -> + val start = getSpanStart(bulletSpan) + spannableStringBuilder.insert(start, " • ") + spannableStringBuilder.removeSpan(bulletSpan) + } + append(spannableStringBuilder.toSpannable()) val urlSpans = getSpans() val styleSpans = getSpans() val colorSpans = getSpans()