Separate startup profile from baseline profile

Makefile

@@ -36,7 +36,7 @@ format:
 
 baseline-profile:
 	@echo "Generate baseline profile"
-	@./gradlew :app:generateReleaseBaselineProfile
+	@./gradlew :app:generateReleaseBaselineProfile --console verbose
 
 build-aab:
 	@echo "Build AAB"

app/src/main/kotlin/com/w2sv/wifiwidget/ui/screens/home/HomeScreen.kt

@@ -22,7 +22,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.hilt.navigation.compose.hiltViewModel
@@ -31,7 +30,6 @@ import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.annotation.RootGraph
 import com.w2sv.composed.CollectFromFlow
 import com.w2sv.composed.isLandscapeModeActive
-import com.w2sv.wifiwidget.R
 import com.w2sv.wifiwidget.ui.designsystem.AppSnackbarHost
 import com.w2sv.wifiwidget.ui.designsystem.AppTopBar
 import com.w2sv.wifiwidget.ui.designsystem.drawer.NavigationDrawer

benchmarking/src/main/kotlin/com/w2sv/baselineprofile/StartupBenchmarks.kt → benchmarking/src/main/kotlin/com/w2sv/wifiwidget/StartupBenchmarks.kt

@@ -1,4 +1,4 @@
-package com.w2sv.baselineprofile
+package com.w2sv.wifiwidget
 
 import androidx.benchmark.macro.BaselineProfileMode
 import androidx.benchmark.macro.CompilationMode

benchmarking/src/main/kotlin/com/w2sv/wifiwidget/UiDeviceExt.kt

@@ -0,0 +1,42 @@
+package com.w2sv.wifiwidget
+
+import androidx.test.uiautomator.By
+import androidx.test.uiautomator.Direction
+import androidx.test.uiautomator.UiDevice
+import androidx.test.uiautomator.UiSelector
+import java.io.ByteArrayOutputStream
+
+internal fun UiDevice.criticalUserJourney() {
+    closeLocationAccessPermissionRationalAndRequestDialogIfOpen()
+    flingListDown("scrollableWifiPropertyList")
+
+    goToWidgetConfigurationScreen()
+    waitForIdle()
+
+    flingListDown("scrollableWidgetConfigurationColumn")
+
+    pressBack()
+}
+
+private fun UiDevice.closeLocationAccessPermissionRationalAndRequestDialogIfOpen() {
+    findObject(By.text("Understood"))?.let { // 'Understood' button is part of the location access rational dialog
+        it.click() // Closes the rational dialog
+        waitForIdle() // Wait until location access permission request dialog appears
+        pressBack() // Closes location access permission request dialog
+    }
+}
+
+private fun UiDevice.dumpWindowHierarchy(): String {
+    val outputStream = ByteArrayOutputStream()
+    dumpWindowHierarchy(outputStream)
+    return outputStream.toString("UTF-8")
+}
+
+private fun UiDevice.flingListDown(resourceName: String) {
+    findObject(By.res(resourceName)).fling(Direction.DOWN)
+    waitForIdle()
+}
+
+private fun UiDevice.goToWidgetConfigurationScreen() {
+    findObject(UiSelector().description("Open the widget configuration screen.")).click()
+}

benchmarking/src/main/kotlin/com/w2sv/wifiwidget/baselineprofile/CriticalUserJourneyBaselineProfile.kt

@@ -0,0 +1,25 @@
+package com.w2sv.wifiwidget.baselineprofile
+
+import androidx.benchmark.macro.junit4.BaselineProfileRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.LargeTest
+import com.w2sv.wifiwidget.criticalUserJourney
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+@LargeTest
+class CriticalUserJourneyBaselineProfile {
+
+    @get:Rule
+    val rule = BaselineProfileRule()
+
+    @Test
+    fun generate() {
+        rule.collect(packageName = "com.w2sv.wifiwidget") {
+            startActivityAndWait()
+            device.criticalUserJourney()
+        }
+    }
+}

benchmarking/src/main/kotlin/com/w2sv/baselineprofile/BaselineProfileGenerator.kt → benchmarking/src/main/kotlin/com/w2sv/wifiwidget/baselineprofile/StartupBaselineProfile.kt

@@ -1,10 +1,10 @@
-package com.w2sv.baselineprofile
+package com.w2sv.wifiwidget.baselineprofile
 
-import android.content.Context
+import androidx.benchmark.macro.MacrobenchmarkScope
 import androidx.benchmark.macro.junit4.BaselineProfileRule
-import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
+import com.w2sv.wifiwidget.StartupBenchmarks
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -34,7 +34,7 @@ import org.junit.runner.RunWith
  **/
 @RunWith(AndroidJUnit4::class)
 @LargeTest
-class BaselineProfileGenerator {
+class StartupBaselineProfile {
 
     @get:Rule
     val rule = BaselineProfileRule()
@@ -44,12 +44,8 @@ class BaselineProfileGenerator {
         rule.collect(
             packageName = "com.w2sv.wifiwidget",
             // See: https://d.android.com/topic/performance/baselineprofiles/dex-layout-optimizations
-            includeInStartupProfile = true
-        ) {
-            pressHome()
-            startActivityAndWait()
-
-            device.criticalUserJourney()
-        }
+            includeInStartupProfile = true,
+            profileBlock = MacrobenchmarkScope::startActivityAndWait
+        )
     }
 }

core/widget/src/main/kotlin/com/w2sv/widget/di/WidgetModule.kt

@@ -50,8 +50,6 @@ internal object WidgetModule {
 
     @WidgetPinSuccessFlow
     @Provides
-    fun widgetPinSuccessFlow(
-        @MutableWidgetPinSuccessFlow mutableWidgetPinSuccessFlow: MutableSharedFlow<Unit>
-    ): SharedFlow<Unit> =
+    fun widgetPinSuccessFlow(@MutableWidgetPinSuccessFlow mutableWidgetPinSuccessFlow: MutableSharedFlow<Unit>): SharedFlow<Unit> =
         mutableWidgetPinSuccessFlow.asSharedFlow()
 }