Merge branch 'main' into bw/initialMetrics

app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaApp.kt

@@ -44,6 +44,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.semantics.testTagsAsResourceId
 import androidx.navigation.NavController
 import androidx.navigation.NavDestination
 import androidx.navigation.NavDestination.Companion.hierarchy

feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/AuthorsCarousel.kt

@@ -18,8 +18,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.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -66,10 +68,14 @@ fun AuthorsCarousel(
     modifier: Modifier = Modifier
 ) {
     val lazyListState = rememberLazyListState()
-
     TrackScrollJank(lazyListState, "ForYou:AuthorsCarousel")
 
-    LazyRow(modifier, lazyListState) {
+    LazyRow(
+        modifier = modifier.testTag("forYou:authors"),
+        contentPadding = PaddingValues(24.dp),
+        horizontalArrangement = Arrangement.spacedBy(24.dp),
+        state = lazyListState
+    ) {
         items(items = authors, key = { item -> item.author.id }) { followableAuthor ->
             AuthorItem(
                 author = followableAuthor.author,

feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt

@@ -170,12 +170,35 @@ fun ForYouScreen(
                     else -> floor(maxWidth / 300.dp).toInt().coerceAtLeast(1)
                 }
 
+                // Workaround to call Activity.reportFullyDrawn from Jetpack Compose.
+                // This code should be called when the UI is ready for use
+                // and relates to Time To Full Display.
+                val interestsLoaded =
+                    interestsSelectionState !is ForYouInterestsSelectionUiState.Loading
+                val feedLoaded = feedState !is ForYouFeedUiState.Loading
+
+                if (interestsLoaded && feedLoaded) {
+                    val localView = LocalView.current
+                    // We use Unit to call reportFullyDrawn only on the first recomposition,
+                    // however it will be called again if this composable goes out of scope.
+                    // Activity.reportFullyDrawn() has its own check for this
+                    // and is safe to call multiple times though.
+                    LaunchedEffect(Unit) {
+                        // We're leveraging the fact, that the current view is directly set as content of Activity.
+                        val activity = localView.context as? Activity ?: return@LaunchedEffect
+                        // To be sure not to call in the middle of a frame draw.
+                        localView.doOnPreDraw { activity.reportFullyDrawn() }
+                    }
+                }
+
                 val lazyListState = rememberLazyListState()
                 TrackScrollJank(lazyListState, "ForYou:Feed")
 
                 LazyColumn(
+                    modifier = Modifier
+                        .fillMaxSize()
+                        .testTag("forYou:feed"),
                     state = lazyListState,
-                    modifier = Modifier.fillMaxSize(),
                 ) {
                     InterestsSelection(
                         interestsSelectionState = interestsSelectionState,
@@ -299,9 +322,8 @@ private fun TopicSelection(
     interestsSelectionState: ForYouInterestsSelectionUiState.WithInterestsSelection,
     onTopicCheckedChanged: (String, Boolean) -> Unit,
     modifier: Modifier = Modifier
-) {
+) = trace("TopicSelection") {
     val lazyGridState = rememberLazyGridState()
-
     TrackScrollJank(scrollableState = lazyGridState, stateName = "ForYou:TopicSelection")
 
     LazyHorizontalGrid(