Add labels and grid lines for the comparison image

gradle/android.gradle

@@ -17,11 +17,11 @@ android {
     }
   }
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
+    sourceCompatibility JavaVersion.VERSION_11
+    targetCompatibility JavaVersion.VERSION_11
   }
   kotlinOptions {
-    jvmTarget = '1.8'
+    jvmTarget = '11'
   }
   buildFeatures {
   }

include-build/roborazzi-core/build.gradle

@@ -87,8 +87,8 @@ android {
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
   }
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
+    sourceCompatibility JavaVersion.VERSION_11
+    targetCompatibility JavaVersion.VERSION_11
   }
   buildFeatures {
   }

include-build/roborazzi-core/src/commonJvmMain/kotlin/com/github/takahirom/roborazzi/RoborazziOptions.kt

@@ -131,8 +131,21 @@ data class RoborazziOptions(
   data class CompareOptions(
     val outputDirectoryPath: String = DEFAULT_ROBORAZZI_OUTPUT_DIR_PATH,
     val imageComparator: ImageComparator = DefaultImageComparator,
+    val comparisonStyle: ComparisonStyle = ComparisonStyle.Grid(),
     val resultValidator: (result: ImageComparator.ComparisonResult) -> Boolean = DefaultResultValidator,
   ) {
+    @ExperimentalRoborazziApi
+    sealed interface ComparisonStyle {
+      @ExperimentalRoborazziApi
+      data class Grid(
+        val bigLineSpaceDp: Int? = 16,
+        val smallLineSpaceDp: Int? = 4,
+        val hasLabel: Boolean = true
+      ) : ComparisonStyle
+
+      object Simple : ComparisonStyle
+    }
+
     constructor(
       outputDirectoryPath: String = DEFAULT_ROBORAZZI_OUTPUT_DIR_PATH,
       /**

include-build/roborazzi-gradle-plugin/src/integrationTest/java/io/github/takahirom/roborazzi/RoborazziGradleProject.kt

@@ -199,11 +199,11 @@ android {
     }
   }
   compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
   }
   kotlinOptions {
-    jvmTarget = "1.8"
+    jvmTarget = "11"
   }
   buildFeatures {
 //    compose = true

include-build/roborazzi-gradle-plugin/src/integrationTest/projects/app/build.gradle.kts

@@ -29,11 +29,11 @@ android {
     }
   }
   compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
   }
   kotlinOptions {
-    jvmTarget = "1.8"
+    jvmTarget = "11"
   }
   buildFeatures {
 //    compose = true

roborazzi-compose-desktop/src/commonMain/kotlin/io/github/takahirom/roborazzi/RoborazziDesktop.kt

@@ -5,6 +5,8 @@ import androidx.compose.ui.graphics.toAwtImage
 import androidx.compose.ui.test.DesktopComposeUiTest
 import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.SemanticsNodeInteraction
+import androidx.compose.ui.unit.Density
+import androidx.compose.ui.unit.dp
 import com.github.takahirom.roborazzi.*
 import java.awt.image.BufferedImage
 import java.io.File
@@ -33,6 +35,7 @@ fun SemanticsNodeInteraction.captureRoboImage(
   if (!roborazziEnabled()) {
     return
   }
+  val density = this.fetchSemanticsNode().layoutInfo.density
   val awtImage = this.captureToImage().toAwtImage()
   val canvas = AwtRoboCanvas(
     width = awtImage.width,
@@ -46,7 +49,8 @@ fun SemanticsNodeInteraction.captureRoboImage(
   processOutputImageAndReportWithDefaults(
     canvas = canvas,
     goldenFile = file,
-    roborazziOptions = roborazziOptions
+    roborazziOptions = roborazziOptions,
+    density = density
   )
   canvas.release()
 }
@@ -84,7 +88,8 @@ fun ImageBitmap.captureRoboImage(
   processOutputImageAndReportWithDefaults(
     canvas = canvas,
     goldenFile = file,
-    roborazziOptions = roborazziOptions
+    roborazziOptions = roborazziOptions,
+    density = null
   )
   canvas.release()
 }
@@ -93,6 +98,7 @@ fun processOutputImageAndReportWithDefaults(
   canvas: RoboCanvas,
   goldenFile: File,
   roborazziOptions: RoborazziOptions,
+  density: Density?,
 ) {
   processOutputImageAndReport(
     newRoboCanvas = canvas,
@@ -111,10 +117,14 @@ fun processOutputImageAndReportWithDefaults(
     },
     comparisonCanvasFactory = { goldenCanvas, actualCanvas, resizeScale, bufferedImageType ->
       AwtRoboCanvas.generateCompareCanvas(
-        goldenCanvas = goldenCanvas as AwtRoboCanvas,
-        newCanvas = actualCanvas as AwtRoboCanvas,
-        newCanvasResize = resizeScale,
-        bufferedImageType = bufferedImageType
+          AwtRoboCanvas.Companion.ComparisonCanvasParameters.create(
+            goldenCanvas = goldenCanvas as AwtRoboCanvas,
+            newCanvas = actualCanvas as AwtRoboCanvas,
+            newCanvasResize = resizeScale,
+            bufferedImageType = bufferedImageType,
+            oneDpPx = density?.run { 1.dp.toPx() },
+            comparisonComparisonStyle = roborazziOptions.compareOptions.comparisonStyle,
+          )
       )
     }
   )

roborazzi-junit-rule/build.gradle

@@ -25,11 +25,11 @@ android {
     }
   }
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
+    sourceCompatibility JavaVersion.VERSION_11
+    targetCompatibility JavaVersion.VERSION_11
   }
   kotlinOptions {
-    jvmTarget = '1.8'
+    jvmTarget = '11'
   }
   buildFeatures {
   }

roborazzi-painter/build.gradle

@@ -5,6 +5,12 @@ if (System.getenv("INTEGRATION_TEST") != "true") {
   pluginManager.apply("com.vanniktech.maven.publish")
 }
 
+java {
+  toolchain {
+    languageVersion.set(JavaLanguageVersion.of(11))
+  }
+}
+
 dependencies {
   // Please see settings.gradle
   api "io.github.takahirom.roborazzi:roborazzi-core:$VERSION_NAME"