A fully functional Android app built entirely with Kotlin and Jetpack Compose
Merge branch 'bw/initialMetrics' of github.com:android/nowinandroid into bw/initialMetrics
Ben Weisse9497490732a
diff --cc app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaApp.ktindex 135634a31,50b5f57da..20a2decb6--- 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@@@ -50,6 -53,8 +51,7 @@@ import androidx.navigation.NavDestinatiimport androidx.navigation.NavDestination.Companion.hierarchyimport androidx.navigation.compose.currentBackStackEntryAsStateimport androidx.navigation.compose.rememberNavController-import 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.NiaBackgroundimport com.google.samples.apps.nowinandroid.core.ui.theme.NiaThemeimport com.google.samples.apps.nowinandroid.navigation.NiaNavHostdiff --cc core-ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/JankStatsExtensions.ktindex 000000000,4b1459a2d..2ae7aa97amode 000000,100644..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@@@ -1,0 -1,73 +1,73 @@@+ /*+ * Copyright 2022 The Android Open Source Project+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * https://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++ package com.google.samples.apps.nowinandroid.core.ui++ import androidx.compose.runtime.Composable+ import androidx.compose.runtime.DisposableEffect+ import androidx.compose.runtime.DisposableEffectResult+ import androidx.compose.runtime.DisposableEffectScope+ import androidx.compose.runtime.LaunchedEffect+ import androidx.compose.runtime.remember+ import androidx.compose.ui.platform.LocalView+ import androidx.metrics.performance.PerformanceMetricsState++import androidx.metrics.performance.PerformanceMetricsState.MetricsStateHolder+ import kotlinx.coroutines.CoroutineScope++ /**+ * Retrieves [PerformanceMetricsState.MetricsStateHolder] from current [LocalView] and+ * remembers it until the View changes.+ * @see PerformanceMetricsState.getForHierarchy+ */+ @Composable-fun rememberMetricsStateHolder(): PerformanceMetricsState.MetricsStateHolder {++fun rememberMetricsStateHolder(): MetricsStateHolder {+ val localView = LocalView.current++ return remember(localView) {+ PerformanceMetricsState.getForHierarchy(localView)+ }+ }++ /**+ * Convenience function to work with [PerformanceMetricsState] state. The side effect is+ * re-launched if any of the [keys] value is not equal to the previous composition.+ * @see JankMetricDisposableEffect if you need to work with DisposableEffect to cleanup added state.+ */+ @Composable+ fun JankMetricEffect(+ vararg keys: Any?,- reportMetric: suspend CoroutineScope.(state: PerformanceMetricsState.MetricsStateHolder) -> Unit++ reportMetric: suspend CoroutineScope.(state: MetricsStateHolder) -> Unit+ ) {+ val metrics = rememberMetricsStateHolder()+ LaunchedEffect(metrics, *keys) {+ 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++ reportMetric: DisposableEffectScope.(state: MetricsStateHolder) -> DisposableEffectResult+ ) {+ val metrics = rememberMetricsStateHolder()+ DisposableEffect(metrics, *keys) {+ reportMetric(this, metrics)+ }+ }-diff --cc feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/AuthorsCarousel.ktindex c75592511,bf1f5d5dc..1544d7dad--- a/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/AuthorsCarousel.kt+++ b/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/AuthorsCarousel.kt@@@ -16,12 -16,8 +16,10 @@@package com.google.samples.apps.nowinandroid.feature.foryou+import androidx.compose.foundation.background+import androidx.compose.foundation.interaction.MutableInteractionSource- import androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.Boximport androidx.compose.foundation.layout.Column- import androidx.compose.foundation.layout.PaddingValuesimport androidx.compose.foundation.layout.Spacerimport androidx.compose.foundation.layout.fillMaxWidthimport androidx.compose.foundation.layout.height@@@ -30,17 -26,14 +28,19 @@@ import androidx.compose.foundation.layoimport androidx.compose.foundation.layout.sizeInimport androidx.compose.foundation.lazy.LazyRowimport androidx.compose.foundation.lazy.items+ import androidx.compose.foundation.lazy.rememberLazyListStateimport androidx.compose.foundation.selection.toggleableimport androidx.compose.foundation.shape.CircleShape+import androidx.compose.material.icons.Icons+import androidx.compose.material.icons.filled.Person+import androidx.compose.material.ripple.rememberRipple+import androidx.compose.material3.Iconimport androidx.compose.material3.MaterialThemeimport androidx.compose.material3.Surfaceimport androidx.compose.material3.Textimport androidx.compose.runtime.Composable+import androidx.compose.runtime.remember+ import androidx.compose.runtime.snapshotFlowimport androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifierimport androidx.compose.ui.draw.clip@@@ -64,11 -60,25 +67,25 @@@ fun AuthorsCarouselonAuthorClick: (String, Boolean) -> Unit,modifier: Modifier = Modifier) {- LazyRow(- modifier = modifier,- contentPadding = PaddingValues(24.dp),- horizontalArrangement = Arrangement.spacedBy(24.dp)- ) {+ val lazyListState = rememberLazyListState()++ JankMetricEffect(lazyListState) { metricsHolder ->+ combine(+ snapshotFlow { lazyListState.isScrollInProgress },+ snapshotFlow { lazyListState.firstVisibleItemIndex }+ ) { isScrollInProgress, firstVisibleItemIndex ->+ if (isScrollInProgress) {+ metricsHolder.state?.addState(+ "ForYou:AuthorsCarousel:Scrolling",- "Index=${firstVisibleItemIndex}"++ "Index=$firstVisibleItemIndex"+ )+ } else {+ metricsHolder.state?.removeState("ForYou:AuthorsCarousel:Scrolling")+ }+ }.collect()+ }++ LazyRow(modifier, lazyListState) {items(items = authors, key = { item -> item.author.id }) { followableAuthor ->AuthorItem(author = followableAuthor.author,diff --cc feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.ktindex 1bce189a5,8a3782a8b..f6bfc63bf--- a/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt+++ b/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt@@@ -95,8 -99,10 +99,10 @@@ import com.google.samples.apps.nowinandimport com.google.samples.apps.nowinandroid.core.ui.icon.NiaIconsimport com.google.samples.apps.nowinandroid.core.ui.theme.NiaThemeimport com.google.samples.apps.nowinandroid.core.ui.theme.NiaTypography+import kotlin.math.floor+ import kotlinx.coroutines.flow.collect+ import kotlinx.coroutines.flow.combineimport kotlinx.datetime.Instant-import kotlin.math.floor@Composablefun ForYouRoute(@@@ -166,7 -172,25 +172,25 @@@ fun ForYouScreenelse -> floor(maxWidth / 300.dp).toInt().coerceAtLeast(1)}+ val lazyListState = rememberLazyListState()+ JankMetricEffect(lazyListState) { metricsHolder ->+ combine(+ snapshotFlow { lazyListState.isScrollInProgress },+ snapshotFlow { lazyListState.firstVisibleItemIndex },+ ) { isScrollInProgress, firstVisibleItemIndex ->+ if (isScrollInProgress) {+ metricsHolder.state?.addState(+ "ForYou:Feed:Scrolling",- "index=${firstVisibleItemIndex}"++ "index=$firstVisibleItemIndex"+ )+ } else {+ metricsHolder.state?.removeState("ForYou:Feed:Scrolling")+ }+ }.collect()+ }+LazyColumn(+ state = lazyListState,modifier = Modifier.fillMaxSize(),) {InterestsSelection(@@@ -297,7 -321,25 +321,25 @@@ private fun TopicSelectiononTopicCheckedChanged: (String, Boolean) -> Unit,modifier: Modifier = Modifier) {+ val lazyGridState = rememberLazyGridState()+ JankMetricEffect(lazyGridState) { metricsHolder ->+ combine(+ snapshotFlow { lazyGridState.isScrollInProgress },+ snapshotFlow { lazyGridState.firstVisibleItemIndex },+ ) { isScrollInProgress, firstVisibleItemIndex ->+ if (isScrollInProgress) {+ metricsHolder.state?.addState(+ "ForYou:TopicSelection:Scrolling",- "index=${firstVisibleItemIndex}"++ "index=$firstVisibleItemIndex"+ )+ } else {+ metricsHolder.state?.removeState("ForYou:TopicSelection:Scrolling")+ }+ }.collect()+ }+LazyHorizontalGrid(+ state = lazyGridState,rows = GridCells.Fixed(3),horizontalArrangement = Arrangement.spacedBy(12.dp),verticalArrangement = Arrangement.spacedBy(12.dp),diff --cc gradle/libs.versions.tomlindex 5ac3c731f,5949dba81..af60436ed--- a/gradle/libs.versions.toml+++ b/gradle/libs.versions.toml@@@ -11,15 -11,17 +11,17 @@@ androidxCustomView = "1.0.0-beta02androidxDataStore = "1.0.0"androidxEspresso = "3.3.0"androidxHiltNavigationCompose = "1.0.0"-androidxLifecycle = "2.5.0-beta01"-androidxMacroBenchmark = "1.1.0-rc02"+androidxLifecycle = "2.5.0-rc01"+androidxMacroBenchmark = "1.1.0-rc03"+androidxNavigation = "2.4.2"+ androidxMetrics = "1.0.0-alpha01"-androidxNavigation = "2.4.0-rc01"androidxProfileinstaller = "1.2.0-beta01"androidxSavedState = "1.1.0"androidxStartup = "1.1.1"androidxWindowManager = "1.0.0"androidxTest = "1.4.0"-androidxTestExt = "1.1.2"+androidxTestExt = "1.1.3"+ androidxTracing = "1.1.0"androidxUiAutomator = "2.2.0"androidxWork = "2.7.1"coil = "2.0.0-rc01"