Merge pull request #65 from skydoves/update/baselines

Update baseline profiles
skydoves · Jun 29, 2024 · d36360a · d36360a
2 parents e85bc53 + d01d018
commit d36360a
Show file tree

Hide file tree

Showing 9 changed files with 27,623 additions and 7 deletions.
diff --git a/app/src/androidMain/kotlin/com/github/skydoves/colorpickercomposedemo/MainActivity.kt b/app/src/androidMain/kotlin/com/github/skydoves/colorpickercomposedemo/MainActivity.kt
@@ -13,21 +13,35 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@file:OptIn(ExperimentalComposeUiApi::class)
+
 package com.github.skydoves.colorpickercomposedemo
 
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.darkColors
+import androidx.compose.ui.ExperimentalComposeUiApi
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.semantics.testTagsAsResourceId
 
 class MainActivity : ComponentActivity() {
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
 
     setContent {
       MaterialTheme(colors = darkColors()) {
-        MainScreen()
+        Box(
+          modifier = Modifier
+            .fillMaxSize()
+            .semantics { testTagsAsResourceId = true },
+        ) {
+          MainScreen()
+        }
       }
     }
   }

diff --git a/app/src/androidRelease/generated/baselineProfiles/baseline-prof.txt b/app/src/androidRelease/generated/baselineProfiles/baseline-prof.txt
diff --git a/app/src/androidRelease/generated/baselineProfiles/startup-prof.txt b/app/src/androidRelease/generated/baselineProfiles/startup-prof.txt
diff --git a/app/src/commonMain/kotlin/com/github/skydoves/colorpickercomposedemo/MainScreen.kt b/app/src/commonMain/kotlin/com/github/skydoves/colorpickercomposedemo/MainScreen.kt
@@ -70,9 +70,9 @@ fun MainScreen() {
     topBar = { MainToolBar() },
   ) { innerPadding ->
     NavHost(
-      navController,
+      modifier = Modifier.padding(innerPadding),
+      navController = navController,
       startDestination = Screen.ImageColorPicker.route,
-      Modifier.padding(innerPadding),
     ) {
       composable(Screen.ImageColorPicker.route) {
         ImageColorPickerScreen()

diff --git a/...nMain/kotlin/com/github/skydoves/colorpickercomposedemo/screens/ImageColorPickerScreen.kt b/...nMain/kotlin/com/github/skydoves/colorpickercomposedemo/screens/ImageColorPickerScreen.kt
@@ -32,6 +32,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
@@ -62,6 +63,7 @@ fun ImageColorPickerScreen() {
 
     ImageColorPicker(
       modifier = Modifier
+        .testTag("ImageColorPicker")
         .fillMaxWidth()
         .height(200.dp)
         .padding(10.dp),
@@ -78,6 +80,7 @@ fun ImageColorPickerScreen() {
 
     AlphaSlider(
       modifier = Modifier
+        .testTag("ImageColorPicker_AlphaSlider")
         .fillMaxWidth()
         .padding(10.dp)
         .height(35.dp)

diff --git a/...c/main/java/com/github/skydoves/colorpicker/compose/benchmark/BaselineProfileGenerator.kt b/...c/main/java/com/github/skydoves/colorpicker/compose/benchmark/BaselineProfileGenerator.kt
@@ -51,11 +51,11 @@ class BaselineProfileGenerator {
 }
 
 private fun UiDevice.testColorPickerDemoScenario(): Boolean {
-  waitForObject(By.res("HSV")).click()
+  waitForObject(By.res("ImageColorPicker")).click()
 
   waitForIdle()
 
-  return wait(Until.hasObject(By.res("HSV_AlphaSlider")), 5_000)
+  return wait(Until.hasObject(By.res("ImageColorPicker_AlphaSlider")), 5_000)
 }
 
 private fun UiDevice.waitForObject(selector: BySelector, timeout: Long = 5_000): UiObject2 {

diff --git a/colorpicker-compose/build.gradle.kts b/colorpicker-compose/build.gradle.kts
@@ -96,9 +96,16 @@ android {
   lint {
     abortOnError = false
   }
+}
+
+dependencies {
+  baselineProfile(project(":benchmark"))
+}
 
-  baselineProfile {
-    baselineProfileOutputDir = "../../src/androidMain"
+baselineProfile {
+  baselineProfileOutputDir = "../../src/androidMain"
+  filter {
+    include("com.github.skydoves.colorpicker.compose.**")
   }
 }
 

diff --git a/colorpicker-compose/src/androidMain/baseline-prof.txt b/colorpicker-compose/src/androidMain/baseline-prof.txt
diff --git a/gradle.properties b/gradle.properties
@@ -45,6 +45,7 @@ android.defaults.buildfeatures.shaders=false
 android.nonTransitiveRClass=true
 
 # MPP
+kotlin.mpp.androidGradlePluginCompatibility.nowarn=true
 kotlin.mpp.enableCInteropCommonization=true
 kotlin.mpp.stability.nowarn=true
 kotlin.mpp.androidSourceSetLayoutVersion=2