Merge pull request #125 from sergio-sastre/release/2.3.3

sergio-sastre · web-flow · commit daa13696c7e4 · 2024-07-18T20:39:50.000+02:00
Release/2.3.3
diff --git a/android-testify/build.gradle b/android-testify/build.gradle
@@ -62,7 +62,7 @@ publishing {
         release(MavenPublication) {
             groupId = 'com.github.sergio-sastre'
             artifactId = "android-testify"
-            version = '2.3.2'
+            version = '2.3.3'
 
             afterEvaluate {
                 from components.release
diff --git a/dropshots/build.gradle b/dropshots/build.gradle
@@ -61,7 +61,7 @@ publishing {
         release(MavenPublication) {
             groupId = 'com.github.sergio-sastre'
             artifactId = "dropshots"
-            version = '2.3.2'
+            version = '2.3.3'
 
             afterEvaluate {
                 from components.release
diff --git a/mapper-paparazzi/build.gradle b/mapper-paparazzi/build.gradle
@@ -49,7 +49,7 @@ publishing {
         release(MavenPublication) {
             groupId = 'com.github.sergio-sastre'
             artifactId = "mapper-paparazzi"
-            version = '2.3.2'
+            version = '2.3.3'
 
             afterEvaluate {
                 from components.release
diff --git a/mapper-paparazzi/src/main/java/sergio/sastre/uitesting/mapper/paparazzi/wrapper/RenderExtension.kt b/mapper-paparazzi/src/main/java/sergio/sastre/uitesting/mapper/paparazzi/wrapper/RenderExtension.kt
@@ -11,6 +11,9 @@ interface RenderExtension {
     fun renderView(contentView: View): View
 }
 
+/**
+ * This is used via reflection to support accessibility
+ */
 class AccessibilityRenderExtension : RenderExtension {
     override fun renderView(contentView: View): View {
         // use reflection to avoid direct dependency on Paparazzi
diff --git a/mapper-roborazzi/build.gradle b/mapper-roborazzi/build.gradle
@@ -50,7 +50,7 @@ publishing {
         release(MavenPublication) {
             groupId = 'com.github.sergio-sastre'
             artifactId = "mapper-roborazzi"
-            version = '2.3.2'
+            version = '2.3.3'
 
             afterEvaluate {
                 from components.release
diff --git a/mapper-roborazzi/src/main/java/sergio/sastre/uitesting/mapper/roborazzi/RoborazziConfig.kt b/mapper-roborazzi/src/main/java/sergio/sastre/uitesting/mapper/roborazzi/RoborazziConfig.kt
@@ -3,13 +3,15 @@ package sergio.sastre.uitesting.mapper.roborazzi
 import androidx.annotation.ColorInt
 import sergio.sastre.uitesting.mapper.roborazzi.wrapper.RoborazziOptions
 import sergio.sastre.uitesting.mapper.roborazzi.wrapper.screen.DeviceScreen
+import sergio.sastre.uitesting.utils.crosslibrary.config.BitmapCaptureMethod
 import sergio.sastre.uitesting.utils.crosslibrary.config.LibraryConfig
 
 data class RoborazziConfig(
     val filePath: String = DEFAULT_ROBORAZZI_OUTPUT_DIR_PATH,
     val roborazziOptions: RoborazziOptions = RoborazziOptions(),
     val deviceScreen: DeviceScreen? = null,
     @ColorInt val backgroundColor: Int? = null,
+    val bitmapCaptureMethod: BitmapCaptureMethod? = null,
 ) : LibraryConfig {
 
     companion object {
diff --git a/paparazzi/build.gradle b/paparazzi/build.gradle
@@ -57,7 +57,7 @@ publishing {
         release(MavenPublication) {
             groupId = 'com.github.sergio-sastre'
             artifactId = "paparazzi"
-            version = '2.3.2'
+            version = '2.3.3'
 
             afterEvaluate {
                 from components.release
diff --git a/paparazzi/src/main/java/sergio/sastre/uitesting/paparazzi/ContextExt.kt b/paparazzi/src/main/java/sergio/sastre/uitesting/paparazzi/ContextExt.kt
@@ -5,7 +5,7 @@ import android.content.res.Configuration
 import sergio.sastre.uitesting.utils.common.DisplaySize
 
 @Suppress("DEPRECATION")
-fun Context.setDisplaySize(displaySize: DisplaySize) =
+internal fun Context.setDisplaySize(displaySize: DisplaySize) =
     this.apply {
         val density = resources.configuration.densityDpi
         val config = Configuration(resources.configuration)
diff --git a/robolectric/build.gradle b/robolectric/build.gradle
@@ -50,7 +50,7 @@ publishing {
         release(MavenPublication) {
             groupId = 'com.github.sergio-sastre'
             artifactId = "robolectric"
-            version = '2.3.2'
+            version = '2.3.3'
 
             afterEvaluate {
                 from components.release
diff --git a/roborazzi/build.gradle b/roborazzi/build.gradle
@@ -64,7 +64,7 @@ publishing {
         release(MavenPublication) {
             groupId = 'com.github.sergio-sastre'
             artifactId = "roborazzi"
-            version = '2.3.2'
+            version = '2.3.3'
 
             afterEvaluate {
                 from components.release
diff --git a/roborazzi/src/main/java/sergio/sastre/uitesting/roborazzi/DrawToBitmapExt.kt b/roborazzi/src/main/java/sergio/sastre/uitesting/roborazzi/DrawToBitmapExt.kt
@@ -0,0 +1,22 @@
+package sergio.sastre.uitesting.roborazzi
+
+import android.app.Dialog
+import android.graphics.Bitmap
+import android.view.View
+import androidx.core.view.drawToBitmap
+import sergio.sastre.uitesting.utils.crosslibrary.config.BitmapCaptureMethod
+import sergio.sastre.uitesting.utils.utils.drawToBitmapWithElevation
+
+internal fun View.drawToBitmap(
+    bitmapCaptureMethod: BitmapCaptureMethod?
+): Bitmap =
+    when (bitmapCaptureMethod){
+        is BitmapCaptureMethod.Canvas -> drawToBitmap(config = bitmapCaptureMethod.config)
+        is BitmapCaptureMethod.PixelCopy -> drawToBitmapWithElevation(config = bitmapCaptureMethod.config)
+        null -> drawToBitmapWithElevation()
+    }
+
+internal fun Dialog.drawToBitmap(
+    bitmapCaptureMethod: BitmapCaptureMethod?,
+): Bitmap =
+    window!!.decorView.drawToBitmap(bitmapCaptureMethod)
diff --git a/roborazzi/src/main/java/sergio/sastre/uitesting/roborazzi/RoborazziScreenshotTestRuleForComposable.kt b/roborazzi/src/main/java/sergio/sastre/uitesting/roborazzi/RoborazziScreenshotTestRuleForComposable.kt
@@ -1,14 +1,15 @@
 package sergio.sastre.uitesting.roborazzi
 
+import android.view.View
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.test.onRoot
 import com.github.takahirom.roborazzi.ExperimentalRoborazziApi
 import com.github.takahirom.roborazzi.captureRoboImage
 import org.junit.runner.Description
 import org.junit.runners.model.Statement
 import sergio.sastre.uitesting.robolectric.activityscenario.RobolectricActivityScenarioForComposableRule
 import sergio.sastre.uitesting.roborazzi.config.RoborazziSharedTestAdapter
 import sergio.sastre.uitesting.mapper.roborazzi.RoborazziConfig
+import sergio.sastre.uitesting.mapper.roborazzi.wrapper.CaptureType
 import sergio.sastre.uitesting.utils.crosslibrary.config.LibraryConfig
 import sergio.sastre.uitesting.utils.crosslibrary.config.ScreenshotConfigForComposable
 import sergio.sastre.uitesting.utils.crosslibrary.testrules.ScreenshotTestRuleForComposable
@@ -40,17 +41,30 @@ class RoborazziScreenshotTestRuleForComposable(
         snapshot(null, composable)
     }
 
-
     override fun snapshot(name: String?, composable: @Composable () -> Unit) {
-        @OptIn(ExperimentalRoborazziApi::class)
-        activityScenarioRule
+        val view = activityScenarioRule
             .setContent { composable() }
-            .composeRule
-            .onRoot()
-            .captureRoboImage(
-                filePath = filePathGenerator(roborazziConfig.filePath, name),
-                roborazziOptions = roborazziAdapter.asRoborazziOptions(),
-            )
+            .composeView
+        snapshotView(name, view)
+    }
+
+    private fun snapshotView(name: String?, view: View) {
+        @OptIn(ExperimentalRoborazziApi::class)
+        when (roborazziConfig.roborazziOptions.captureType is CaptureType.Dump) {
+            // Dump does not support Bitmap.captureRoboImage
+            true -> view
+                .captureRoboImage(
+                    filePath = filePathGenerator(roborazziConfig.filePath, name),
+                    roborazziOptions = roborazziAdapter.asRoborazziOptions(),
+                )
+
+            false -> view
+                .drawToBitmap(roborazziConfig.bitmapCaptureMethod)
+                .captureRoboImage(
+                    filePath = filePathGenerator.invoke(roborazziConfig.filePath, name),
+                    roborazziOptions = roborazziAdapter.asRoborazziOptions(),
+                )
+        }
     }
 
     override fun configure(config: LibraryConfig): ScreenshotTestRuleForComposable = apply {
diff --git a/roborazzi/src/main/java/sergio/sastre/uitesting/roborazzi/RoborazziScreenshotTestRuleForView.kt b/roborazzi/src/main/java/sergio/sastre/uitesting/roborazzi/RoborazziScreenshotTestRuleForView.kt
@@ -5,6 +5,7 @@ import android.content.Context
 import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
+import androidx.test.platform.app.InstrumentationRegistry.*
 import com.github.takahirom.roborazzi.ExperimentalRoborazziApi
 import com.github.takahirom.roborazzi.captureRoboImage
 import org.junit.runner.Description
@@ -16,7 +17,6 @@ import sergio.sastre.uitesting.mapper.roborazzi.wrapper.CaptureType
 import sergio.sastre.uitesting.utils.crosslibrary.config.LibraryConfig
 import sergio.sastre.uitesting.utils.crosslibrary.config.ScreenshotConfigForView
 import sergio.sastre.uitesting.utils.crosslibrary.testrules.ScreenshotTestRuleForView
-import sergio.sastre.uitesting.utils.utils.drawToBitmap
 
 class RoborazziScreenshotTestRuleForView(
     override val config: ScreenshotConfigForView = ScreenshotConfigForView(),
@@ -53,63 +53,44 @@ class RoborazziScreenshotTestRuleForView(
         sergio.sastre.uitesting.utils.utils.waitForMeasuredView { actionToDo() }
 
     override fun waitForMeasuredDialog(actionToDo: () -> Dialog): Dialog {
-        // Workaround for dialog dump mode
-        if (roborazziConfig.roborazziOptions.captureType is CaptureType.Dump) {
-            dumpDialogView = waitForMeasuredView { actionToDo().window!!.decorView }
-        }
+        dumpDialogView = actionToDo().window!!.decorView
         return sergio.sastre.uitesting.utils.utils.waitForMeasuredDialog { actionToDo() }
     }
 
     override fun waitForMeasuredViewHolder(actionToDo: () -> RecyclerView.ViewHolder): RecyclerView.ViewHolder =
         sergio.sastre.uitesting.utils.utils.waitForMeasuredViewHolder { actionToDo() }
 
     override fun snapshotDialog(name: String?, dialog: Dialog) {
-        if (roborazziConfig.roborazziOptions.captureType is CaptureType.Dump) {
-            captureDumpDialog(name, requireNotNull(dumpDialogView))
-                .also { dumpDialogView = null }
-
-        } else {
-            captureScreenshotDialog(name, dialog)
+        requireNotNull(dumpDialogView).run {
+            (activityScenarioRule.activity.window.decorView as ViewGroup).addView(this)
+            getInstrumentation().waitForIdleSync()
+            snapshotView(name, waitForMeasuredView { this })
+        }.also {
+            dumpDialogView = null
         }
     }
 
-    private fun captureDumpDialog(name: String?, dialogView: View) {
-        (activityScenarioRule.activity.window.decorView as ViewGroup).addView(dialogView)
-        @OptIn(ExperimentalRoborazziApi::class)
-        dialogView
-            .captureRoboImage(
-                filePath = filePathGenerator.invoke(roborazziConfig.filePath, name),
-                roborazziOptions = roborazziAdapter.asRoborazziOptions(),
-            )
-    }
-
-    private fun captureScreenshotDialog(name: String?, dialog: Dialog) {
-        @OptIn(ExperimentalRoborazziApi::class)
-        dialog
-            .drawToBitmap()
-            .captureRoboImage(
-                filePath = filePathGenerator.invoke(roborazziConfig.filePath, name),
-                roborazziOptions = roborazziAdapter.asRoborazziOptions(),
-            )
-    }
-
     override fun snapshotView(name: String?, view: View) {
         @OptIn(ExperimentalRoborazziApi::class)
-        view
-            .captureRoboImage(
-                filePath = filePathGenerator.invoke(roborazziConfig.filePath, name),
-                roborazziOptions = roborazziAdapter.asRoborazziOptions(),
-            )
+        when (roborazziConfig.roborazziOptions.captureType is CaptureType.Dump) {
+            // Dump does not support Bitmap.captureRoboImage
+            true -> view
+                .captureRoboImage(
+                    filePath = filePathGenerator.invoke(roborazziConfig.filePath, name),
+                    roborazziOptions = roborazziAdapter.asRoborazziOptions(),
+                )
+
+            false -> view
+                .drawToBitmap(roborazziConfig.bitmapCaptureMethod)
+                .captureRoboImage(
+                    filePath = filePathGenerator.invoke(roborazziConfig.filePath, name),
+                    roborazziOptions = roborazziAdapter.asRoborazziOptions(),
+                )
+        }
     }
 
     override fun snapshotViewHolder(name: String?, viewHolder: RecyclerView.ViewHolder) {
-        @OptIn(ExperimentalRoborazziApi::class)
-        viewHolder
-            .itemView
-            .captureRoboImage(
-                filePath = filePathGenerator.invoke(roborazziConfig.filePath, name),
-                roborazziOptions = roborazziAdapter.asRoborazziOptions(),
-            )
+        snapshotView(name, viewHolder.itemView)
     }
 
     override fun configure(config: LibraryConfig): ScreenshotTestRuleForView = apply {
diff --git a/shot/build.gradle b/shot/build.gradle
@@ -61,7 +61,7 @@ publishing {
         release(MavenPublication) {
             groupId = 'com.github.sergio-sastre'
             artifactId = "shot"
-            version = '2.3.2'
+            version = '2.3.3'
 
             afterEvaluate {
                 from components.release
diff --git a/utils/build.gradle b/utils/build.gradle
@@ -73,7 +73,7 @@ publishing {
         release(MavenPublication) {
             groupId = 'com.github.sergio-sastre'
             artifactId = "utils"
-            version = '2.3.2'
+            version = '2.3.3'
 
             afterEvaluate {
                 from components.release

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,9 @@ interface RenderExtension {`
`11`	`11`	`fun renderView(contentView: View): View`
`12`	`12`	`}`
`13`	`13`
	`14`	`+/**`
	`15`	`+ * This is used via reflection to support accessibility`
	`16`	`+ */`
`14`	`17`	`class AccessibilityRenderExtension : RenderExtension {`
`15`	`18`	`override fun renderView(contentView: View): View {`
`16`	`19`	`// use reflection to avoid direct dependency on Paparazzi`