Revert "Remove fill workaround, shortcut calculations if there's only one line of text"

This reverts commit cfdcadc.

Author: markushi

sentry-android-replay/src/main/java/io/sentry/android/replay/util/Nodes.kt

@@ -13,15 +13,28 @@ import androidx.compose.ui.node.LayoutNode
 import androidx.compose.ui.text.TextLayoutResult
 import kotlin.math.roundToInt
 
-internal class ComposeTextLayout(internal val layout: TextLayoutResult) : TextLayout {
+internal class ComposeTextLayout(
+  internal val layout: TextLayoutResult,
+  private val hasFillModifier: Boolean,
+) : TextLayout {
   override val lineCount: Int
     get() = layout.lineCount
 
   override val dominantTextColor: Int?
     get() = null
 
-  override fun getPrimaryHorizontal(line: Int, offset: Int) =
-    layout.getHorizontalPosition(offset, usePrimaryDirection = true)
+  override fun getPrimaryHorizontal(line: Int, offset: Int): Float {
+    val horizontalPos = layout.getHorizontalPosition(offset, usePrimaryDirection = true)
+    // when there's no `fill` modifier on a Text composable, compose still thinks that there's
+    // one and wrongly calculates horizontal position relative to node's start, not text's start
+    // for some reason. This is only the case for single-line text (multiline works fien).
+    // So we subtract line's left to get the correct position
+    return if (!hasFillModifier && lineCount == 1) {
+      horizontalPos - layout.getLineLeft(line)
+    } else {
+      horizontalPos
+    }
+  }
 
   override fun getEllipsisCount(line: Int): Int = if (layout.isLineEllipsized(line)) 1 else 0
 
@@ -79,6 +92,8 @@ internal fun Painter.isMaskable(): Boolean {
     !className.contains("Brush")
 }
 
+internal data class TextAttributes(val color: Color?, val hasFillModifier: Boolean)
+
 /**
  * This method is necessary to mask text in Compose.
  *
@@ -93,9 +108,10 @@ internal fun Painter.isMaskable(): Boolean {
  *
  * We also add special proguard rules to keep the `Text` class names and their `color` member.
  */
-internal fun LayoutNode.findColor(): Color? {
+internal fun LayoutNode.findTextAttributes(): TextAttributes {
   val modifierInfos = getModifierInfo()
   var color: Color? = null
+  var hasFillModifier = false
   for (index in modifierInfos.indices) {
     val modifier = modifierInfos[index].modifier
     val modifierClassName = modifier::class.java.name
@@ -111,9 +127,11 @@ internal fun LayoutNode.findColor(): Color? {
         } catch (e: Throwable) {
           null
         }
+    } else if (modifierClassName.contains("Fill")) {
+      hasFillModifier = true
     }
   }
-  return color
+  return TextAttributes(color, hasFillModifier)
 }
 
 /**

sentry-android-replay/src/main/java/io/sentry/android/replay/util/Views.kt

@@ -122,8 +122,7 @@ internal fun TextLayout?.getVisibleRects(
   paddingLeft: Int,
   paddingTop: Int,
 ): List<Rect> {
-
-  if (this == null || lineCount <= 1) {
+  if (this == null) {
     return listOf(globalRect)
   }
 

sentry-android-replay/src/main/java/io/sentry/android/replay/viewhierarchy/ComposeViewHierarchyNode.kt

@@ -23,8 +23,8 @@ import io.sentry.SentryMaskingOptions
 import io.sentry.android.replay.SentryReplayModifiers
 import io.sentry.android.replay.util.ComposeTextLayout
 import io.sentry.android.replay.util.boundsInWindow
-import io.sentry.android.replay.util.findColor
 import io.sentry.android.replay.util.findPainter
+import io.sentry.android.replay.util.findTextAttributes
 import io.sentry.android.replay.util.isMaskable
 import io.sentry.android.replay.util.toOpaque
 import io.sentry.android.replay.viewhierarchy.ViewHierarchyNode.GenericViewHierarchyNode
@@ -189,10 +189,11 @@ internal object ComposeViewHierarchyNode {
           ?.action
           ?.invoke(textLayoutResults)
 
+        val (color, hasFillModifier) = node.findTextAttributes()
         val textLayoutResult = textLayoutResults.firstOrNull()
         var textColor = textLayoutResult?.layoutInput?.style?.color
         if (textColor?.isUnspecified == true) {
-          textColor = node.findColor()
+          textColor = color
         }
         val isLaidOut = textLayoutResult?.layoutInput?.style?.fontSize != TextUnit.Unspecified
         // TODO: support editable text (currently there's a way to get @Composable's padding only
@@ -201,7 +202,7 @@ internal object ComposeViewHierarchyNode {
         TextViewHierarchyNode(
           layout =
             if (textLayoutResult != null && !isEditable && isLaidOut) {
-              ComposeTextLayout(textLayoutResult)
+              ComposeTextLayout(textLayoutResult, hasFillModifier)
             } else {
               null
             },