openium/consentium.droid
0
0
Fork 0
Code Pull Requests Releases Activity

Compare commits

base: openium:86a7020c2bcd9c75b0511f525c3cb5a87dea9ef9
Branches Tags
openium:main
openium:develop
openium:develop/v1.0.0_build-2_2025-02-20-15-39
openium:develop/v1.0.0_build-1_2025-02-20-15-26
openium:develop/v1.0.0_build-1_2025-02-20-15-23
..
compare: openium:5db3391b7d4a08e5d3e93f5d8a70b2bc83e7f76b
Branches Tags
openium:develop
openium:main
openium:develop/v1.0.0_build-2_2025-02-20-15-39
openium:develop/v1.0.0_build-1_2025-02-20-15-26
openium:develop/v1.0.0_build-1_2025-02-20-15-23

1 Commits
86a7020c2b ... 5db3391b7d

Author SHA1 Message Date
Lucas
5db3391b7d feat(CON-171) : Summary consent screen 
feat(CON-172) : Detail consent screen
feat(-) : Send consent to BO to save them
 2025-01-07 11:24:28 +01:00
3 changed files with 5 additions and 6 deletions
Show Stats Expand all files Collapse all files

2
app/src/main/java/fr/openium/consentium/ui/navigation/DemoNavGraph.kt
View File

@ -91,7 +91,7 @@ fun DemoNavGraph(navHostController: NavHostController) {
}, },
consentium = Consentium( consentium = Consentium(
context = context, context = context,
applicationId = "ApplicationId", "ApplicationId",
), ),
colors = ConsentiumDefaults.colors( colors = ConsentiumDefaults.colors(
primary = Primary, primary = Primary,

4
consentium-ui/src/main/java/fr/openium/consentium_ui/ui/components/style/ConsentiumDefaults.kt
View File

@ -12,7 +12,7 @@ import androidx.core.graphics.ColorUtils
object ConsentiumDefaults { object ConsentiumDefaults {
private const val OUTLINE_COLOR_BLEND_RATIO = 0.1f private const val SURFACE_PRIMARY_COLOR_BLEND_RATIO = 0.1f
private object Typography { private object Typography {
private val DEFAULT_LINE_HEIGHT = 24.sp private val DEFAULT_LINE_HEIGHT = 24.sp
@ -101,7 +101,7 @@ object ConsentiumDefaults {
ColorUtils.blendARGB( ColorUtils.blendARGB(
onPrimary.toArgb(), onPrimary.toArgb(),
primary.toArgb(), primary.toArgb(),
OUTLINE_COLOR_BLEND_RATIO, SURFACE_PRIMARY_COLOR_BLEND_RATIO,
) )
), ),
error: Color = MaterialTheme.colorScheme.error, error: Color = MaterialTheme.colorScheme.error,

5
consentium-ui/src/main/java/fr/openium/consentium_ui/ui/utils/HtmlToAnnotatedString.kt
View File

@ -1,6 +1,5 @@
package fr.openium.consentium_ui.ui.utils package fr.openium.consentium_ui.ui.utils
import android.text.ParcelableSpan
import android.text.Spanned import android.text.Spanned
import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.text.SpanStyle import androidx.compose.ui.text.SpanStyle
@ -14,7 +13,7 @@ fun htmlToAnnotatedString(html: String): AnnotatedString {
return buildAnnotatedString { return buildAnnotatedString {
val text = spanned.toString() val text = spanned.toString()
var start = 0 var start = 0
spanned.getSpans(0, spanned.length, Any::class.java).map { it as ParcelableSpan }.forEach { span -> spanned.getSpans(0, spanned.length, Any::class.java).forEach { span ->
val startSpan = spanned.getSpanStart(span) val startSpan = spanned.getSpanStart(span)
val endSpan = spanned.getSpanEnd(span) val endSpan = spanned.getSpanEnd(span)
@ -37,7 +36,7 @@ fun htmlToAnnotatedString(html: String): AnnotatedString {
} }
} }
fun ParcelableSpan.toSpanStyle(): SpanStyle { fun Any.toSpanStyle(): SpanStyle {
return when (this) { return when (this) {
is android.text.style.StyleSpan -> { is android.text.style.StyleSpan -> {
when (style) { when (style) {