refactor(samples): Convert main screen to Jetpack Compose

CHANGELOG.md

@@ -6,6 +6,10 @@
 
 - Update Android targetSdk to API 36 (Android 16) ([#5016](https://github.com/getsentry/sentry-java/pull/5016))
 
+### Fixes
+
+- Fix scroll target detection for Jetpack Compose ([#5017](https://github.com/getsentry/sentry-java/pull/5017))
+
 ### Internal
 
 - Establish new native exception mechanisms to differentiate events generated by `sentry-native` from `ApplicationExitInfo`. ([#5052](https://github.com/getsentry/sentry-java/pull/5052))

gradle.properties

@@ -9,6 +9,7 @@ org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
 
 # AndroidX required by AGP >= 3.6.x
 android.useAndroidX=true
+android.experimental.lint.version=8.9.0
 
 # Release information
 versionName=8.31.0

gradle/libs.versions.toml

@@ -82,7 +82,9 @@ androidx-annotation = { module = "androidx.annotation:annotation", version = "1.
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version = "1.8.2" }
 androidx-compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "androidxCompose" }
 androidx-compose-foundation-layout = { module = "androidx.compose.foundation:foundation-layout", version.ref = "androidxCompose" }
-androidx-compose-material3 = { module = "androidx.compose.material3:material3", version = "1.2.1" }
+androidx-compose-material3 = { module = "androidx.compose.material3:material3", version = "1.4.0" }
+androidx-compose-material-icons-core = { module = "androidx.compose.material:material-icons-core", version="1.7.8" }
+androidx-compose-material-icons-extended = { module = "androidx.compose.material:material-icons-extended", version="1.7.8" }
 androidx-compose-ui = { module = "androidx.compose.ui:ui", version.ref = "androidxCompose" }
 # Note: don't change without testing forwards compatibility
 androidx-compose-ui-replay = { module = "androidx.compose.ui:ui", version = "1.5.0" }

sentry-android-replay/src/main/java/io/sentry/android/replay/ScreenshotRecorder.kt

@@ -22,7 +22,7 @@ import java.lang.ref.WeakReference
 import java.util.concurrent.atomic.AtomicBoolean
 import kotlin.math.roundToInt
 
-@SuppressLint("UseKtx")
+@SuppressLint("UseKtx", "UseRequiresApi")
 @TargetApi(26)
 internal class ScreenshotRecorder(
   val config: ScreenshotRecorderConfig,

sentry-android-replay/src/main/java/io/sentry/android/replay/WindowRecorder.kt

@@ -1,5 +1,6 @@
 package io.sentry.android.replay
 
+import android.annotation.SuppressLint
 import android.annotation.TargetApi
 import android.graphics.Point
 import android.os.Handler
@@ -19,6 +20,7 @@ import java.lang.ref.WeakReference
 import java.util.concurrent.ScheduledExecutorService
 import java.util.concurrent.atomic.AtomicBoolean
 
+@SuppressLint("UseRequiresApi")
 @TargetApi(26)
 internal class WindowRecorder(
   private val options: SentryOptions,

sentry-android-replay/src/main/java/io/sentry/android/replay/capture/BaseCaptureStrategy.kt

@@ -1,5 +1,6 @@
 package io.sentry.android.replay.capture
 
+import android.annotation.SuppressLint
 import android.annotation.TargetApi
 import android.view.MotionEvent
 import io.sentry.Breadcrumb
@@ -42,6 +43,7 @@ import java.util.concurrent.atomic.AtomicReference
 import kotlin.properties.ReadWriteProperty
 import kotlin.reflect.KProperty
 
+@SuppressLint("UseRequiresApi")
 @TargetApi(26)
 internal abstract class BaseCaptureStrategy(
   private val options: SentryOptions,

sentry-android-replay/src/main/java/io/sentry/android/replay/capture/BufferCaptureStrategy.kt

@@ -1,5 +1,6 @@
 package io.sentry.android.replay.capture
 
+import android.annotation.SuppressLint
 import android.annotation.TargetApi
 import android.graphics.Bitmap
 import android.view.MotionEvent
@@ -24,6 +25,7 @@ import java.io.File
 import java.util.Date
 import java.util.concurrent.ScheduledExecutorService
 
+@SuppressLint("UseRequiresApi")
 @TargetApi(26)
 internal class BufferCaptureStrategy(
   private val options: SentryOptions,

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

@@ -1,5 +1,6 @@
 package io.sentry.android.replay.util
 
+import android.annotation.SuppressLint
 import android.annotation.TargetApi
 import io.sentry.ReplayRecording
 import io.sentry.SentryOptions
@@ -12,6 +13,7 @@ import java.util.concurrent.ScheduledExecutorService
 
 // TODO: enable this back after we are able to serialize individual touches to disk to not overload
 // cpu
+@SuppressLint("UseRequiresApi")
 @Suppress("unused")
 @TargetApi(26)
 internal class PersistableLinkedList(

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

@@ -28,6 +28,7 @@ import java.lang.NullPointerException
  * Recursively traverses the view hierarchy and creates a [ViewHierarchyNode] for each view.
  * Supports Compose view hierarchy as well.
  */
+@SuppressLint("UseKtx")
 internal fun View.traverse(parentNode: ViewHierarchyNode, options: SentryOptions) {
   if (this !is ViewGroup) {
     return
@@ -87,7 +88,7 @@ internal fun View.isVisibleToUser(): Pair<Boolean, Rect?> {
   return false to null
 }
 
-@SuppressLint("ObsoleteSdkInt")
+@SuppressLint("ObsoleteSdkInt", "UseRequiresApi")
 @TargetApi(21)
 internal fun Drawable?.isMaskable(): Boolean {
   // TODO: maybe find a way how to check if the drawable is coming from the apk or loaded from

sentry-android-replay/src/main/java/io/sentry/android/replay/video/SimpleVideoEncoder.kt

@@ -27,6 +27,7 @@
  */
 package io.sentry.android.replay.video
 
+import android.annotation.SuppressLint
 import android.annotation.TargetApi
 import android.graphics.Bitmap
 import android.media.MediaCodec
@@ -44,6 +45,7 @@ import kotlin.LazyThreadSafetyMode.NONE
 
 private const val TIMEOUT_USEC = 100_000L
 
+@SuppressLint("UseRequiresApi")
 @TargetApi(26)
 internal class SimpleVideoEncoder(
   val options: SentryOptions,
@@ -295,6 +297,7 @@ internal class SimpleVideoEncoder(
   }
 }
 
+@SuppressLint("UseRequiresApi")
 @TargetApi(24)
 internal data class MuxerConfig(
   val file: File,

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

@@ -2,6 +2,7 @@
 
 package io.sentry.android.replay.viewhierarchy
 
+import android.annotation.SuppressLint
 import android.annotation.TargetApi
 import android.view.View
 import androidx.compose.ui.graphics.isUnspecified
@@ -32,6 +33,7 @@ import io.sentry.android.replay.viewhierarchy.ViewHierarchyNode.TextViewHierarch
 import java.lang.ref.WeakReference
 import java.lang.reflect.Method
 
+@SuppressLint("UseRequiresApi")
 @TargetApi(26)
 internal object ComposeViewHierarchyNode {
   private val getSemanticsConfigurationMethod: Method? by lazy {

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

@@ -1,5 +1,6 @@
 package io.sentry.android.replay.viewhierarchy
 
+import android.annotation.SuppressLint
 import android.annotation.TargetApi
 import android.graphics.Rect
 import android.view.View
@@ -15,6 +16,7 @@ import io.sentry.android.replay.util.isVisibleToUser
 import io.sentry.android.replay.util.toOpaque
 import io.sentry.android.replay.util.totalPaddingTopSafe
 
+@SuppressLint("UseRequiresApi")
 @TargetApi(26)
 internal sealed class ViewHierarchyNode(
   val x: Float,

sentry-android-replay/src/test/java/io/sentry/android/replay/viewhierarchy/ComposeMaskingOptionsTest.kt

@@ -43,6 +43,7 @@ import io.sentry.android.replay.viewhierarchy.ViewHierarchyNode.GenericViewHiera
 import io.sentry.android.replay.viewhierarchy.ViewHierarchyNode.ImageViewHierarchyNode
 import io.sentry.android.replay.viewhierarchy.ViewHierarchyNode.TextViewHierarchyNode
 import java.io.File
+import java.lang.reflect.InvocationTargetException
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
@@ -174,9 +175,9 @@ class ComposeMaskingOptionsTest {
   @Test
   fun `when retrieving the semantics fails, an error is thrown`() {
     val node = mock<LayoutNode>()
-    whenever(node.collapsedSemantics).thenThrow(RuntimeException("Compose Runtime Error"))
+    whenever(node.semanticsConfiguration).thenThrow(RuntimeException("Compose Runtime Error"))
 
-    assertThrows(RuntimeException::class.java) {
+    assertThrows(InvocationTargetException::class.java) {
       ComposeViewHierarchyNode.retrieveSemanticsConfiguration(node)
     }
   }

sentry-compose/proguard-rules.pro

@@ -12,6 +12,7 @@
 -keepnames class androidx.compose.foundation.ClickableElement
 -keepnames class androidx.compose.foundation.CombinedClickableElement
 -keepnames class androidx.compose.foundation.ScrollingLayoutElement
+-keepnames class androidx.compose.foundation.ScrollingContainerElement
 -keepnames class androidx.compose.ui.platform.TestTagElement { *; }
 -keepnames class io.sentry.compose.SentryModifier$SentryTagModifierNodeElement { *; }
 

sentry-compose/src/androidMain/kotlin/io/sentry/compose/gestures/ComposeGestureTargetLocator.kt

@@ -87,7 +87,10 @@ public class ComposeGestureTargetLocator(private val logger: ILogger) : GestureT
                 "androidx.compose.foundation.CombinedClickableElement" == type
             ) {
               isClickable = true
-            } else if ("androidx.compose.foundation.ScrollingLayoutElement" == type) {
+            } else if (
+              "androidx.compose.foundation.ScrollingLayoutElement" == type ||
+                "androidx.compose.foundation.ScrollingContainerElement" == type
+            ) {
               isScrollable = true
             }
           }

sentry-samples/sentry-samples-android/build.gradle.kts

@@ -142,6 +142,8 @@ dependencies {
   implementation(libs.androidx.compose.foundation)
   implementation(libs.androidx.compose.foundation.layout)
   implementation(libs.androidx.compose.material3)
+  implementation(libs.androidx.compose.material.icons.core)
+  implementation(libs.androidx.compose.material.icons.extended)
   implementation(libs.androidx.navigation.compose)
   implementation(libs.androidx.recyclerview)
   implementation(libs.androidx.browser)