Compare commits
1 Commits
5db3391b7d
...
86a7020c2b
Author | SHA1 | Date | |
---|---|---|---|
86a7020c2b |
@ -91,7 +91,7 @@ fun DemoNavGraph(navHostController: NavHostController) {
|
||||
},
|
||||
consentium = Consentium(
|
||||
context = context,
|
||||
"ApplicationId",
|
||||
applicationId = "ApplicationId",
|
||||
),
|
||||
colors = ConsentiumDefaults.colors(
|
||||
primary = Primary,
|
||||
|
@ -12,7 +12,7 @@ import androidx.core.graphics.ColorUtils
|
||||
|
||||
|
||||
object ConsentiumDefaults {
|
||||
private const val SURFACE_PRIMARY_COLOR_BLEND_RATIO = 0.1f
|
||||
private const val OUTLINE_COLOR_BLEND_RATIO = 0.1f
|
||||
|
||||
private object Typography {
|
||||
private val DEFAULT_LINE_HEIGHT = 24.sp
|
||||
@ -101,7 +101,7 @@ object ConsentiumDefaults {
|
||||
ColorUtils.blendARGB(
|
||||
onPrimary.toArgb(),
|
||||
primary.toArgb(),
|
||||
SURFACE_PRIMARY_COLOR_BLEND_RATIO,
|
||||
OUTLINE_COLOR_BLEND_RATIO,
|
||||
)
|
||||
),
|
||||
error: Color = MaterialTheme.colorScheme.error,
|
||||
|
@ -1,5 +1,6 @@
|
||||
package fr.openium.consentium_ui.ui.utils
|
||||
|
||||
import android.text.ParcelableSpan
|
||||
import android.text.Spanned
|
||||
import androidx.compose.ui.text.AnnotatedString
|
||||
import androidx.compose.ui.text.SpanStyle
|
||||
@ -13,7 +14,7 @@ fun htmlToAnnotatedString(html: String): AnnotatedString {
|
||||
return buildAnnotatedString {
|
||||
val text = spanned.toString()
|
||||
var start = 0
|
||||
spanned.getSpans(0, spanned.length, Any::class.java).forEach { span ->
|
||||
spanned.getSpans(0, spanned.length, Any::class.java).map { it as ParcelableSpan }.forEach { span ->
|
||||
val startSpan = spanned.getSpanStart(span)
|
||||
val endSpan = spanned.getSpanEnd(span)
|
||||
|
||||
@ -36,7 +37,7 @@ fun htmlToAnnotatedString(html: String): AnnotatedString {
|
||||
}
|
||||
}
|
||||
|
||||
fun Any.toSpanStyle(): SpanStyle {
|
||||
fun ParcelableSpan.toSpanStyle(): SpanStyle {
|
||||
return when (this) {
|
||||
is android.text.style.StyleSpan -> {
|
||||
when (style) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user