A fully functional Android app built entirely with Kotlin and Jetpack Compose
Update JankStats to 1.0.0-alpha03
Ben Weiss6dc17126da6d
diff --git a/app/src/main/java/com/google/samples/apps/nowinandroid/di/JankStatsModule.kt b/app/src/main/java/com/google/samples/apps/nowinandroid/di/JankStatsModule.ktindex 6d11a9f68..90f844c1b 100644--- a/app/src/main/java/com/google/samples/apps/nowinandroid/di/JankStatsModule.kt+++ b/app/src/main/java/com/google/samples/apps/nowinandroid/di/JankStatsModule.kt@@ -24,9 +24,6 @@ import dagger.Moduleimport dagger.Providesimport dagger.hilt.InstallInimport dagger.hilt.android.components.ActivityComponent-import java.util.concurrent.Executor-import kotlinx.coroutines.Dispatchers-import kotlinx.coroutines.asExecutor@Module@InstallIn(ActivityComponent::class)@@ -47,17 +44,11 @@ object JankStatsModule {return activity.window}- @Provides- fun providesDefaultExecutor(): Executor {- return Dispatchers.Default.asExecutor()- }-@Providesfun providesJankStats(window: Window,- executor: Executor,frameListener: JankStats.OnFrameListener): JankStats {- return JankStats.createAndTrack(window, executor, frameListener)+ return JankStats.createAndTrack(window, frameListener)}}diff --git a/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt b/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaAppState.ktindex dc620490a..bf80984fa 100644--- a/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt+++ b/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt@@ -143,7 +143,7 @@ class NiaAppState(private fun NavigationTrackingSideEffect(navController: NavHostController) {JankMetricDisposableEffect(navController) { metricsHolder ->val listener = NavController.OnDestinationChangedListener { _, destination, _ ->- metricsHolder.state?.addState("Navigation", destination.route.toString())+ metricsHolder.state?.putState("Navigation", destination.route.toString())}navController.addOnDestinationChangedListener(listener)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 6fdb948c7..ef7375f48 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@@ -26,7 +26,7 @@ import androidx.compose.runtime.rememberimport androidx.compose.runtime.snapshotFlowimport androidx.compose.ui.platform.LocalViewimport androidx.metrics.performance.PerformanceMetricsState-import androidx.metrics.performance.PerformanceMetricsState.MetricsStateHolder+import androidx.metrics.performance.PerformanceMetricsState.Holderimport kotlinx.coroutines.CoroutineScope/**@@ -35,11 +35,11 @@ import kotlinx.coroutines.CoroutineScope* @see PerformanceMetricsState.getForHierarchy*/@Composable-fun rememberMetricsStateHolder(): MetricsStateHolder {+fun rememberMetricsStateHolder(): Holder {val localView = LocalView.currentreturn remember(localView) {- PerformanceMetricsState.getForHierarchy(localView)+ PerformanceMetricsState.getHolderForHierarchy(localView)}}@@ -51,7 +51,7 @@ fun rememberMetricsStateHolder(): MetricsStateHolder {@Composablefun JankMetricEffect(vararg keys: Any?,- reportMetric: suspend CoroutineScope.(state: MetricsStateHolder) -> Unit+ reportMetric: suspend CoroutineScope.(state: Holder) -> Unit) {val metrics = rememberMetricsStateHolder()LaunchedEffect(metrics, *keys) {@@ -66,7 +66,7 @@ fun JankMetricEffect(@Composablefun JankMetricDisposableEffect(vararg keys: Any?,- reportMetric: DisposableEffectScope.(state: MetricsStateHolder) -> DisposableEffectResult+ reportMetric: DisposableEffectScope.(state: Holder) -> DisposableEffectResult) {val metrics = rememberMetricsStateHolder()DisposableEffect(metrics, *keys) {@@ -80,7 +80,7 @@ fun TrackScrollJank(scrollableState: ScrollableState, stateName: String) {snapshotFlow { scrollableState.isScrollInProgress }.collect { isScrollInProgress ->metricsHolder.state?.apply {if (isScrollInProgress) {- addState(stateName, "Scrolling=true")+ putState(stateName, "Scrolling=true")} else {removeState(stateName)}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 c0961919e..31ca66db5 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@@ -69,7 +69,7 @@ fun InterestsRoute()JankMetricDisposableEffect(tabState) { metricsHolder ->- metricsHolder.state?.addState("Interests:TabState", "currentIndex:${tabState.currentIndex}")+ metricsHolder.state?.putState("Interests:TabState", "currentIndex:${tabState.currentIndex}")onDispose {metricsHolder.state?.removeState("Interests:TabState")diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.tomlindex a58115498..adc220d2e 100644--- a/gradle/libs.versions.toml+++ b/gradle/libs.versions.toml@@ -15,7 +15,7 @@ androidxHiltNavigationCompose = "1.0.0"androidxLifecycle = "2.6.0-alpha01"androidxMacroBenchmark = "1.1.0"androidxNavigation = "2.5.0"-androidxMetrics = "1.0.0-alpha01"+androidxMetrics = "1.0.0-alpha03"androidxProfileinstaller = "1.2.0-rc01"androidxSavedState = "1.1.0"androidxStartup = "1.1.1"