@@ -19,8 +19,8 @@ import androidx.annotation.StringRes
1919import androidx.compose.runtime.Composable
2020import androidx.compose.runtime.remember
2121import androidx.compose.ui.graphics.Color
22- import androidx.compose.ui.platform.LocalContext
2322import androidx.compose.ui.platform.LocalDensity
23+ import androidx.compose.ui.platform.LocalResources
2424import androidx.compose.ui.text.AnnotatedString
2525import androidx.compose.ui.text.SpanStyle
2626import androidx.compose.ui.text.buildAnnotatedString
@@ -33,6 +33,7 @@ import androidx.compose.ui.unit.Density
3333import androidx.compose.ui.unit.dp
3434import androidx.compose.ui.unit.em
3535import androidx.core.text.HtmlCompat
36+ import androidx.core.text.toHtml
3637import androidx.core.text.toSpanned
3738
3839/* *
@@ -49,7 +50,7 @@ import androidx.core.text.toSpanned
4950 */
5051@Composable
5152fun rememberStyledTextResource (@StringRes id : Int , vararg formatArgs : Any ): AnnotatedString {
52- val resources = LocalContext .current.resources
53+ val resources = LocalResources .current
5354 val density = LocalDensity .current
5455 return remember(id, * formatArgs) {
5556 resources.getAnnotatedString(id, density, * formatArgs)
@@ -90,8 +91,8 @@ private fun Resources.getHtmlText(@StringRes id: Int, vararg args: Any): Spanned
9091 )
9192
9293private fun Spanned.toHtmlWithoutParagraphs (): String =
93- HtmlCompat
94- .toHtml(this , HtmlCompat . TO_HTML_PARAGRAPH_LINES_CONSECUTIVE )
94+ this
95+ .toHtml()
9596 .substringAfter(" <p dir=\" ltr\" >" )
9697 .substringBeforeLast(" </p>" )
9798
0 commit comments