Merge pull request #122 from overpas/experiment-with-stability

Make tree and nodes immutable, fix benchmark

benchmark/.gitignore

@@ -0,0 +1 @@
+/build

benchmark/build.gradle.kts

@@ -0,0 +1,54 @@
+plugins {
+    alias(libs.plugins.android.test)
+    alias(libs.plugins.kotlin.android)
+}
+
+android {
+    namespace = "com.example.benchmark"
+    compileSdk = properties["android.compileSdk"].toString().toInt()
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.toVersion(properties["jvm.version"].toString())
+        targetCompatibility = JavaVersion.toVersion(properties["jvm.version"].toString())
+    }
+
+    kotlinOptions {
+        jvmTarget = properties["jvm.version"].toString()
+    }
+
+    defaultConfig {
+        minSdk = properties["android.minSdk"].toString().toInt()
+        targetSdk = properties["android.targetSdk"].toString().toInt()
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunnerArguments["androidx.benchmark.suppressErrors"] = "EMULATOR"
+    }
+
+    buildTypes {
+        // This benchmark buildType is used for benchmarking, and should function like your
+        // release build (for example, with minification on). It"s signed with a debug key
+        // for easy local/CI testing.
+        create("benchmark") {
+            isDebuggable = true
+//            isMinifyEnabled = true
+            signingConfig = getByName("debug").signingConfig
+            matchingFallbacks += listOf("release")
+        }
+    }
+
+    targetProjectPath = ":sample:android"
+    experimentalProperties["android.experimental.self-instrumenting"] = true
+}
+
+dependencies {
+    implementation(libs.androidx.test.ext.junit)
+    implementation(libs.androidx.test.espresso.core)
+    implementation(libs.ui.automator)
+    implementation(libs.macrobenchmark.junit)
+}
+
+androidComponents {
+    beforeVariants(selector().all()) {
+        it.enable = it.buildType == "benchmark"
+    }
+}

benchmark/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest />

benchmark/src/main/java/com/example/benchmark/TreemapChartBenchmark.kt

@@ -0,0 +1,103 @@
+package com.example.benchmark
+
+import androidx.benchmark.macro.CompilationMode
+import androidx.benchmark.macro.FrameTimingMetric
+import androidx.benchmark.macro.MacrobenchmarkScope
+import androidx.benchmark.macro.StartupMode
+import androidx.benchmark.macro.junit4.MacrobenchmarkRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.uiautomator.By
+import androidx.test.uiautomator.Until
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class TreemapChartBenchmark {
+
+    @get:Rule
+    val benchmarkRule = MacrobenchmarkRule()
+
+    @Test
+    fun showSimpleChart() = measureRepeated {
+        startActivityAndWait()
+
+        device.wait(Until.hasObject(By.text("4")), 1000)
+        device.wait(Until.hasObject(By.text("2")), 1000)
+        device.wait(Until.hasObject(By.text("1")), 1000)
+    }
+
+    @Test
+    fun showComplexChart() = benchmarkRule.measureRepeated(
+        packageName = "by.overpass.treemapchart.sample.android",
+        metrics = listOf(FrameTimingMetric()),
+        compilationMode = CompilationMode.DEFAULT,
+        startupMode = StartupMode.COLD,
+        iterations = 5,
+    ) {
+        startActivityAndWait()
+
+        device.findObject(By.text("Show more complex chart"))
+            .click()
+
+        device.wait(
+            Until.hasObject(
+                By.text(
+                    """
+                    |Cars
+                    |12.11%
+                    """.trimMargin(),
+                ),
+            ),
+            5000,
+        )
+    }
+
+    @Test
+    fun showComplexChartDetailPopup() = benchmarkRule.measureRepeated(
+        packageName = "by.overpass.treemapchart.sample.android",
+        metrics = listOf(FrameTimingMetric()),
+        compilationMode = CompilationMode.DEFAULT,
+        startupMode = StartupMode.COLD,
+        iterations = 5,
+    ) {
+        startActivityAndWait()
+
+        device.findObject(By.text("Show more complex chart"))
+            .click()
+
+        device.wait(
+            Until.hasObject(
+                By.text(
+                    """
+                    |Cars
+                    |12.11%
+                    """.trimMargin(),
+                ),
+            ),
+            5000,
+        )
+        device.findObject(
+            By.text(
+                """
+                |Cars
+                |12.11%
+                """.trimMargin(),
+            ),
+        ).click()
+
+        device.wait(Until.hasObject(By.text("Exports value")), 5000)
+        device.wait(Until.hasObject(By.text("$88.6B")), 5000)
+    }
+
+    private fun measureRepeated(block: MacrobenchmarkScope.() -> Unit) {
+        benchmarkRule.measureRepeated(
+            packageName = "by.overpass.treemapchart.sample.android",
+            metrics = listOf(FrameTimingMetric()),
+            compilationMode = CompilationMode.DEFAULT,
+            startupMode = StartupMode.COLD,
+            iterations = 5,
+            measureBlock = block,
+        )
+    }
+}

sample/android/build.gradle.kts

@@ -31,7 +31,13 @@ android {
             isDebuggable = false
             proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
         }
-//        create("benchmark") {
+        create("benchmark") {
+            initWith(buildTypes.getByName("release"))
+            signingConfig = signingConfigs.getByName("debug")
+            matchingFallbacks += listOf("release")
+            isDebuggable = false
+        }
+        //        create("benchmark") {
 //            initWith(release)
 //            signingConfig = signingConfigs.getByName("debug")
 //            matchingFallbacks.add("release")

sample/android/src/main/AndroidManifest.xml

@@ -1,18 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="by.overpass.treemapchart.sample.android">
 
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <profileable android:shell="true" />
+        <profileable
+            android:shell="true"
+            tools:targetApi="29" />
+
         <activity
             android:name=".MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>

sample/shared/build.gradle.kts

@@ -122,6 +122,14 @@ dependencies {
     detektPlugins(libs.compose.detekt.rules)
 }
 
+composeCompiler {
+    stabilityConfigurationFiles.add(project.layout.projectDirectory.file("stability.conf"))
+    composeCompiler {
+        reportsDestination = layout.buildDirectory.dir("compose_compiler")
+        metricsDestination = layout.buildDirectory.dir("compose_compiler")
+    }
+}
+
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
     compilerOptions {
         jvmTarget = JvmTarget.fromTarget(properties["jvm.version"].toString())

sample/shared/src/commonMain/kotlin/by/overpass/treemapchart/sample/shared/complex/FocusablePopup.kt

@@ -2,16 +2,24 @@ package by.overpass.treemapchart.sample.shared.complex
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
-import androidx.compose.ui.input.key.KeyEvent
 import androidx.compose.ui.unit.IntOffset
+import androidx.compose.ui.window.Popup
+import androidx.compose.ui.window.PopupProperties
 
-@Suppress("LongParameterList")
 @Composable
-internal expect fun FocusablePopup(
+internal fun FocusablePopup(
     alignment: Alignment = Alignment.TopStart,
     offset: IntOffset = IntOffset(0, 0),
     onDismissRequest: (() -> Unit)? = null,
-    onPreviewKeyEvent: ((KeyEvent) -> Boolean) = { false },
-    onKeyEvent: ((KeyEvent) -> Boolean) = { false },
     content: @Composable () -> Unit,
-)
+) {
+    Popup(
+        alignment = alignment,
+        offset = offset,
+        onDismissRequest = onDismissRequest,
+        properties = PopupProperties(
+            focusable = true,
+        ),
+        content = content,
+    )
+}

settings.gradle.kts

@@ -23,7 +23,7 @@ include(":treemap-chart")
 include(":treemap-chart-compose")
 include(":sample:shared")
 include(":sample:android")
-//include(":sample:android:macrobenchmark")
 include(":sample:desktop")
 include(":sample:web")
 include(":sample:web-wasm")
+include(":benchmark")

treemap-chart-compose/build.gradle.kts

@@ -109,6 +109,14 @@ dependencies {
     debugImplementation(libs.androidx.compose.ui.test.manifest)
 }
 
+composeCompiler {
+    stabilityConfigurationFiles.add(project.layout.projectDirectory.file("stability.conf"))
+    composeCompiler {
+        reportsDestination = layout.buildDirectory.dir("compose_compiler")
+        metricsDestination = layout.buildDirectory.dir("compose_compiler")
+    }
+}
+
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
     compilerOptions {
         jvmTarget = JvmTarget.fromTarget(properties["jvm.version"].toString())

treemap-chart/build.gradle.kts

@@ -63,6 +63,7 @@ kotlin {
         val commonMain by getting {
             dependencies {
                 implementation(compose.runtime)
+                api(libs.kotlinx.collections.immutable)
             }
         }
         val desktopMain by getting {
@@ -95,6 +96,14 @@ tasks.withType<KotlinCompile> {
     }
 }
 
+composeCompiler {
+    stabilityConfigurationFiles.add(project.layout.projectDirectory.file("stability.conf"))
+    composeCompiler {
+        reportsDestination = layout.buildDirectory.dir("compose_compiler")
+        metricsDestination = layout.buildDirectory.dir("compose_compiler")
+    }
+}
+
 tasks.register("commonUnitTest") {
     dependsOn("testDebugUnitTest", "desktopTest", "iosSimulatorArm64Test")
 }

treemap-chart/src/commonMain/kotlin/by/overpass/treemapchart/core/measure/squarified/TreemapElement.kt

@@ -1,11 +1,15 @@
 package by.overpass.treemapchart.core.measure.squarified
 
+import androidx.compose.runtime.Stable
+
 /**
  * An intermediary object to represent a [by.overpass.treemapchart.core.measure.TreemapNode]
  */
-internal class TreemapElement(var area: Double) {
-    var left = 0.0
-    var top = 0.0
-    var width = 0.0
-    var height = 0.0
-}
+@Stable
+internal data class TreemapElement(
+    var area: Double,
+    var left: Double = 0.0,
+    var top: Double = 0.0,
+    var width: Double = 0.0,
+    var height: Double = 0.0,
+)