feedback

Author: bjdodson-openai

android-sample/src/main/java/com/zachklipp/richtext/sample/Demo.kt

@@ -74,7 +74,7 @@ import com.halilibo.richtext.ui.string.withFormat
     val dottedLinkDecorations = RichTextDecorations(
       linkDecorations = listOf(
         LinkDecoration(
-          matcher = { destination -> destination.contains("dotted") },
+          matcher = { destination, _ -> destination.contains("dotted") },
           underlineStyle = UnderlineStyle.Dotted(),
           linkStyleOverride = { base ->
             TextLinkStyles(

android-sample/src/main/java/com/zachklipp/richtext/sample/MarkdownSample.kt

@@ -132,11 +132,11 @@ import com.halilibo.richtext.ui.string.UnderlineStyle
             RichTextDecorations(
               linkDecorations = listOf(
                 LinkDecoration(
-                  matcher = { destination -> destination.contains("dotted") },
+                  matcher = { destination, _ -> destination.contains("dotted") },
                   underlineStyle = UnderlineStyle.Dotted(),
                 ),
                 LinkDecoration(
-                  matcher = { destination -> destination.contains("dashed") },
+                  matcher = { destination, _ -> destination.contains("dashed") },
                   underlineStyle = UnderlineStyle.Dashed(),
                 ),
               ),

richtext-ui/src/commonMain/kotlin/com/halilibo/richtext/ui/string/LinkDecorations.kt

@@ -8,7 +8,7 @@ import androidx.compose.ui.text.TextLinkStyles
  * Defines how specific links should be decorated based on their destination.
  */
 public data class LinkDecoration(
-  val matcher: (String) -> Boolean,
+  val matcher: (destination: String, text: String) -> Boolean,
   val underlineStyle: UnderlineStyle = UnderlineStyle.Solid,
   val linkStyleOverride: ((TextLinkStyles?) -> TextLinkStyles)? = null,
 )

richtext-ui/src/commonMain/kotlin/com/halilibo/richtext/ui/string/RichTextString.kt

@@ -183,9 +183,9 @@ public class RichTextString internal constructor(
       // And apply their actual SpanStyles to the string.
       tags.forEach { range ->
         val format = Format.findTag(range.item, formatObjects) ?: return@forEach
-        when (format) {
-          is Format.Link -> {
-            val decoration = decorations.findLinkDecoration(format.destination)
+        if (format is Format.Link) {
+          val linkText = taggedString.text.substring(range.start, range.end)
+          val decoration = decorations.findLinkDecoration(format.destination, linkText)
             val linkStyle = decoration?.linkStyleOverride
               ?.invoke(style.linkStyle)
               ?: style.linkStyle
@@ -200,17 +200,15 @@ public class RichTextString internal constructor(
               linkInteractionListener = format.linkInteractionListener,
             )
             addLink(linkAnnotation, range.start, range.end)
-          }
-          else -> {
-            format.getAnnotation(style, contentColor)
-              ?.let { annotation ->
-                if (annotation is SpanStyle) {
-                  addStyle(annotation, range.start, range.end)
-                } else if (annotation is LinkAnnotation.Url) {
-                  addLink(annotation, range.start, range.end)
-                }
+        } else {
+          format.getAnnotation(style, contentColor)
+            ?.let { annotation ->
+              if (annotation is SpanStyle) {
+                addStyle(annotation, range.start, range.end)
+              } else if (annotation is LinkAnnotation.Url) {
+                addLink(annotation, range.start, range.end)
               }
-          }
+            }
         }
       }
     }
@@ -238,7 +236,8 @@ public class RichTextString internal constructor(
         val format = Format.findTag(range.item, formatObjects)
           as? Format.Link
           ?: return@mapNotNull null
-        val decoration = decorations.findLinkDecoration(format.destination)
+        val linkText = taggedString.text.substring(range.start, range.end)
+        val decoration = decorations.findLinkDecoration(format.destination, linkText)
           ?: return@mapNotNull null
         if (decoration.underlineStyle is UnderlineStyle.Solid) return@mapNotNull null
         DecoratedLinkRange(
@@ -507,8 +506,10 @@ internal data class DecoratedLinkRange(
   val linkStyleOverride: ((TextLinkStyles?) -> TextLinkStyles)?,
 )
 
-private fun RichTextDecorations.findLinkDecoration(destination: String): LinkDecoration? =
-  linkDecorations.firstOrNull { it.matcher(destination) }
+private fun RichTextDecorations.findLinkDecoration(
+  destination: String,
+  text: String,
+): LinkDecoration? = linkDecorations.firstOrNull { it.matcher(destination, text) }
 
 private fun TextLinkStyles?.withoutUnderline(): TextLinkStyles? {
   if (this == null) return null

richtext-ui/src/commonMain/kotlin/com/halilibo/richtext/ui/string/Text.kt

@@ -27,14 +27,14 @@ import androidx.compose.ui.graphics.ShaderBrush
 import androidx.compose.ui.graphics.StrokeCap
 import androidx.compose.ui.graphics.isSpecified
 import androidx.compose.ui.layout.layout
-import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.TextLayoutResult
 import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.Constraints
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.util.fastForEach
 import com.halilibo.richtext.ui.RichTextScope
 import com.halilibo.richtext.ui.Text
 import com.halilibo.richtext.ui.currentContentColor
@@ -45,6 +45,7 @@ import com.halilibo.richtext.ui.util.segmentIntoPhrases
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlin.math.pow
+import kotlin.math.roundToInt
 import kotlin.time.Duration.Companion.milliseconds
 
 /**
@@ -67,7 +68,6 @@ public fun RichTextScope.Text(
 ) {
   val style = currentRichTextStyle.stringStyle
   val contentColor = currentContentColor
-  val density = LocalDensity.current
   val resolvedStyle = remember(style) {
     (style ?: RichTextStringStyle.Default).resolveDefaults()
   }
@@ -97,14 +97,13 @@ public fun RichTextScope.Text(
     Modifier.drawWithContent {
       drawContent()
       val layoutResult = textLayoutResult ?: return@drawWithContent
-      underlineSpecs.forEach { spec ->
+      underlineSpecs.fastForEach { spec ->
         drawUnderline(
           layoutResult = layoutResult,
           start = spec.range.start,
           end = spec.range.end,
           underlineStyle = spec.range.underlineStyle,
           color = spec.color,
-          density = density,
         )
       }
     }
@@ -176,7 +175,6 @@ private fun androidx.compose.ui.graphics.drawscope.DrawScope.drawUnderline(
   end: Int,
   underlineStyle: UnderlineStyle,
   color: Color,
-  density: androidx.compose.ui.unit.Density,
 ) {
   val textLength = layoutResult.layoutInput.text.text.length
   val clampedStart = start.coerceIn(0, textLength)
@@ -188,7 +186,7 @@ private fun androidx.compose.ui.graphics.drawscope.DrawScope.drawUnderline(
   val pathEffect: PathEffect?
   val cap: StrokeCap
 
-  with(density) {
+  with(this) {
     when (underlineStyle) {
       is UnderlineStyle.Solid -> {
         strokeWidthPx = 1.dp.toPx()
@@ -226,9 +224,9 @@ private fun androidx.compose.ui.graphics.drawscope.DrawScope.drawUnderline(
 
     val startBox = layoutResult.getBoundingBox(segmentStart)
     val endBox = layoutResult.getBoundingBox(segmentEnd - 1)
-    val y = maxOf(startBox.bottom, endBox.bottom) + offsetPx
-    val xStart = startBox.left
-    val xEnd = endBox.right
+    val y = (maxOf(startBox.bottom, endBox.bottom) + offsetPx).roundToInt().toFloat()
+    val xStart = startBox.left.roundToInt().toFloat()
+    val xEnd = endBox.right.roundToInt().toFloat()
 
     drawLine(
       color = color,