fix: add target text tracking for Android views

amplitude · Aug 13, 2024 · 05d331c · 05d331c
1 parent a160e30
commit 05d331c
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 2 deletions.
diff --git a/android/src/main/java/com/amplitude/android/internal/ViewTarget.kt b/android/src/main/java/com/amplitude/android/internal/ViewTarget.kt
@@ -14,6 +14,7 @@ data class ViewTarget(
     val className: String?,
     val resourceName: String?,
     val tag: String?,
+    val text: String?,
     val source: String,
     val hierarchy: String?,
 ) {

diff --git a/android/src/main/java/com/amplitude/android/internal/gestures/AutocaptureGestureListener.kt b/android/src/main/java/com/amplitude/android/internal/gestures/AutocaptureGestureListener.kt
@@ -15,6 +15,7 @@ import com.amplitude.android.utilities.DefaultEventUtils.EventProperties.TARGET_
 import com.amplitude.android.utilities.DefaultEventUtils.EventProperties.TARGET_RESOURCE
 import com.amplitude.android.utilities.DefaultEventUtils.EventProperties.TARGET_SOURCE
 import com.amplitude.android.utilities.DefaultEventUtils.EventProperties.TARGET_TAG
+import com.amplitude.android.utilities.DefaultEventUtils.EventProperties.TARGET_TEXT
 import com.amplitude.android.utilities.DefaultEventUtils.EventTypes.ELEMENT_INTERACTED
 import com.amplitude.common.Logger
 import java.lang.ref.WeakReference
@@ -51,6 +52,7 @@ class AutocaptureGestureListener(
             TARGET_CLASS to target.className,
             TARGET_RESOURCE to target.resourceName,
             TARGET_TAG to target.tag,
+            TARGET_TEXT to target.text,
             TARGET_SOURCE to
                 target.source
                     .replace("_", " ")

diff --git a/android/src/main/java/com/amplitude/android/internal/locators/AndroidViewTargetLocator.kt b/android/src/main/java/com/amplitude/android/internal/locators/AndroidViewTargetLocator.kt
@@ -1,6 +1,7 @@
 package com.amplitude.android.internal.locators
 
 import android.view.View
+import android.widget.TextView
 import com.amplitude.android.internal.ViewResourceUtils.resourceIdWithFallback
 import com.amplitude.android.internal.ViewTarget
 import com.amplitude.android.internal.ViewTarget.Type
@@ -27,7 +28,8 @@ internal class AndroidViewTargetLocator : ViewTargetLocator {
         val className = javaClass.canonicalName ?: javaClass.simpleName ?: null
         val resourceName = resourceIdWithFallback
         val hierarchy = hierarchy
-        return ViewTarget(this, className, resourceName, null, SOURCE, hierarchy)
+        val text = (this as? TextView)?.text?.toString()
+        return ViewTarget(this, className, resourceName, tag as? String, text, SOURCE, hierarchy)
     }
 
     private fun View.touchWithinBounds(position: Pair<Float, Float>): Boolean {

diff --git a/android/src/main/java/com/amplitude/android/internal/locators/ComposeViewTargetLocator.java b/android/src/main/java/com/amplitude/android/internal/locators/ComposeViewTargetLocator.java
@@ -107,7 +107,7 @@ public ViewTarget locate(
         if (targetTag == null) {
             return null;
         } else {
-            return new ViewTarget(null, null, null, targetTag, SOURCE, null);
+            return new ViewTarget(null, null, null, targetTag, null, SOURCE, null);
         }
     }
 

diff --git a/android/src/main/java/com/amplitude/android/utilities/DefaultEventUtils.kt b/android/src/main/java/com/amplitude/android/utilities/DefaultEventUtils.kt
@@ -38,6 +38,7 @@ class DefaultEventUtils(private val amplitude: Amplitude) {
         const val TARGET_CLASS = "[Amplitude] Target Class"
         const val TARGET_RESOURCE = "[Amplitude] Target Resource"
         const val TARGET_TAG = "[Amplitude] Target Tag"
+        const val TARGET_TEXT = "[Amplitude] Target Text"
         const val TARGET_SOURCE = "[Amplitude] Target Source"
         const val HIERARCHY = "[Amplitude] Hierarchy"
     }

diff --git a/.../test/java/com/amplitude/android/internal/gestures/AutocaptureGestureListenerClickTest.kt b/.../test/java/com/amplitude/android/internal/gestures/AutocaptureGestureListenerClickTest.kt
@@ -146,6 +146,7 @@ class AutocaptureGestureListenerClickTest {
                     "[Amplitude] Target Class" to "android.view.View",
                     "[Amplitude] Target Resource" to "test_button",
                     "[Amplitude] Target Tag" to null,
+                    "[Amplitude] Target Text" to null,
                     "[Amplitude] Target Source" to "Android View",
                     "[Amplitude] Hierarchy" to "View",
                     "[Amplitude] Screen Name" to null,