A fully functional Android app built entirely with Kotlin and Jetpack Compose
Add JankMetricDisposableEffect
Tomáš Mlynaričbc7270d6c41e
diff --git a/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaApp.kt b/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaApp.ktindex b495056fc..50b5f57da 100644--- a/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaApp.kt+++ b/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaApp.kt@@ -42,7 +42,6 @@ import androidx.compose.material3.windowsizeclass.WindowSizeClassimport androidx.compose.material3.windowsizeclass.WindowWidthSizeClassimport androidx.compose.runtime.Composableimport androidx.compose.runtime.CompositionLocalProvider-import androidx.compose.runtime.DisposableEffectimport androidx.compose.runtime.getValueimport androidx.compose.runtime.rememberimport androidx.compose.ui.Modifier@@ -55,8 +54,8 @@ import androidx.navigation.NavDestination.Companion.hierarchyimport androidx.navigation.compose.currentBackStackEntryAsStateimport androidx.navigation.compose.rememberNavControllerimport com.google.samples.apps.nowinandroid.core.ui.ClearRippleTheme+import com.google.samples.apps.nowinandroid.core.ui.JankMetricDisposableEffectimport com.google.samples.apps.nowinandroid.core.ui.component.NiaBackground-import com.google.samples.apps.nowinandroid.core.ui.rememberMetricsStateHolderimport com.google.samples.apps.nowinandroid.core.ui.theme.NiaThemeimport com.google.samples.apps.nowinandroid.navigation.NiaNavHostimport com.google.samples.apps.nowinandroid.navigation.NiaTopLevelNavigation@@ -68,8 +67,7 @@ import com.google.samples.apps.nowinandroid.navigation.TopLevelDestinationfun NiaApp(windowSizeClass: WindowSizeClass) {NiaTheme {val navController = rememberNavController()- val metricsHolder = rememberMetricsStateHolder()- DisposableEffect(navController, metricsHolder) {+ JankMetricDisposableEffect(navController) { metricsHolder ->val listener = NavController.OnDestinationChangedListener { _, destination, _ ->metricsHolder.state?.addState("Navigation", destination.route.toString())}diff --git a/core-ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/JankStatsExtensions.kt b/core-ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/JankStatsExtensions.ktindex 3d606b6a3..4b1459a2d 100644--- a/core-ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/JankStatsExtensions.kt+++ b/core-ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/JankStatsExtensions.kt@@ -17,6 +17,9 @@package com.google.samples.apps.nowinandroid.core.uiimport androidx.compose.runtime.Composable+import androidx.compose.runtime.DisposableEffect+import androidx.compose.runtime.DisposableEffectResult+import androidx.compose.runtime.DisposableEffectScopeimport androidx.compose.runtime.LaunchedEffectimport androidx.compose.runtime.rememberimport androidx.compose.ui.platform.LocalView@@ -52,3 +55,19 @@ fun JankMetricEffect(reportMetric(metrics)}}++/**+ * Convenience function to work with [PerformanceMetricsState] state that needs to be cleaned up.+ * The side effect is re-launched if any of the [keys] value is not equal to the previous composition.+ */+@Composable+fun JankMetricDisposableEffect(+ vararg keys: Any?,+ reportMetric: DisposableEffectScope.(state: PerformanceMetricsState.MetricsStateHolder) -> DisposableEffectResult+) {+ val metrics = rememberMetricsStateHolder()+ DisposableEffect(metrics, *keys) {+ reportMetric(this, metrics)+ }+}+diff --git a/feature-interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.kt b/feature-interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.ktindex eeba8e53d..3a1c3ac7b 100644--- a/feature-interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.kt+++ b/feature-interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.kt@@ -29,7 +29,6 @@ import androidx.compose.material.icons.filled.MoreVertimport androidx.compose.material.icons.filled.Searchimport androidx.compose.material3.Textimport androidx.compose.runtime.Composable-import androidx.compose.runtime.DisposableEffectimport androidx.compose.runtime.collectAsStateimport androidx.compose.runtime.getValueimport androidx.compose.ui.Alignment@@ -37,11 +36,11 @@ import androidx.compose.ui.Modifierimport androidx.compose.ui.res.stringResourceimport androidx.compose.ui.unit.dpimport androidx.hilt.navigation.compose.hiltViewModel+import com.google.samples.apps.nowinandroid.core.ui.JankMetricDisposableEffectimport com.google.samples.apps.nowinandroid.core.ui.LoadingWheelimport com.google.samples.apps.nowinandroid.core.ui.component.NiaTabimport com.google.samples.apps.nowinandroid.core.ui.component.NiaTabRowimport com.google.samples.apps.nowinandroid.core.ui.component.NiaTopAppBar-import com.google.samples.apps.nowinandroid.core.ui.rememberMetricsStateHolder@Composablefun InterestsRoute(@@ -63,8 +62,7 @@ fun InterestsRoute(modifier = modifier)- val metricsHolder = rememberMetricsStateHolder()- DisposableEffect(tabState, metricsHolder) {+ JankMetricDisposableEffect(tabState) { metricsHolder ->metricsHolder.state?.addState("Interests:TabState", "currentIndex:${tabState.currentIndex}")onDispose {