Merge branch 'main' into compose-bom-2023-06-00

README.md

@@ -45,11 +45,6 @@ understanding of which libraries and tools are being used, the reasoning behind
 UI, testing, architecture and more, and how all of these different pieces of the project fit
 together to create a complete app.
 
-NOTE: Building the app using an M1 Mac will require the use of
-[Rosetta](https://support.apple.com/en-gb/HT211861). See
-[the following bug](https://github.com/protocolbuffers/protobuf/issues/9397#issuecomment-1086138036)
-for more details.
-
 # Architecture
 
 The **Now in Android** app follows the

app/build.gradle.kts

@@ -119,6 +119,7 @@ dependencies {
     implementation(libs.androidx.navigation.compose)
     implementation(libs.androidx.window.manager)
     implementation(libs.androidx.profileinstaller)
+    implementation(libs.kotlinx.coroutines.guava)
     implementation(libs.coil.kt)
 }
 

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

@@ -17,6 +17,7 @@
 package com.google.samples.apps.nowinandroid
 
 import android.os.Bundle
+import android.util.Log
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.viewModels
@@ -35,6 +36,7 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import androidx.metrics.performance.JankStats
+import androidx.profileinstaller.ProfileVerifier
 import com.google.accompanist.systemuicontroller.rememberSystemUiController
 import com.google.samples.apps.nowinandroid.MainActivityUiState.Loading
 import com.google.samples.apps.nowinandroid.MainActivityUiState.Success
@@ -47,11 +49,16 @@ import com.google.samples.apps.nowinandroid.core.model.data.DarkThemeConfig
 import com.google.samples.apps.nowinandroid.core.model.data.ThemeBrand
 import com.google.samples.apps.nowinandroid.ui.NiaApp
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.guava.await
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import javax.inject.Inject
 
+private const val TAG = "MainActivity"
+
 @OptIn(ExperimentalMaterial3WindowSizeClassApi::class)
 @AndroidEntryPoint
 class MainActivity : ComponentActivity() {
@@ -133,12 +140,48 @@ class MainActivity : ComponentActivity() {
     override fun onResume() {
         super.onResume()
         lazyStats.get().isTrackingEnabled = true
+        lifecycleScope.launch {
+            logCompilationStatus()
+        }
     }
 
     override fun onPause() {
         super.onPause()
         lazyStats.get().isTrackingEnabled = false
     }
+
+    /**
+     * Logs the app's Baseline Profile Compilation Status using [ProfileVerifier].
+     */
+    private suspend fun logCompilationStatus() {
+        /*
+        When delivering through Google Play, the baseline profile is compiled during installation.
+        In this case you will see the correct state logged without any further action necessary.
+        To verify baseline profile installation locally, you need to manually trigger baseline
+        profile installation.
+        For immediate compilation, call:
+         `adb shell cmd package compile -f -m speed-profile com.example.macrobenchmark.target`
+        You can also trigger background optimizations:
+         `adb shell pm bg-dexopt-job`
+        Both jobs run asynchronously and might take some time complete.
+        To see quick turnaround of the ProfileVerifier, we recommend using `speed-profile`.
+        If you don't do either of these steps, you might only see the profile status reported as
+        "enqueued for compilation" when running the sample locally.
+        */
+        withContext(Dispatchers.IO) {
+            val status = ProfileVerifier.getCompilationStatusAsync().await()
+            Log.d(TAG, "ProfileInstaller status code: ${status.profileInstallResultCode}")
+            Log.d(
+                TAG,
+                when {
+                    status.isCompiledWithProfile -> "ProfileInstaller: is compiled with profile"
+                    status.hasProfileEnqueuedForCompilation() ->
+                        "ProfileInstaller: Enqueued for compilation"
+                    else -> "Profile not compiled or enqueued"
+                },
+            )
+        }
+    }
 }
 
 /**

benchmarks/src/main/java/com/google/samples/apps/nowinandroid/baselineprofile/BaselineProfileGenerator.kt

@@ -16,7 +16,6 @@
 
 package com.google.samples.apps.nowinandroid.baselineprofile
 
-import androidx.benchmark.macro.ExperimentalBaselineProfilesApi
 import androidx.benchmark.macro.junit4.BaselineProfileRule
 import com.google.samples.apps.nowinandroid.PACKAGE_NAME
 import com.google.samples.apps.nowinandroid.bookmarks.goToBookmarksScreen
@@ -31,13 +30,12 @@ import org.junit.Test
 /**
  * Generates a baseline profile which can be copied to `app/src/main/baseline-prof.txt`.
  */
-@ExperimentalBaselineProfilesApi
 class BaselineProfileGenerator {
     @get:Rule val baselineProfileRule = BaselineProfileRule()
 
     @Test
     fun generate() =
-        baselineProfileRule.collectBaselineProfile(PACKAGE_NAME) {
+        baselineProfileRule.collect(PACKAGE_NAME) {
             // This block defines the app's critical user journey. Here we are interested in
             // optimizing for app startup. But you can also navigate and scroll
             // through your most important UI.

build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt

@@ -33,7 +33,7 @@ class AndroidApplicationConventionPlugin : Plugin<Project> {
 
             extensions.configure<ApplicationExtension> {
                 configureKotlinAndroid(this)
-                defaultConfig.targetSdk = 33
+                defaultConfig.targetSdk = 34
                 configureGradleManagedDevices(this)
             }
             extensions.configure<ApplicationAndroidComponentsExtension> {

build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt

@@ -38,7 +38,7 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
 
             extensions.configure<LibraryExtension> {
                 configureKotlinAndroid(this)
-                defaultConfig.targetSdk = 33
+                defaultConfig.targetSdk = 34
                 configureFlavors(this)
                 configureGradleManagedDevices(this)
             }

build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt

@@ -33,7 +33,7 @@ internal fun Project.configureKotlinAndroid(
     commonExtension: CommonExtension<*, *, *, *>,
 ) {
     commonExtension.apply {
-        compileSdk = 33
+        compileSdk = 34
 
         defaultConfig {
             minSdk = 21

core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsFeed.kt

@@ -57,7 +57,11 @@ fun LazyGridScope.newsFeed(
     when (feedState) {
         NewsFeedUiState.Loading -> Unit
         is NewsFeedUiState.Success -> {
-            items(feedState.feed, key = { it.id }) { userNewsResource ->
+            items(
+                items = feedState.feed,
+                key = { it.id },
+                contentType = { "newsFeedItem" },
+            ) { userNewsResource ->
                 val resourceUrl by remember {
                     mutableStateOf(Uri.parse(userNewsResource.url))
                 }

docs/ModularizationLearningJourney.md

@@ -171,7 +171,7 @@ Using the above modularization strategy, the Now in Android app has the followin
   <tr>
    <td><code>core:ui</code>
    </td>
-   <td>Composite UI components and resources used by feature modules, such as the news feed. Unlike the <code>designsystem<code> module, it is dependent on the data layer since it renders models, like news resources. 
+   <td>Composite UI components and resources used by feature modules, such as the news feed. Unlike the <code>designsystem</code> module, it is dependent on the data layer since it renders models, like news resources. 
    </td>
    <td> <code>NewsFeed</code> <code>NewsResourceCardExpanded</code>
    </td>

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

@@ -182,7 +182,7 @@ internal fun ForYouScreen(
             onTopicClick = onTopicClick,
         )
 
-        item(span = { GridItemSpan(maxLineSpan) }) {
+        item(span = { GridItemSpan(maxLineSpan) }, contentType = "bottomSpacing") {
             Column {
                 Spacer(modifier = Modifier.height(8.dp))
                 // Add space for the content to clear the "offline" snackbar.
@@ -240,7 +240,7 @@ private fun LazyGridScope.onboarding(
         -> Unit
 
         is OnboardingUiState.Shown -> {
-            item(span = { GridItemSpan(maxLineSpan) }) {
+            item(span = { GridItemSpan(maxLineSpan) }, contentType = "onboarding") {
                 Column(modifier = interestsItemModifier) {
                     Text(
                         text = stringResource(R.string.onboarding_guidance_title),

feature/settings/src/main/java/com/google/samples/apps/nowinandroid/feature/settings/SettingsDialog.kt

@@ -17,9 +17,11 @@
 package com.google.samples.apps.nowinandroid.feature.settings
 
 import android.content.Intent
+import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.ExperimentalLayoutApi
 import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.Row
@@ -149,8 +151,9 @@ fun SettingsDialog(
     )
 }
 
+// [ColumnScope] is used for using the [ColumnScope.AnimatedVisibility] extension overload composable.
 @Composable
-private fun SettingsPanel(
+private fun ColumnScope.SettingsPanel(
     settings: UserEditableSettings,
     supportDynamicColor: Boolean,
     onChangeThemeBrand: (themeBrand: ThemeBrand) -> Unit,
@@ -170,19 +173,21 @@ private fun SettingsPanel(
             onClick = { onChangeThemeBrand(ANDROID) },
         )
     }
-    if (settings.brand == DEFAULT && supportDynamicColor) {
+    AnimatedVisibility(visible = settings.brand == DEFAULT && supportDynamicColor) {
-        SettingsDialogSectionTitle(text = stringResource(R.string.dynamic_color_preference))
+        Column {
-        Column(Modifier.selectableGroup()) {
+            SettingsDialogSectionTitle(text = stringResource(R.string.dynamic_color_preference))
-            SettingsDialogThemeChooserRow(
+            Column(Modifier.selectableGroup()) {
-                text = stringResource(string.dynamic_color_yes),
+                SettingsDialogThemeChooserRow(
-                selected = settings.useDynamicColor,
+                    text = stringResource(string.dynamic_color_yes),
-                onClick = { onChangeDynamicColorPreference(true) },
+                    selected = settings.useDynamicColor,
-            )
+                    onClick = { onChangeDynamicColorPreference(true) },
-            SettingsDialogThemeChooserRow(
+                )
-                text = stringResource(string.dynamic_color_no),
+                SettingsDialogThemeChooserRow(
-                selected = !settings.useDynamicColor,
+                    text = stringResource(string.dynamic_color_no),
-                onClick = { onChangeDynamicColorPreference(false) },
+                    selected = !settings.useDynamicColor,
-            )
+                    onClick = { onChangeDynamicColorPreference(false) },
+                )
+            }
         }
     }
     SettingsDialogSectionTitle(text = stringResource(R.string.dark_mode_preference))

gradle/libs.versions.toml

@@ -17,7 +17,7 @@ androidxLifecycle = "2.6.1"
 androidxMacroBenchmark = "1.1.1"
 androidxMetrics = "1.0.0-alpha03"
 androidxNavigation = "2.5.3"
-androidxProfileinstaller = "1.3.0"
+androidxProfileinstaller = "1.3.1"
 androidxStartup = "1.1.1"
 androidxTestCore = "1.5.0"
 androidxTestExt = "1.1.4"
@@ -116,6 +116,7 @@ hilt-ext-work = { group = "androidx.hilt", name = "hilt-work", version.ref = "hi
 junit4 = { group = "junit", name = "junit", version.ref = "junit4" }
 kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-jdk8", version.ref = "kotlin" }
 kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "kotlinxCoroutines" }
+kotlinx-coroutines-guava = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-guava", version.ref = "kotlinxCoroutines" }
 kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "kotlinxCoroutines" }
 kotlinx-datetime = { group = "org.jetbrains.kotlinx", name = "kotlinx-datetime", version.ref = "kotlinxDatetime" }
 kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinxSerializationJson" }