RUM-7024: Add ImageViewMapper internal constructor

DataDog · Nov 13, 2024 · 224eb7c · 224eb7c
1 parent ee99938
commit 224eb7c
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 35 deletions.
diff --git a/...lay/src/main/kotlin/com/datadog/android/sessionreplay/internal/DefaultRecorderProvider.kt b/...lay/src/main/kotlin/com/datadog/android/sessionreplay/internal/DefaultRecorderProvider.kt
@@ -41,6 +41,7 @@ import com.datadog.android.sessionreplay.internal.resources.ResourceDataStoreMan
 import com.datadog.android.sessionreplay.internal.storage.RecordWriter
 import com.datadog.android.sessionreplay.internal.storage.ResourcesWriter
 import com.datadog.android.sessionreplay.internal.time.SessionReplayTimeProvider
+import com.datadog.android.sessionreplay.internal.utils.ImageViewUtils
 import com.datadog.android.sessionreplay.recorder.OptionSelectorDetector
 import com.datadog.android.sessionreplay.recorder.mapper.EditTextMapper
 import com.datadog.android.sessionreplay.recorder.mapper.ImageViewMapper
@@ -96,10 +97,11 @@ internal class DefaultRecorderProvider(
         val viewBoundsResolver: ViewBoundsResolver = DefaultViewBoundsResolver
         val drawableToColorMapper: DrawableToColorMapper = DrawableToColorMapper.getDefault()
         val imageViewMapper = ImageViewMapper(
-            viewIdentifierResolver,
-            colorStringFormatter,
-            viewBoundsResolver,
-            drawableToColorMapper
+            viewIdentifierResolver = viewIdentifierResolver,
+            colorStringFormatter = colorStringFormatter,
+            viewBoundsResolver = viewBoundsResolver,
+            drawableToColorMapper = drawableToColorMapper,
+            imageViewUtils = ImageViewUtils
         )
         val textViewMapper = TextViewMapper<TextView>(
             viewIdentifierResolver,

diff --git a/...replay/src/main/kotlin/com/datadog/android/sessionreplay/internal/utils/ImageViewUtils.kt b/...replay/src/main/kotlin/com/datadog/android/sessionreplay/internal/utils/ImageViewUtils.kt
@@ -62,13 +62,13 @@ internal object ImageViewUtils {
     }
 
     internal fun resolveContentRectWithScaling(
-        view: ImageView,
+        imageView: ImageView,
         drawable: Drawable
     ): Rect {
         val drawableWidthPx = drawable.intrinsicWidth
         val drawableHeightPx = drawable.intrinsicHeight
 
-        val parentRect = resolveParentRectAbsPosition(view)
+        val parentRect = resolveParentRectAbsPosition(imageView)
 
         val childRect = Rect(
             0,
@@ -79,7 +79,7 @@ internal object ImageViewUtils {
 
         val resultRect: Rect
 
-        when (view.scaleType) {
+        when (imageView.scaleType) {
             ImageView.ScaleType.FIT_START -> {
                 val contentRect = scaleRectToFitParent(parentRect, childRect)
                 resultRect = positionRectAtStart(parentRect, contentRect)

diff --git a/...play/src/main/kotlin/com/datadog/android/sessionreplay/recorder/mapper/ImageViewMapper.kt b/...play/src/main/kotlin/com/datadog/android/sessionreplay/recorder/mapper/ImageViewMapper.kt
@@ -23,17 +23,38 @@ import com.datadog.android.sessionreplay.utils.ViewIdentifierResolver
 /**
  * A [WireframeMapper] implementation to map an [ImageView] component.
  */
-open class ImageViewMapper(
-    viewIdentifierResolver: ViewIdentifierResolver,
-    colorStringFormatter: ColorStringFormatter,
-    viewBoundsResolver: ViewBoundsResolver,
-    drawableToColorMapper: DrawableToColorMapper
-) : BaseAsyncBackgroundWireframeMapper<ImageView>(
-    viewIdentifierResolver,
-    colorStringFormatter,
-    viewBoundsResolver,
-    drawableToColorMapper
-) {
+open class ImageViewMapper : BaseAsyncBackgroundWireframeMapper<ImageView> {
+    private val imageViewUtils: ImageViewUtils
+
+    @Suppress("Unused") // used by external mappers
+    constructor(
+        viewIdentifierResolver: ViewIdentifierResolver,
+        colorStringFormatter: ColorStringFormatter,
+        viewBoundsResolver: ViewBoundsResolver,
+        drawableToColorMapper: DrawableToColorMapper
+    ) : this(
+        viewIdentifierResolver,
+        colorStringFormatter,
+        viewBoundsResolver,
+        drawableToColorMapper,
+        ImageViewUtils
+    )
+
+    internal constructor(
+        viewIdentifierResolver: ViewIdentifierResolver,
+        colorStringFormatter: ColorStringFormatter,
+        viewBoundsResolver: ViewBoundsResolver,
+        drawableToColorMapper: DrawableToColorMapper,
+        imageViewUtils: ImageViewUtils
+    ) : super(
+        viewIdentifierResolver,
+        colorStringFormatter,
+        viewBoundsResolver,
+        drawableToColorMapper
+    ) {
+        this.imageViewUtils = imageViewUtils
+    }
+
     @UiThread
     override fun map(
         view: ImageView,
@@ -48,17 +69,18 @@ open class ImageViewMapper(
 
         val drawable = view.drawable?.current ?: return wireframes
 
-        val parentRect = ImageViewUtils.resolveParentRectAbsPosition(view)
-        val contentRect = ImageViewUtils.resolveContentRectWithScaling(view, drawable)
+        val parentRect = imageViewUtils.resolveParentRectAbsPosition(view)
+        val contentRect = imageViewUtils.resolveContentRectWithScaling(view, drawable)
 
         val resources = view.resources
         val density = resources.displayMetrics.density
 
         val clipping = if (view.cropToPadding) {
-            ImageViewUtils.calculateClipping(parentRect, contentRect, density)
+            imageViewUtils.calculateClipping(parentRect, contentRect, density)
         } else {
             null
         }
+
         val contentXPosInDp = contentRect.left.densityNormalized(density).toLong()
         val contentYPosInDp = contentRect.top.densityNormalized(density).toLong()
         val contentWidthPx = contentRect.width()

diff --git a/...ay/src/test/kotlin/com/datadog/android/sessionreplay/internal/utils/ImageViewUtilsTest.kt b/...ay/src/test/kotlin/com/datadog/android/sessionreplay/internal/utils/ImageViewUtilsTest.kt
@@ -278,7 +278,7 @@ internal class ImageViewUtilsTest {
 
         // When
         val result = testedImageViewUtils.resolveContentRectWithScaling(
-            view = mockImageView,
+            imageView = mockImageView,
             drawable = mockDrawable
         )
 
@@ -326,7 +326,7 @@ internal class ImageViewUtilsTest {
 
         // When
         val result = testedImageViewUtils.resolveContentRectWithScaling(
-            view = mockImageView,
+            imageView = mockImageView,
             drawable = mockDrawable
         )
 
@@ -374,7 +374,7 @@ internal class ImageViewUtilsTest {
 
         // When
         val result = testedImageViewUtils.resolveContentRectWithScaling(
-            view = mockImageView,
+            imageView = mockImageView,
             drawable = mockDrawable
         )
 
@@ -422,7 +422,7 @@ internal class ImageViewUtilsTest {
 
         // When
         val result = testedImageViewUtils.resolveContentRectWithScaling(
-            view = mockImageView,
+            imageView = mockImageView,
             drawable = mockDrawable
         )
 
@@ -477,7 +477,7 @@ internal class ImageViewUtilsTest {
 
         // When
         val result = testedImageViewUtils.resolveContentRectWithScaling(
-            view = mockImageView,
+            imageView = mockImageView,
             drawable = mockDrawable
         )
 
@@ -525,7 +525,7 @@ internal class ImageViewUtilsTest {
 
         // When
         val result = testedImageViewUtils.resolveContentRectWithScaling(
-            view = mockImageView,
+            imageView = mockImageView,
             drawable = mockDrawable
         )
 
@@ -577,7 +577,7 @@ internal class ImageViewUtilsTest {
 
         // When
         val result = testedImageViewUtils.resolveContentRectWithScaling(
-            view = mockImageView,
+            imageView = mockImageView,
             drawable = mockDrawable
         )
 
@@ -627,7 +627,7 @@ internal class ImageViewUtilsTest {
 
         // When
         val result = testedImageViewUtils.resolveContentRectWithScaling(
-            view = mockImageView,
+            imageView = mockImageView,
             drawable = mockDrawable
         )
 
@@ -673,7 +673,7 @@ internal class ImageViewUtilsTest {
 
         // When
         val result = testedImageViewUtils.resolveContentRectWithScaling(
-            view = mockImageView,
+            imageView = mockImageView,
             drawable = mockDrawable
         )
 
@@ -718,7 +718,7 @@ internal class ImageViewUtilsTest {
 
         // When
         val result = testedImageViewUtils.resolveContentRectWithScaling(
-            view = mockImageView,
+            imageView = mockImageView,
             drawable = mockDrawable
         )
 

diff --git a/.../src/test/kotlin/com/datadog/android/sessionreplay/recorder/mapper/ImageViewMapperTest.kt b/.../src/test/kotlin/com/datadog/android/sessionreplay/recorder/mapper/ImageViewMapperTest.kt
@@ -193,10 +193,11 @@ internal class ImageViewMapperTest {
         )
 
         testedMapper = ImageViewMapper(
-            mockViewIdentifierResolver,
-            mockColorStringFormatter,
-            mockViewBoundsResolver,
-            mockDrawableToColorMapper
+            viewIdentifierResolver = mockViewIdentifierResolver,
+            colorStringFormatter = mockColorStringFormatter,
+            viewBoundsResolver = mockViewBoundsResolver,
+            drawableToColorMapper = mockDrawableToColorMapper,
+            imageViewUtils = stubImageViewUtils
         )
     }