Fix reflection in annotated strings

Author: florentmaitre

core/src/androidHostTest/kotlin/com/orange/ouds/core/component/common/text/OudsAnnotatedStringTest.kt

@@ -720,7 +720,11 @@ class OudsAnnotatedStringTest {
     //endregion
 }
 
-private class TestAnnotatedString(private val annotatedString: AnnotatedString) : OudsAnnotatedString<TestAnnotatedString>(annotatedString) {
+private class TestAnnotatedString(annotatedString: AnnotatedString) : OudsAnnotatedString<TestAnnotatedString>(annotatedString) {
+
+    override fun transform(transform: (AnnotatedString) -> AnnotatedString): TestAnnotatedString {
+        return TestAnnotatedString(transform(annotatedString))
+    }
 
     val spanStyles: List<AnnotatedString.Range<SpanStyle>> = annotatedString.spanStyles
 
@@ -730,7 +734,7 @@ private class TestAnnotatedString(private val annotatedString: AnnotatedString)
 
     fun getStrongAnnotations(): List<AnnotatedString.Range<String>> = getStringAnnotations().filter { it.item == StrongAnnotation }
 
-    class Builder(capacity: Int = 16) : OudsAnnotatedString.Builder<TestAnnotatedString>(capacity, TestAnnotatedString::class.java), StrongBuilder,
+    class Builder(capacity: Int = 16) : OudsAnnotatedString.Builder<TestAnnotatedString>(capacity), StrongBuilder,
         LinkBuilder {
 
         constructor(text: String) : this() {
@@ -741,6 +745,10 @@ private class TestAnnotatedString(private val annotatedString: AnnotatedString)
             append(text)
         }
 
+        override fun toAnnotatedString(): TestAnnotatedString {
+            return TestAnnotatedString(builder.toAnnotatedString())
+        }
+
         override fun addStrong(start: Int, end: Int) = addStrongImpl(start, end)
 
         override fun pushStrong(): Int = pushStrongImpl()
@@ -754,5 +762,5 @@ private class TestAnnotatedString(private val annotatedString: AnnotatedString)
 }
 
 private fun buildTestAnnotatedString(builder: (TestAnnotatedString.Builder).() -> Unit): TestAnnotatedString {
-    return buildOudsAnnotatedString<TestAnnotatedString, TestAnnotatedString.Builder>(builder)
+    return buildOudsAnnotatedString({ TestAnnotatedString.Builder() }, builder)
 }

core/src/commonMain/kotlin/com/orange/ouds/core/component/InteractionValuesIndicationNodeFactory.kt

@@ -33,6 +33,7 @@ import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
+import kotlin.jvm.JvmName
 
 internal fun interactionValuesIndication(vararg interactionValues: InteractionValue<*, *>): IndicationNodeFactory =
     InteractionValuesIndicationNodeFactory(values = interactionValues.toList())

core/src/commonMain/kotlin/com/orange/ouds/core/component/common/text/OudsAnnotatedAlertMessageBulletListLabel.kt

@@ -44,6 +44,10 @@ import androidx.compose.ui.text.AnnotatedString
 class OudsAnnotatedAlertMessageBulletListLabel internal constructor(annotatedString: AnnotatedString) :
     OudsAnnotatedString<OudsAnnotatedAlertMessageBulletListLabel>(annotatedString) {
 
+    override fun transform(transform: (AnnotatedString) -> AnnotatedString): OudsAnnotatedAlertMessageBulletListLabel {
+        return OudsAnnotatedAlertMessageBulletListLabel(transform(annotatedString))
+    }
+
     /**
      * Builder for creating [OudsAnnotatedAlertMessageBulletListLabel] with strong text and link formatting.
      *
@@ -54,7 +58,7 @@ class OudsAnnotatedAlertMessageBulletListLabel internal constructor(annotatedStr
      * @param capacity Initial capacity for the underlying string builder. Defaults to 16.
      */
     class Builder(capacity: Int = 16) :
-        OudsAnnotatedString.Builder<OudsAnnotatedAlertMessageBulletListLabel>(capacity, OudsAnnotatedAlertMessageBulletListLabel::class.java),
+        OudsAnnotatedString.Builder<OudsAnnotatedAlertMessageBulletListLabel>(capacity),
         StrongBuilder, LinkBuilder {
 
         /**
@@ -84,6 +88,10 @@ class OudsAnnotatedAlertMessageBulletListLabel internal constructor(annotatedStr
             append(text)
         }
 
+        override fun toAnnotatedString(): OudsAnnotatedAlertMessageBulletListLabel {
+            return OudsAnnotatedAlertMessageBulletListLabel(builder.toAnnotatedString())
+        }
+
         override fun addStrong(start: Int, end: Int) = addStrongImpl(start, end)
 
         override fun pushStrong(): Int = pushStrongImpl()
@@ -111,5 +119,5 @@ class OudsAnnotatedAlertMessageBulletListLabel internal constructor(annotatedStr
  * @return The constructed annotated alert message bullet list label.
  */
 fun buildOudsAnnotatedAlertMessageBulletListLabel(builder: (OudsAnnotatedAlertMessageBulletListLabel.Builder).() -> Unit): OudsAnnotatedAlertMessageBulletListLabel {
-    return buildOudsAnnotatedString<OudsAnnotatedAlertMessageBulletListLabel, OudsAnnotatedAlertMessageBulletListLabel.Builder>(builder)
+    return buildOudsAnnotatedString({ OudsAnnotatedAlertMessageBulletListLabel.Builder() }, builder)
 }

core/src/commonMain/kotlin/com/orange/ouds/core/component/common/text/OudsAnnotatedAlertMessageDescription.kt

@@ -41,6 +41,10 @@ import androidx.compose.ui.text.AnnotatedString
 class OudsAnnotatedAlertMessageDescription internal constructor(annotatedString: AnnotatedString) :
     OudsAnnotatedString<OudsAnnotatedAlertMessageDescription>(annotatedString) {
 
+    override fun transform(transform: (AnnotatedString) -> AnnotatedString): OudsAnnotatedAlertMessageDescription {
+        return OudsAnnotatedAlertMessageDescription(transform(annotatedString))
+    }
+
     /**
      * Builder for creating [OudsAnnotatedAlertMessageDescription] with strong text and link formatting.
      *
@@ -51,7 +55,7 @@ class OudsAnnotatedAlertMessageDescription internal constructor(annotatedString:
      * @param capacity Initial capacity for the underlying string builder. Defaults to 16.
      */
     class Builder(capacity: Int = 16) :
-        OudsAnnotatedString.Builder<OudsAnnotatedAlertMessageDescription>(capacity, OudsAnnotatedAlertMessageDescription::class.java),
+        OudsAnnotatedString.Builder<OudsAnnotatedAlertMessageDescription>(capacity),
         StrongBuilder, LinkBuilder {
 
         /**
@@ -81,6 +85,10 @@ class OudsAnnotatedAlertMessageDescription internal constructor(annotatedString:
             append(text)
         }
 
+        override fun toAnnotatedString(): OudsAnnotatedAlertMessageDescription {
+            return OudsAnnotatedAlertMessageDescription(builder.toAnnotatedString())
+        }
+
         override fun addStrong(start: Int, end: Int) = addStrongImpl(start, end)
 
         override fun pushStrong(): Int = pushStrongImpl()
@@ -112,5 +120,5 @@ class OudsAnnotatedAlertMessageDescription internal constructor(annotatedString:
  * @return The constructed annotated alert message description.
  */
 fun buildOudsAnnotatedAlertMessageDescription(builder: (OudsAnnotatedAlertMessageDescription.Builder).() -> Unit): OudsAnnotatedAlertMessageDescription {
-    return buildOudsAnnotatedString<OudsAnnotatedAlertMessageDescription, OudsAnnotatedAlertMessageDescription.Builder>(builder)
+    return buildOudsAnnotatedString({ OudsAnnotatedAlertMessageDescription.Builder() }, builder)
 }

core/src/commonMain/kotlin/com/orange/ouds/core/component/common/text/OudsAnnotatedBulletListLabel.kt

@@ -39,6 +39,10 @@ import androidx.compose.ui.text.AnnotatedString
 class OudsAnnotatedBulletListLabel internal constructor(annotatedString: AnnotatedString) :
     OudsAnnotatedString<OudsAnnotatedBulletListLabel>(annotatedString) {
 
+    override fun transform(transform: (AnnotatedString) -> AnnotatedString): OudsAnnotatedBulletListLabel {
+        return OudsAnnotatedBulletListLabel(transform(annotatedString))
+    }
+
     /**
      * Builder for creating [OudsAnnotatedBulletListLabel] with strong text and link formatting.
      *
@@ -49,7 +53,7 @@ class OudsAnnotatedBulletListLabel internal constructor(annotatedString: Annotat
      * @param capacity Initial capacity for the underlying string builder. Defaults to 16.
      */
     class Builder(capacity: Int = 16) :
-        OudsAnnotatedString.Builder<OudsAnnotatedBulletListLabel>(capacity, OudsAnnotatedBulletListLabel::class.java),
+        OudsAnnotatedString.Builder<OudsAnnotatedBulletListLabel>(capacity),
         StrongBuilder, LinkBuilder {
 
         /**
@@ -79,6 +83,10 @@ class OudsAnnotatedBulletListLabel internal constructor(annotatedString: Annotat
             append(text)
         }
 
+        override fun toAnnotatedString(): OudsAnnotatedBulletListLabel {
+            return OudsAnnotatedBulletListLabel(builder.toAnnotatedString())
+        }
+
         override fun addStrong(start: Int, end: Int) = addStrongImpl(start, end)
 
         override fun pushStrong(): Int = pushStrongImpl()
@@ -108,5 +116,5 @@ class OudsAnnotatedBulletListLabel internal constructor(annotatedString: Annotat
  * @return The constructed annotated bullet list label.
  */
 fun buildOudsAnnotatedBulletListLabel(builder: (OudsAnnotatedBulletListLabel.Builder).() -> Unit): OudsAnnotatedBulletListLabel {
-    return buildOudsAnnotatedString<OudsAnnotatedBulletListLabel, OudsAnnotatedBulletListLabel.Builder>(builder)
+    return buildOudsAnnotatedString({ OudsAnnotatedBulletListLabel.Builder() }, builder)
 }

core/src/commonMain/kotlin/com/orange/ouds/core/component/common/text/OudsAnnotatedErrorMessage.kt

@@ -40,6 +40,10 @@ import androidx.compose.ui.text.AnnotatedString
  */
 class OudsAnnotatedErrorMessage internal constructor(annotatedString: AnnotatedString) : OudsAnnotatedString<OudsAnnotatedErrorMessage>(annotatedString) {
 
+    override fun transform(transform: (AnnotatedString) -> AnnotatedString): OudsAnnotatedErrorMessage {
+        return OudsAnnotatedErrorMessage(transform(annotatedString))
+    }
+
     /**
      * Builder for creating [OudsAnnotatedErrorMessage] with strong text formatting.
      *
@@ -48,7 +52,7 @@ class OudsAnnotatedErrorMessage internal constructor(annotatedString: AnnotatedS
      *
      * @param capacity Initial capacity for the underlying string builder. Defaults to 16.
      */
-    class Builder(capacity: Int = 16) : OudsAnnotatedString.Builder<OudsAnnotatedErrorMessage>(capacity, OudsAnnotatedErrorMessage::class.java),
+    class Builder(capacity: Int = 16) : OudsAnnotatedString.Builder<OudsAnnotatedErrorMessage>(capacity),
         StrongBuilder {
 
         /**
@@ -78,6 +82,10 @@ class OudsAnnotatedErrorMessage internal constructor(annotatedString: AnnotatedS
             append(text)
         }
 
+        override fun toAnnotatedString(): OudsAnnotatedErrorMessage {
+            return OudsAnnotatedErrorMessage(builder.toAnnotatedString())
+        }
+
         override fun addStrong(start: Int, end: Int) = addStrongImpl(start, end)
 
         override fun pushStrong(): Int = pushStrongImpl()
@@ -99,5 +107,5 @@ class OudsAnnotatedErrorMessage internal constructor(annotatedString: AnnotatedS
  * @return The constructed annotated error message.
  */
 fun buildOudsAnnotatedErrorMessage(builder: (OudsAnnotatedErrorMessage.Builder).() -> Unit): OudsAnnotatedErrorMessage {
-    return buildOudsAnnotatedString<OudsAnnotatedErrorMessage, OudsAnnotatedErrorMessage.Builder>(builder)
+    return buildOudsAnnotatedString({ OudsAnnotatedErrorMessage.Builder() }, builder)
 }

core/src/commonMain/kotlin/com/orange/ouds/core/component/common/text/OudsAnnotatedHelperText.kt

@@ -38,6 +38,10 @@ import androidx.compose.ui.text.AnnotatedString
  */
 class OudsAnnotatedHelperText internal constructor(annotatedString: AnnotatedString) : OudsAnnotatedString<OudsAnnotatedHelperText>(annotatedString) {
 
+    override fun transform(transform: (AnnotatedString) -> AnnotatedString): OudsAnnotatedHelperText {
+        return OudsAnnotatedHelperText(transform(annotatedString))
+    }
+
     /**
      * Builder for creating [OudsAnnotatedHelperText] with strong text formatting.
      *
@@ -46,7 +50,7 @@ class OudsAnnotatedHelperText internal constructor(annotatedString: AnnotatedStr
      *
      * @param capacity Initial capacity for the underlying string builder. Defaults to 16.
      */
-    class Builder(capacity: Int = 16) : OudsAnnotatedString.Builder<OudsAnnotatedHelperText>(capacity, OudsAnnotatedHelperText::class.java), StrongBuilder {
+    class Builder(capacity: Int = 16) : OudsAnnotatedString.Builder<OudsAnnotatedHelperText>(capacity), StrongBuilder {
 
         /**
          * Creates a builder initialized with plain text.
@@ -74,7 +78,11 @@ class OudsAnnotatedHelperText internal constructor(annotatedString: AnnotatedStr
         constructor(text: AnnotatedString) : this() {
             append(text)
         }
-        
+
+        override fun toAnnotatedString(): OudsAnnotatedHelperText {
+            return OudsAnnotatedHelperText(builder.toAnnotatedString())
+        }
+
         override fun addStrong(start: Int, end: Int) = addStrongImpl(start, end)
 
         override fun pushStrong(): Int = pushStrongImpl()
@@ -97,5 +105,5 @@ class OudsAnnotatedHelperText internal constructor(annotatedString: AnnotatedStr
  * @return The constructed annotated helper text.
  */
 fun buildOudsAnnotatedHelperText(builder: (OudsAnnotatedHelperText.Builder).() -> Unit): OudsAnnotatedHelperText {
-    return buildOudsAnnotatedString<OudsAnnotatedHelperText, OudsAnnotatedHelperText.Builder>(builder)
+    return buildOudsAnnotatedString({ OudsAnnotatedHelperText.Builder() }, builder)
 }