From b72d0fe1af2bf8bd7a1afcc116e48132627b1a8f Mon Sep 17 00:00:00 2001
From: Alex Vanyo <vanyo@google.com>
Date: Thu, 2 Feb 2023 11:27:54 -0800
Subject: [PATCH 01/19] Fix settings dialog dismissed test on non-portrait
 phones

Change-Id: I15ed475915fdef198029db2713b6f619da374cc7
---
 .../samples/apps/nowinandroid/ui/NavigationTest.kt    | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/src/androidTest/java/com/google/samples/apps/nowinandroid/ui/NavigationTest.kt b/app/src/androidTest/java/com/google/samples/apps/nowinandroid/ui/NavigationTest.kt
index 17dd28ac7..a37eb7a77 100644
--- a/app/src/androidTest/java/com/google/samples/apps/nowinandroid/ui/NavigationTest.kt
+++ b/app/src/androidTest/java/com/google/samples/apps/nowinandroid/ui/NavigationTest.kt
@@ -19,9 +19,11 @@ package com.google.samples.apps.nowinandroid.ui
 import androidx.compose.ui.test.assertCountEquals
 import androidx.compose.ui.test.assertIsOn
 import androidx.compose.ui.test.assertIsSelected
+import androidx.compose.ui.test.hasAnyAncestor
+import androidx.compose.ui.test.hasTestTag
+import androidx.compose.ui.test.hasText
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import androidx.compose.ui.test.onAllNodesWithText
-import androidx.compose.ui.test.onLast
 import androidx.compose.ui.test.onNodeWithContentDescription
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
@@ -213,7 +215,12 @@ class NavigationTest {
             onNodeWithText(ok).performClick()
 
             // Check that the saved screen is still visible and selected.
-            onAllNodesWithText(saved).onLast().assertIsSelected()
+            onNode(
+                hasText(saved) and
+                    hasAnyAncestor(
+                        hasTestTag("NiaBottomBar") or hasTestTag("NiaNavRail"),
+                    ),
+            ).assertIsSelected()
         }
     }
 

From 437df27d4c64c82aff0360ce4267049d264b0dbc Mon Sep 17 00:00:00 2001
From: Lawrence Gimenez <law@gmnz.xyz>
Date: Fri, 3 Feb 2023 20:54:49 +0800
Subject: [PATCH 02/19] Update AGP to v7.4.1

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 828e38f12..dd5e4677e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 accompanist = "0.28.0"
 androidDesugarJdkLibs = "1.2.2"
-androidGradlePlugin = "7.4.0"
+androidGradlePlugin = "7.4.1"
 androidxActivity = "1.6.1"
 androidxAppCompat = "1.5.1"
 androidxBrowser = "1.4.0"

From 5c1bd0ff6678e3693d14fd6062b9eb5f6ce90249 Mon Sep 17 00:00:00 2001
From: alteredworlds <twcgilbert@gmail.com>
Date: Fri, 3 Feb 2023 16:37:49 +0000
Subject: [PATCH 03/19] Update docs/ArchitectureLearningJourney.md - Writing
 data

---
 docs/ArchitectureLearningJourney.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/ArchitectureLearningJourney.md b/docs/ArchitectureLearningJourney.md
index 6b6fa4420..9b5a0e6aa 100644
--- a/docs/ArchitectureLearningJourney.md
+++ b/docs/ArchitectureLearningJourney.md
@@ -192,9 +192,9 @@ Whenever the list of topics changes (for example, when a new topic is added), th
 
 To write data, the repository provides suspend functions. It is up to the caller to ensure that their execution is suitably scoped.
 
-_Example: Follow a topic_
+_Example: Follow a set of topics_
 
-Simply call `TopicsRepository.setFollowedTopicId` with the ID of the topic which the user wishes to follow.
+Simply call `UserDataRepository.setFollowedTopicIds` with the set of IDs of the topics the user wishes to follow.
 
 
 ### Data sources

From 8e7a65027f02ddbc37ff3922ec10862eeaf70e21 Mon Sep 17 00:00:00 2001
From: alteredworlds <twcgilbert@gmail.com>
Date: Fri, 3 Feb 2023 16:53:43 +0000
Subject: [PATCH 04/19] Update docs/ArchitectureLearningJourney.md - User
 action follow topic

---
 docs/ArchitectureLearningJourney.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ArchitectureLearningJourney.md b/docs/ArchitectureLearningJourney.md
index 9b5a0e6aa..741c5c424 100644
--- a/docs/ArchitectureLearningJourney.md
+++ b/docs/ArchitectureLearningJourney.md
@@ -309,7 +309,7 @@ User actions are communicated from UI elements to ViewModels using regular metho
 
 **Example: Following a topic**
 
-The `InterestsScreen` takes a lambda expression named `followTopic` which is supplied from `InterestsViewModel.followTopic`. Each time the user taps on a topic to follow this method is called. The ViewModel then processes this action by informing the topics repository.
+The `InterestsScreen` takes a lambda expression named `followTopic` which is supplied from `InterestsViewModel.followTopic`. Each time the user taps on a topic to follow this method is called. The ViewModel then processes this action by informing the user data repository.
 
 
 ## Further reading

From 6146dd55769bcd67e8365190510a0babee67a04b Mon Sep 17 00:00:00 2001
From: Alex Vanyo <vanyo@google.com>
Date: Fri, 3 Feb 2023 15:38:48 -0800
Subject: [PATCH 05/19] Switch GMD to use a convention plugin

Change-Id: Ia4f94cd7533c9168752ee39e3f960108fe802ab4
---
 .github/workflows/AndroidCIWithGmd.yaml       |  5 +-
 .run/Generate Demo Baseline Profile.run.xml   |  2 +-
 benchmarks/build.gradle.kts                   | 13 ----
 .../AndroidApplicationConventionPlugin.kt     |  2 +
 .../kotlin/AndroidFeatureConventionPlugin.kt  |  3 +
 .../kotlin/AndroidLibraryConventionPlugin.kt  |  2 +
 .../kotlin/AndroidTestConventionPlugin.kt     |  2 +
 .../apps/nowinandroid/GradleManagedDevices.kt | 62 +++++++++++++++++++
 feature/bookmarks/build.gradle.kts            | 14 -----
 feature/foryou/build.gradle.kts               | 14 -----
 feature/interests/build.gradle.kts            | 14 -----
 feature/settings/build.gradle.kts             | 14 -----
 feature/topic/build.gradle.kts                | 14 -----
 13 files changed, 76 insertions(+), 85 deletions(-)
 create mode 100644 build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/GradleManagedDevices.kt

diff --git a/.github/workflows/AndroidCIWithGmd.yaml b/.github/workflows/AndroidCIWithGmd.yaml
index 6721d3aa0..eb890c4d5 100644
--- a/.github/workflows/AndroidCIWithGmd.yaml
+++ b/.github/workflows/AndroidCIWithGmd.yaml
@@ -10,6 +10,9 @@ jobs:
 
   android-ci:
     runs-on: macos-12
+    strategy:
+      matrix:
+        device-config: [ "pixel4api30aospatd" ]
 
     steps:
       - uses: actions/setup-java@v3
@@ -23,7 +26,7 @@ jobs:
 
       - name: Run instrumented tests with GMD
         run: ./gradlew cleanManagedDevices --unused-only &&
-          ./gradlew pixel4api30DemoDebugAndroidTest -Dorg.gradle.workers.max=1
+          ./gradlew ${{ matrix.device-config }}DemoDebugAndroidTest -Dorg.gradle.workers.max=1
           -Pandroid.testoptions.manageddevices.emulator.gpu="swiftshader_indirect" -Pandroid.experimental.testOptions.managedDevices.emulator.showKernelLogging=true --info
 
       - name: Upload test reports
diff --git a/.run/Generate Demo Baseline Profile.run.xml b/.run/Generate Demo Baseline Profile.run.xml
index 4c34e5a76..a4b0de892 100644
--- a/.run/Generate Demo Baseline Profile.run.xml	
+++ b/.run/Generate Demo Baseline Profile.run.xml	
@@ -34,7 +34,7 @@
       </option>
       <option name="taskNames">
         <list>
-          <option value=":benchmark:pixel6Api31DemoBenchmarkAndroidTest" />
+          <option value=":benchmark:pixel6Api31atdDemoBenchmarkAndroidTest" />
           <option value="--rerun" />
           <option value="--enable-display" />
         </list>
diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts
index ba04eda23..9af89d98d 100644
--- a/benchmarks/build.gradle.kts
+++ b/benchmarks/build.gradle.kts
@@ -65,19 +65,6 @@ android {
 
     targetProjectPath = ":app"
     experimentalProperties["android.experimental.self-instrumenting"] = true
-
-    testOptions {
-        // TODO: Convert it as a convention plugin once Flamingo goes out (https://github.com/android/nowinandroid/issues/523)
-        managedDevices {
-            devices {
-                create<ManagedVirtualDevice>("pixel6Api31") {
-                    device = "Pixel 6"
-                    apiLevel = 31
-                    systemImageSource = "aosp"
-                }
-            }
-        }
-    }
 }
 
 dependencies {
diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt
index 612eb6ad4..6bc5f9f9e 100644
--- a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt
@@ -17,6 +17,7 @@
 import com.android.build.api.variant.ApplicationAndroidComponentsExtension
 import com.android.build.api.dsl.ApplicationExtension
 import com.google.samples.apps.nowinandroid.configureFlavors
+import com.google.samples.apps.nowinandroid.configureGradleManagedDevices
 import com.google.samples.apps.nowinandroid.configureKotlinAndroid
 import com.google.samples.apps.nowinandroid.configurePrintApksTask
 import org.gradle.api.Plugin
@@ -35,6 +36,7 @@ class AndroidApplicationConventionPlugin : Plugin<Project> {
                 configureKotlinAndroid(this)
                 defaultConfig.targetSdk = 33
                 configureFlavors(this)
+                configureGradleManagedDevices(this)
             }
             extensions.configure<ApplicationAndroidComponentsExtension> {
                 configurePrintApksTask(this)
diff --git a/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt
index a637b78c0..0c71d9d4c 100644
--- a/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt
@@ -14,7 +14,9 @@
  *   limitations under the License.
  */
 
+import com.android.build.api.dsl.ApplicationExtension
 import com.android.build.gradle.LibraryExtension
+import com.google.samples.apps.nowinandroid.configureGradleManagedDevices
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.artifacts.VersionCatalogsExtension
@@ -35,6 +37,7 @@ class AndroidFeatureConventionPlugin : Plugin<Project> {
                     testInstrumentationRunner =
                         "com.google.samples.apps.nowinandroid.core.testing.NiaTestRunner"
                 }
+                configureGradleManagedDevices(this)
             }
 
             val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
index f7d6d184a..842873bae 100644
--- a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
@@ -18,6 +18,7 @@ import com.android.build.api.variant.AndroidComponentsExtension
 import com.android.build.api.variant.LibraryAndroidComponentsExtension
 import com.android.build.gradle.LibraryExtension
 import com.google.samples.apps.nowinandroid.configureFlavors
+import com.google.samples.apps.nowinandroid.configureGradleManagedDevices
 import com.google.samples.apps.nowinandroid.configureKotlinAndroid
 import com.google.samples.apps.nowinandroid.configurePrintApksTask
 import org.gradle.api.Plugin
@@ -40,6 +41,7 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
                 configureKotlinAndroid(this)
                 defaultConfig.targetSdk = 33
                 configureFlavors(this)
+                configureGradleManagedDevices(this)
             }
             extensions.configure<LibraryAndroidComponentsExtension> {
                 configurePrintApksTask(this)
diff --git a/build-logic/convention/src/main/kotlin/AndroidTestConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidTestConventionPlugin.kt
index 8d446505c..286871010 100644
--- a/build-logic/convention/src/main/kotlin/AndroidTestConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidTestConventionPlugin.kt
@@ -15,6 +15,7 @@
  */
 
 import com.android.build.gradle.TestExtension
+import com.google.samples.apps.nowinandroid.configureGradleManagedDevices
 import com.google.samples.apps.nowinandroid.configureKotlinAndroid
 import org.gradle.api.Plugin
 import org.gradle.api.Project
@@ -31,6 +32,7 @@ class AndroidTestConventionPlugin : Plugin<Project> {
             extensions.configure<TestExtension> {
                 configureKotlinAndroid(this)
                 defaultConfig.targetSdk = 31
+                configureGradleManagedDevices(this)
             }
         }
     }
diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/GradleManagedDevices.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/GradleManagedDevices.kt
new file mode 100644
index 000000000..f16344088
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/GradleManagedDevices.kt
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2023 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
+
+import com.android.build.api.dsl.CommonExtension
+import com.android.build.api.dsl.ManagedVirtualDevice
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.invoke
+import java.util.Locale
+
+/**
+ * Configure project for Gradle managed devices
+ */
+internal fun configureGradleManagedDevices(
+    commonExtension: CommonExtension<*, *, *, *>,
+) {
+    val deviceConfigs = listOf(
+        DeviceConfig("Pixel 4", 30, "aosp-atd"),
+        DeviceConfig("Pixel 6", 31, "aosp")
+    )
+
+    commonExtension.testOptions {
+        managedDevices {
+            devices {
+                deviceConfigs.forEach { deviceConfig ->
+                    maybeCreate(deviceConfig.taskName, ManagedVirtualDevice::class.java).apply {
+                        device = deviceConfig.device
+                        apiLevel = deviceConfig.apiLevel
+                        systemImageSource = deviceConfig.systemImageSource
+                    }
+                }
+            }
+        }
+    }
+}
+
+private data class DeviceConfig(
+    val device: String,
+    val apiLevel: Int,
+    val systemImageSource: String,
+) {
+    val taskName = buildString {
+        append(device.toLowerCase(Locale.ROOT).replace(" ", ""))
+        append("api")
+        append(apiLevel.toString())
+        append(systemImageSource.replace("-", ""))
+    }
+}
diff --git a/feature/bookmarks/build.gradle.kts b/feature/bookmarks/build.gradle.kts
index 2bbeec9a1..5dfd7e014 100644
--- a/feature/bookmarks/build.gradle.kts
+++ b/feature/bookmarks/build.gradle.kts
@@ -24,20 +24,6 @@ plugins {
 
 android {
     namespace = "com.google.samples.apps.nowinandroid.feature.bookmarks"
-
-    testOptions {
-        // TODO: Convert it as a convention plugin once Flamingo goes out (https://github.com/android/nowinandroid/issues/523)
-        managedDevices {
-            devices {
-                maybeCreate<ManagedVirtualDevice>("pixel4api30").apply {
-                    device = "Pixel 4"
-                    apiLevel = 30
-                    // ATDs currently support only API level 30.
-                    systemImageSource = "aosp-atd"
-                }
-            }
-        }
-    }
 }
 
 dependencies {
diff --git a/feature/foryou/build.gradle.kts b/feature/foryou/build.gradle.kts
index 59e0cc904..ed7be27dc 100644
--- a/feature/foryou/build.gradle.kts
+++ b/feature/foryou/build.gradle.kts
@@ -24,20 +24,6 @@ plugins {
 
 android {
     namespace = "com.google.samples.apps.nowinandroid.feature.foryou"
-
-    testOptions {
-        // TODO: Convert it as a convention plugin once Flamingo goes out (https://github.com/android/nowinandroid/issues/523)
-        managedDevices {
-            devices {
-                maybeCreate<ManagedVirtualDevice>("pixel4api30").apply {
-                    device = "Pixel 4"
-                    apiLevel = 30
-                    // ATDs currently support only API level 30.
-                    systemImageSource = "aosp-atd"
-                }
-            }
-        }
-    }
 }
 
 dependencies {
diff --git a/feature/interests/build.gradle.kts b/feature/interests/build.gradle.kts
index 8fd9dcd8d..12b3074e4 100644
--- a/feature/interests/build.gradle.kts
+++ b/feature/interests/build.gradle.kts
@@ -23,18 +23,4 @@ plugins {
 }
 android {
     namespace = "com.google.samples.apps.nowinandroid.feature.interests"
-
-    testOptions {
-        // TODO: Convert it as a convention plugin once Flamingo goes out (https://github.com/android/nowinandroid/issues/523)
-        managedDevices {
-            devices {
-                maybeCreate<ManagedVirtualDevice>("pixel4api30").apply {
-                    device = "Pixel 4"
-                    apiLevel = 30
-                    // ATDs currently support only API level 30.
-                    systemImageSource = "aosp-atd"
-                }
-            }
-        }
-    }
 }
diff --git a/feature/settings/build.gradle.kts b/feature/settings/build.gradle.kts
index 41dee24dc..8d1d846da 100644
--- a/feature/settings/build.gradle.kts
+++ b/feature/settings/build.gradle.kts
@@ -24,18 +24,4 @@ plugins {
 
 android {
     namespace = "com.google.samples.apps.nowinandroid.feature.settings"
-
-    testOptions {
-        // TODO: Convert it as a convention plugin once Flamingo goes out (https://github.com/android/nowinandroid/issues/523)
-        managedDevices {
-            devices {
-                maybeCreate<ManagedVirtualDevice>("pixel4api30").apply {
-                    device = "Pixel 4"
-                    apiLevel = 30
-                    // ATDs currently support only API level 30.
-                    systemImageSource = "aosp-atd"
-                }
-            }
-        }
-    }
 }
diff --git a/feature/topic/build.gradle.kts b/feature/topic/build.gradle.kts
index 48e2563f8..6bacd8343 100644
--- a/feature/topic/build.gradle.kts
+++ b/feature/topic/build.gradle.kts
@@ -24,20 +24,6 @@ plugins {
 
 android {
     namespace = "com.google.samples.apps.nowinandroid.feature.topic"
-
-    testOptions {
-        // TODO: Convert it as a convention plugin once Flamingo goes out (https://github.com/android/nowinandroid/issues/523)
-        managedDevices {
-            devices {
-                maybeCreate<ManagedVirtualDevice>("pixel4api30").apply {
-                    device = "Pixel 4"
-                    apiLevel = 30
-                    // ATDs currently support only API level 30.
-                    systemImageSource = "aosp-atd"
-                }
-            }
-        }
-    }
 }
 
 dependencies {

From a2a5b09d06091618c9fd5172ca562ed530eb8532 Mon Sep 17 00:00:00 2001
From: Simon Marquis <contact@simon-marquis.fr>
Date: Sat, 4 Feb 2023 11:05:07 +0000
Subject: [PATCH 06/19] Update Room to stable version

Changelog: https://developer.android.com/jetpack/androidx/releases/room#2.5.0
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 828e38f12..a486150e8 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -43,7 +43,7 @@ protobuf = "3.21.12"
 protobufPlugin = "0.8.19"
 retrofit = "2.9.0"
 retrofitKotlinxSerializationJson = "0.8.0"
-room = "2.5.0-rc01"
+room = "2.5.0"
 secrets = "2.0.1"
 turbine = "0.12.1"
 

From 3409f937ed87af905e09e05e1907500efbcca366 Mon Sep 17 00:00:00 2001
From: Simon Marquis <contact@simon-marquis.fr>
Date: Sat, 4 Feb 2023 12:59:37 +0100
Subject: [PATCH 07/19] Migrate custom room configuration into a convention
 plugin

And use `CommandLineArgumentProvider` to avoid breaking cacheability: https://issuetracker.google.com/issues/132245929
---
 build-logic/convention/build.gradle.kts       |  5 ++
 .../kotlin/AndroidRoomConventionPlugin.kt     | 63 +++++++++++++++++++
 build.gradle.kts                              |  1 +
 core/database/build.gradle.kts                | 13 +---
 gradle/libs.versions.toml                     |  1 +
 5 files changed, 71 insertions(+), 12 deletions(-)
 create mode 100644 build-logic/convention/src/main/kotlin/AndroidRoomConventionPlugin.kt

diff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.kts
index 6d566c189..0152a902b 100644
--- a/build-logic/convention/build.gradle.kts
+++ b/build-logic/convention/build.gradle.kts
@@ -28,6 +28,7 @@ java {
 dependencies {
     compileOnly(libs.android.gradlePlugin)
     compileOnly(libs.kotlin.gradlePlugin)
+    compileOnly(libs.ksp.gradlePlugin)
 }
 
 gradlePlugin {
@@ -68,6 +69,10 @@ gradlePlugin {
             id = "nowinandroid.android.hilt"
             implementationClass = "AndroidHiltConventionPlugin"
         }
+        register("androidRoom") {
+            id = "nowinandroid.android.room"
+            implementationClass = "AndroidRoomConventionPlugin"
+        }
         register("firebase-perf") {
             id = "nowinandroid.firebase-perf"
             implementationClass = "FirebasePerfConventionPlugin"
diff --git a/build-logic/convention/src/main/kotlin/AndroidRoomConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidRoomConventionPlugin.kt
new file mode 100644
index 000000000..778798b96
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/AndroidRoomConventionPlugin.kt
@@ -0,0 +1,63 @@
+/*
+ * 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.
+ */
+
+import com.google.devtools.ksp.gradle.KspExtension
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.api.artifacts.VersionCatalogsExtension
+import org.gradle.api.tasks.InputDirectory
+import org.gradle.api.tasks.PathSensitive
+import org.gradle.api.tasks.PathSensitivity
+import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.dependencies
+import org.gradle.kotlin.dsl.getByType
+import org.gradle.process.CommandLineArgumentProvider
+import java.io.File
+
+class AndroidRoomConventionPlugin : Plugin<Project> {
+
+    override fun apply(target: Project) {
+        with(target) {
+            pluginManager.apply("com.google.devtools.ksp")
+
+            extensions.configure<KspExtension> {
+                // The schemas directory contains a schema file for each version of the Room database.
+                // This is required to enable Room auto migrations.
+                // See https://developer.android.com/reference/kotlin/androidx/room/AutoMigration.
+                arg(RoomSchemaArgProvider(File(projectDir, "schemas")))
+            }
+
+            val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
+            dependencies {
+                add("implementation", libs.findLibrary("room.runtime").get())
+                add("implementation", libs.findLibrary("room.ktx").get())
+                add("ksp", libs.findLibrary("room.compiler").get())
+            }
+        }
+    }
+
+    /**
+     * https://issuetracker.google.com/issues/132245929
+     * [Export schemas](https://developer.android.com/training/data-storage/room/migrating-db-versions#export-schemas)
+     */
+    class RoomSchemaArgProvider(
+        @get:InputDirectory
+        @get:PathSensitive(PathSensitivity.RELATIVE)
+        val schemaDir: File,
+    ) : CommandLineArgumentProvider {
+        override fun asArguments() = listOf("room.schemaLocation=${schemaDir.path}")
+    }
+}
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index 6f6d375d7..30640d41c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -30,5 +30,6 @@ plugins {
     alias(libs.plugins.kotlin.jvm) apply false
     alias(libs.plugins.kotlin.serialization) apply false
     alias(libs.plugins.hilt) apply false
+    alias(libs.plugins.ksp) apply false
     alias(libs.plugins.secrets) apply false
 }
\ No newline at end of file
diff --git a/core/database/build.gradle.kts b/core/database/build.gradle.kts
index 79fd4ded9..79f980b6c 100644
--- a/core/database/build.gradle.kts
+++ b/core/database/build.gradle.kts
@@ -22,18 +22,11 @@ plugins {
     id("nowinandroid.android.library")
     id("nowinandroid.android.library.jacoco")
     id("nowinandroid.android.hilt")
-    alias(libs.plugins.ksp)
+    id("nowinandroid.android.room")
 }
 
 android {
     defaultConfig {
-        // The schemas directory contains a schema file for each version of the Room database.
-        // This is required to enable Room auto migrations.
-        // See https://developer.android.com/reference/kotlin/androidx/room/AutoMigration.
-        ksp {
-            arg("room.schemaLocation", "$projectDir/schemas")
-        }
-
         testInstrumentationRunner =
             "com.google.samples.apps.nowinandroid.core.testing.NiaTestRunner"
     }
@@ -57,10 +50,6 @@ android {
 dependencies {
     implementation(project(":core:model"))
 
-    implementation(libs.room.runtime)
-    implementation(libs.room.ktx)
-    ksp(libs.room.compiler)
-
     implementation(libs.kotlinx.coroutines.android)
     implementation(libs.kotlinx.datetime)
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 828e38f12..2d53a438f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -121,6 +121,7 @@ turbine = { group = "app.cash.turbine", name = "turbine", version.ref = "turbine
 # Dependencies of the included build-logic
 android-gradlePlugin = { group = "com.android.tools.build", name = "gradle", version.ref = "androidGradlePlugin" }
 kotlin-gradlePlugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
+ksp-gradlePlugin = { group = "com.google.devtools.ksp", name = "com.google.devtools.ksp.gradle.plugin", version.ref = "ksp" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }

From 96bc263153aecb9fd3cc487d47ead4073da91a7b Mon Sep 17 00:00:00 2001
From: Simon Marquis <contact@simon-marquis.fr>
Date: Sat, 4 Feb 2023 13:22:31 +0100
Subject: [PATCH 08/19] Update Kotlin stack to 1.8.0

- https://github.com/google/ksp/releases/tag/1.8.0-1.0.9
- https://github.com/JetBrains/kotlin/releases/tag/v1.8.0
- https://developer.android.com/jetpack/androidx/releases/compose-compiler#1.4.0
---
 gradle/libs.versions.toml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 828e38f12..7ead748f7 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -6,7 +6,7 @@ androidxActivity = "1.6.1"
 androidxAppCompat = "1.5.1"
 androidxBrowser = "1.4.0"
 androidxComposeBom = "2022.12.00"
-androidxComposeCompiler = "1.4.0-alpha02"
+androidxComposeCompiler = "1.4.0"
 androidxComposeRuntimeTracing = "1.0.0-alpha01"
 androidxCore = "1.9.0"
 androidxCoreSplashscreen = "1.0.0"
@@ -32,11 +32,11 @@ hilt = "2.44.2"
 hiltExt = "1.0.0"
 jacoco = "0.8.7"
 junit4 = "4.13.2"
-kotlin = "1.7.21"
+kotlin = "1.8.0"
 kotlinxCoroutines = "1.6.4"
 kotlinxDatetime = "0.4.0"
 kotlinxSerializationJson = "1.4.1"
-ksp = "1.7.21-1.0.8"
+ksp = "1.8.0-1.0.9"
 lint = "30.3.1"
 okhttp = "4.10.0"
 protobuf = "3.21.12"

From 544fbe0a59ef495694953d630d6bb5c9c2e68d97 Mon Sep 17 00:00:00 2001
From: Simon Marquis <contact@simon-marquis.fr>
Date: Sat, 4 Feb 2023 13:32:36 +0100
Subject: [PATCH 09/19] Replace deprecated package with namespace

```
package="com.google.samples.apps.nowinandroid.uitesthiltmanifest" found in source AndroidManifest.xml.
Setting the namespace via a source AndroidManifest.xml's package attribute is deprecated.
Please instead set the namespace (or testNamespace) in the module's build.gradle file, as described here: https://developer.android.com/studio/build/configure-app-module#set-namespace
This migration can be done automatically using the AGP Upgrade Assistant, please refer to https://developer.android.com/studio/build/agp-upgrade-assistant for more information.
```

For reference, this work was started in all these PRs:

- https://github.com/android/nowinandroid/pull/32
- https://github.com/android/nowinandroid/pull/333
- https://github.com/android/nowinandroid/pull/368
- https://github.com/android/nowinandroid/pull/460

This should be the last time we have to do this :)
---
 ui-test-hilt-manifest/build.gradle.kts             | 4 ++++
 ui-test-hilt-manifest/src/main/AndroidManifest.xml | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ui-test-hilt-manifest/build.gradle.kts b/ui-test-hilt-manifest/build.gradle.kts
index 1850f82c2..346399d59 100644
--- a/ui-test-hilt-manifest/build.gradle.kts
+++ b/ui-test-hilt-manifest/build.gradle.kts
@@ -19,6 +19,10 @@ plugins {
     id("dagger.hilt.android.plugin")
 }
 
+android {
+    namespace = "com.google.samples.apps.nowinandroid.uitesthiltmanifest"
+}
+
 dependencies {
     implementation(libs.hilt.android)
     kapt(libs.hilt.compiler)
diff --git a/ui-test-hilt-manifest/src/main/AndroidManifest.xml b/ui-test-hilt-manifest/src/main/AndroidManifest.xml
index 4b97b92be..8fbb1c299 100644
--- a/ui-test-hilt-manifest/src/main/AndroidManifest.xml
+++ b/ui-test-hilt-manifest/src/main/AndroidManifest.xml
@@ -14,8 +14,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.samples.apps.nowinandroid.uitesthiltmanifest">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
         <activity android:name=".HiltComponentActivity" />

From 92417207dcd1354892019a6e14a61ea9f628557c Mon Sep 17 00:00:00 2001
From: Simon Marquis <contact@simon-marquis.fr>
Date: Sat, 4 Feb 2023 14:03:16 +0100
Subject: [PATCH 10/19] Migrate last build.gradle to build.gradle.kts

---
 lint/{build.gradle => build.gradle.kts} | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
 rename lint/{build.gradle => build.gradle.kts} (85%)

diff --git a/lint/build.gradle b/lint/build.gradle.kts
similarity index 85%
rename from lint/build.gradle
rename to lint/build.gradle.kts
index 4574fdffd..c87bb7877 100644
--- a/lint/build.gradle
+++ b/lint/build.gradle.kts
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 plugins {
-    id 'java-library'
-    id 'kotlin'
-    id 'com.android.lint'
+    `java-library`
+    kotlin("jvm")
+    id("com.android.lint")
 }
 
 java {
@@ -25,6 +25,6 @@ java {
 }
 
 dependencies {
-    compileOnly libs.kotlin.stdlib
-    compileOnly libs.lint.api
+    compileOnly(libs.kotlin.stdlib)
+    compileOnly(libs.lint.api)
 }

From 0cf2f25edd5c1388ac901d307dd92ecaccf3d05b Mon Sep 17 00:00:00 2001
From: Simon Marquis <contact@simon-marquis.fr>
Date: Sat, 4 Feb 2023 18:56:19 +0100
Subject: [PATCH 12/19] Upgrade JVM source/target compatibility to 11

---
 .../com/google/samples/apps/nowinandroid/KotlinAndroid.kt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt
index 984993b2b..da0cab531 100644
--- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt
+++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt
@@ -40,8 +40,8 @@ internal fun Project.configureKotlinAndroid(
         }
 
         compileOptions {
-            sourceCompatibility = JavaVersion.VERSION_1_8
-            targetCompatibility = JavaVersion.VERSION_1_8
+            sourceCompatibility = JavaVersion.VERSION_11
+            targetCompatibility = JavaVersion.VERSION_11
             isCoreLibraryDesugaringEnabled = true
         }
 
@@ -59,8 +59,8 @@ internal fun Project.configureKotlinAndroid(
                 "-opt-in=kotlin.Experimental",
             )
 
-            // Set JVM target to 1.8
-            jvmTarget = JavaVersion.VERSION_1_8.toString()
+            // Set JVM target to 11
+            jvmTarget = JavaVersion.VERSION_11.toString()
         }
     }
 

From a8d7d3b1a212d4ab06f2ba5d7d7f72e5d5b217eb Mon Sep 17 00:00:00 2001
From: Angie Sasmita <asasmita@google.com>
Date: Tue, 7 Feb 2023 14:45:12 +0800
Subject: [PATCH 13/19] Increase settings touch target for radio button and
 text link

Change-Id: If80f1a94a82eb6fd7aef7b6ee8fff9640032d180
---
 .../apps/nowinandroid/feature/settings/SettingsDialog.kt       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/feature/settings/src/main/java/com/google/samples/apps/nowinandroid/feature/settings/SettingsDialog.kt b/feature/settings/src/main/java/com/google/samples/apps/nowinandroid/feature/settings/SettingsDialog.kt
index bed230d0d..3d9fd27d3 100644
--- a/feature/settings/src/main/java/com/google/samples/apps/nowinandroid/feature/settings/SettingsDialog.kt
+++ b/feature/settings/src/main/java/com/google/samples/apps/nowinandroid/feature/settings/SettingsDialog.kt
@@ -227,7 +227,7 @@ fun SettingsDialogThemeChooserRow(
                 role = Role.RadioButton,
                 onClick = onClick,
             )
-            .padding(8.dp),
+            .padding(12.dp),
         verticalAlignment = Alignment.CenterVertically,
     ) {
         RadioButton(
@@ -285,6 +285,7 @@ private fun TextLink(text: String, url: String) {
         style = MaterialTheme.typography.labelLarge,
         color = MaterialTheme.colorScheme.primary,
         modifier = Modifier
+            .padding(vertical = 8.dp)
             .clickable {
                 ContextCompat.startActivity(context, launchResourceIntent, null)
             },

From 8e3f3f16b5bc90520ef569c36ecb7caf00b8453e Mon Sep 17 00:00:00 2001
From: Don Turner <dturner@users.noreply.github.com>
Date: Wed, 8 Feb 2023 21:00:10 +0000
Subject: [PATCH 14/19] Apply suggestions from code review

---
 docs/ArchitectureLearningJourney.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/ArchitectureLearningJourney.md b/docs/ArchitectureLearningJourney.md
index 741c5c424..9d7c77e1c 100644
--- a/docs/ArchitectureLearningJourney.md
+++ b/docs/ArchitectureLearningJourney.md
@@ -192,9 +192,9 @@ Whenever the list of topics changes (for example, when a new topic is added), th
 
 To write data, the repository provides suspend functions. It is up to the caller to ensure that their execution is suitably scoped.
 
-_Example: Follow a set of topics_
+_Example: Follow a topic_
 
-Simply call `UserDataRepository.setFollowedTopicIds` with the set of IDs of the topics the user wishes to follow.
+Simply call `UserDataRepository.toggleFollowedTopicId` with the ID of the topic the user wishes to follow and `followed=true` to indicate that the topic should be followed (use `false` to unfollow a topic).
 
 
 ### Data sources

From 322ff63dbc790944cf0cd3f50555783ad8d058e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rton=20Braun?= <zsmb@google.com>
Date: Wed, 18 Jan 2023 10:45:04 +0100
Subject: [PATCH 15/19] Route topic chip tap events up to NiaNavHost

Change-Id: I228c486f5cde1bb47530e8f115a435bfa34381a7
---
 .../samples/apps/niacatalog/ui/Catalog.kt     | 36 +++---------------
 .../nowinandroid/navigation/NiaNavHost.kt     | 13 ++++---
 .../samples/apps/nowinandroid/ui/NiaApp.kt    |  5 +--
 .../apps/nowinandroid/ui/NiaAppState.kt       |  4 --
 .../core/designsystem/component/Tag.kt        | 37 +------------------
 .../src/main/res/values/strings.xml           | 21 -----------
 .../core/ui/NewsResourceCardTest.kt           |  7 +++-
 .../apps/nowinandroid/core/ui/NewsFeed.kt     |  4 ++
 .../nowinandroid/core/ui/NewsResourceCard.kt  | 20 ++++------
 .../core/ui/NewsResourceCardList.kt           |  2 +
 .../feature/bookmarks/BookmarksScreenTest.kt  | 10 +++--
 .../feature/bookmarks/BookmarksScreen.kt      |  8 +++-
 .../navigation/BookmarksNavigation.kt         |  4 +-
 .../feature/foryou/ForYouScreenTest.kt        |  7 ++++
 .../feature/foryou/ForYouScreen.kt            |  9 +++++
 .../foryou/navigation/ForYouNavigation.kt     |  4 +-
 .../interests/InterestsScreenTest.kt          |  2 +-
 .../feature/interests/InterestsScreen.kt      | 14 +++----
 .../navigation/InterestsNavigation.kt         |  6 +--
 .../feature/topic/TopicScreenTest.kt          | 20 ++++++----
 .../nowinandroid/feature/topic/TopicScreen.kt | 22 ++++++++---
 .../topic/navigation/TopicNavigation.kt       |  3 +-
 22 files changed, 110 insertions(+), 148 deletions(-)
 delete mode 100644 core/designsystem/src/main/res/values/strings.xml

diff --git a/app-nia-catalog/src/main/java/com/google/samples/apps/niacatalog/ui/Catalog.kt b/app-nia-catalog/src/main/java/com/google/samples/apps/niacatalog/ui/Catalog.kt
index 52e1c7485..5f114248a 100644
--- a/app-nia-catalog/src/main/java/com/google/samples/apps/niacatalog/ui/Catalog.kt
+++ b/app-nia-catalog/src/main/java/com/google/samples/apps/niacatalog/ui/Catalog.kt
@@ -315,45 +315,19 @@ fun NiaCatalog() {
                 item { Text("Tags", Modifier.padding(top = 16.dp)) }
                 item {
                     FlowRow(mainAxisSpacing = 16.dp) {
-                        var expandedTopicId by remember { mutableStateOf<String?>(null) }
-
-                        var firstFollowed by remember { mutableStateOf(false) }
                         NiaTopicTag(
-                            expanded = expandedTopicId == "Topic 1",
-                            followed = firstFollowed,
-                            onDropdownMenuToggle = { show ->
-                                expandedTopicId = if (show) "Topic 1" else null
-                            },
-                            onFollowClick = { firstFollowed = true },
-                            onUnfollowClick = { firstFollowed = false },
-                            onBrowseClick = {},
+                            followed = true,
+                            onClick = {},
                             text = { Text(text = "Topic 1".uppercase()) },
-                            followText = { Text(text = "Follow") },
-                            unFollowText = { Text(text = "Unfollow") },
-                            browseText = { Text(text = "Browse topic") },
                         )
-                        var secondFollowed by remember { mutableStateOf(true) }
                         NiaTopicTag(
-                            expanded = expandedTopicId == "Topic 2",
-                            followed = secondFollowed,
-                            onDropdownMenuToggle = { show ->
-                                expandedTopicId = if (show) "Topic 2" else null
-                            },
-                            onFollowClick = { secondFollowed = true },
-                            onUnfollowClick = { secondFollowed = false },
-                            onBrowseClick = {},
+                            followed = false,
+                            onClick = {},
                             text = { Text(text = "Topic 2".uppercase()) },
-                            followText = { Text(text = "Follow") },
-                            unFollowText = { Text(text = "Unfollow") },
-                            browseText = { Text(text = "Browse topic") },
                         )
                         NiaTopicTag(
-                            expanded = false,
                             followed = false,
-                            onDropdownMenuToggle = {},
-                            onFollowClick = {},
-                            onUnfollowClick = {},
-                            onBrowseClick = {},
+                            onClick = {},
                             text = { Text(text = "Disabled".uppercase()) },
                             enabled = false,
                         )
diff --git a/app/src/main/java/com/google/samples/apps/nowinandroid/navigation/NiaNavHost.kt b/app/src/main/java/com/google/samples/apps/nowinandroid/navigation/NiaNavHost.kt
index d6e30a10e..bc950ee92 100644
--- a/app/src/main/java/com/google/samples/apps/nowinandroid/navigation/NiaNavHost.kt
+++ b/app/src/main/java/com/google/samples/apps/nowinandroid/navigation/NiaNavHost.kt
@@ -37,7 +37,6 @@ import com.google.samples.apps.nowinandroid.feature.topic.navigation.topicScreen
 @Composable
 fun NiaNavHost(
     navController: NavHostController,
-    onBackClick: () -> Unit,
     modifier: Modifier = Modifier,
     startDestination: String = forYouNavigationRoute,
 ) {
@@ -46,14 +45,18 @@ fun NiaNavHost(
         startDestination = startDestination,
         modifier = modifier,
     ) {
-        forYouScreen()
-        bookmarksScreen()
+        // TODO: handle topic clicks from each top level destination
+        forYouScreen(onTopicClick = {})
+        bookmarksScreen(onTopicClick = {})
         interestsGraph(
-            navigateToTopic = { topicId ->
+            onTopicClick = { topicId ->
                 navController.navigateToTopic(topicId)
             },
             nestedGraphs = {
-                topicScreen(onBackClick)
+                topicScreen(
+                    onBackClick = navController::popBackStack,
+                    onTopicClick = {},
+                )
             },
         )
     }
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.kt
index 14bc11992..a8d321562 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
@@ -178,10 +178,7 @@ fun NiaApp(
                             )
                         }
 
-                        NiaNavHost(
-                            navController = appState.navController,
-                            onBackClick = appState::onBackClick,
-                        )
+                        NiaNavHost(appState.navController)
                     }
 
                     // TODO: We may want to add padding or spacer when the snackbar is shown so that
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.kt
index 6f929530c..7f655af21 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
@@ -136,10 +136,6 @@ class NiaAppState(
         }
     }
 
-    fun onBackClick() {
-        navController.popBackStack()
-    }
-
     fun setShowSettingsDialog(shouldShow: Boolean) {
         shouldShowSettingsDialog = shouldShow
     }
diff --git a/core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Tag.kt b/core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Tag.kt
index cf8b246bb..ba8fde1c9 100644
--- a/core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Tag.kt
+++ b/core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Tag.kt
@@ -20,28 +20,18 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ProvideTextStyle
-import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.material3.contentColorFor
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import com.google.samples.apps.nowinandroid.core.designsystem.R
 
 @Composable
 fun NiaTopicTag(
     modifier: Modifier = Modifier,
-    expanded: Boolean = false,
     followed: Boolean,
-    onDropdownMenuToggle: (show: Boolean) -> Unit = {},
-    onFollowClick: () -> Unit,
-    onUnfollowClick: () -> Unit,
-    onBrowseClick: () -> Unit,
+    onClick: () -> Unit,
     enabled: Boolean = true,
     text: @Composable () -> Unit,
-    followText: @Composable () -> Unit = { Text(stringResource(R.string.follow)) },
-    unFollowText: @Composable () -> Unit = { Text(stringResource(R.string.unfollow)) },
-    browseText: @Composable () -> Unit = { Text(stringResource(R.string.browse_topic)) },
 ) {
     Box(modifier = modifier) {
         val containerColor = if (followed) {
@@ -52,7 +42,7 @@ fun NiaTopicTag(
             )
         }
         TextButton(
-            onClick = { onDropdownMenuToggle(true) },
+            onClick = onClick,
             enabled = enabled,
             colors = ButtonDefaults.textButtonColors(
                 containerColor = containerColor,
@@ -66,25 +56,6 @@ fun NiaTopicTag(
                 text()
             }
         }
-        NiaDropdownMenu(
-            expanded = expanded,
-            onDismissRequest = { onDropdownMenuToggle(false) },
-            items = if (followed) listOf(UNFOLLOW, BROWSE) else listOf(FOLLOW, BROWSE),
-            onItemClick = { item ->
-                when (item) {
-                    FOLLOW -> onFollowClick()
-                    UNFOLLOW -> onUnfollowClick()
-                    BROWSE -> onBrowseClick()
-                }
-            },
-            itemText = { item ->
-                when (item) {
-                    FOLLOW -> followText()
-                    UNFOLLOW -> unFollowText()
-                    BROWSE -> browseText()
-                }
-            },
-        )
     }
 }
 
@@ -98,7 +69,3 @@ object NiaTagDefaults {
     // Button disabled container alpha value not exposed by ButtonDefaults
     const val DisabledTopicTagContainerAlpha = 0.12f
 }
-
-private const val FOLLOW = 1
-private const val UNFOLLOW = 2
-private const val BROWSE = 3
diff --git a/core/designsystem/src/main/res/values/strings.xml b/core/designsystem/src/main/res/values/strings.xml
deleted file mode 100644
index 5d1158888..000000000
--- a/core/designsystem/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     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
-
-          http://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.
--->
-<resources>
-    <string name="follow">Follow</string>
-    <string name="unfollow">Unfollow</string>
-    <string name="browse_topic">Browse topic</string>
-</resources>
diff --git a/core/ui/src/androidTest/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCardTest.kt b/core/ui/src/androidTest/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCardTest.kt
index 927ccfa28..712771422 100644
--- a/core/ui/src/androidTest/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCardTest.kt
+++ b/core/ui/src/androidTest/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCardTest.kt
@@ -41,6 +41,7 @@ class NewsResourceCardTest {
                 isBookmarked = false,
                 onToggleBookmark = {},
                 onClick = {},
+                onTopicClick = {},
             )
 
             dateFormatted = dateFormatted(publishDate = newsWithKnownResourceType.publishDate)
@@ -68,6 +69,7 @@ class NewsResourceCardTest {
                 isBookmarked = false,
                 onToggleBookmark = {},
                 onClick = {},
+                onTopicClick = {},
             )
 
             dateFormatted = dateFormatted(publishDate = newsWithUnknownResourceType.publishDate)
@@ -81,7 +83,10 @@ class NewsResourceCardTest {
     @Test
     fun testTopicsChipColorBackground_matchesFollowedState() {
         composeTestRule.setContent {
-            NewsResourceTopics(topics = followableTopicTestData)
+            NewsResourceTopics(
+                topics = followableTopicTestData,
+                onTopicClick = {},
+            )
         }
 
         for (followableTopic in followableTopicTestData) {
diff --git a/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsFeed.kt b/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsFeed.kt
index 73c1a21e4..2ad38a26e 100644
--- a/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsFeed.kt
+++ b/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsFeed.kt
@@ -47,6 +47,7 @@ import com.google.samples.apps.nowinandroid.core.domain.model.UserNewsResource
 fun LazyGridScope.newsFeed(
     feedState: NewsFeedUiState,
     onNewsResourcesCheckedChanged: (String, Boolean) -> Unit,
+    onTopicClick: (String) -> Unit,
 ) {
     when (feedState) {
         NewsFeedUiState.Loading -> Unit
@@ -68,6 +69,7 @@ fun LazyGridScope.newsFeed(
                             !userNewsResource.isSaved,
                         )
                     },
+                    onTopicClick = onTopicClick,
                 )
             }
         }
@@ -112,6 +114,7 @@ private fun NewsFeedLoadingPreview() {
             newsFeed(
                 feedState = NewsFeedUiState.Loading,
                 onNewsResourcesCheckedChanged = { _, _ -> },
+                onTopicClick = {},
             )
         }
     }
@@ -129,6 +132,7 @@ private fun NewsFeedContentPreview(
             newsFeed(
                 feedState = NewsFeedUiState.Success(userNewsResources),
                 onNewsResourcesCheckedChanged = { _, _ -> },
+                onTopicClick = {},
             )
         }
     }
diff --git a/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt b/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt
index ae6cadbfa..cffa59436 100644
--- a/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt
+++ b/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt
@@ -79,6 +79,7 @@ fun NewsResourceCardExpanded(
     isBookmarked: Boolean,
     onToggleBookmark: () -> Unit,
     onClick: () -> Unit,
+    onTopicClick: (String) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     val clickActionLabel = stringResource(R.string.card_tap_action)
@@ -116,7 +117,10 @@ fun NewsResourceCardExpanded(
                     Spacer(modifier = Modifier.height(12.dp))
                     NewsResourceShortDescription(userNewsResource.content)
                     Spacer(modifier = Modifier.height(12.dp))
-                    NewsResourceTopics(userNewsResource.followableTopics)
+                    NewsResourceTopics(
+                        topics = userNewsResource.followableTopics,
+                        onTopicClick = onTopicClick,
+                    )
                 }
             }
         }
@@ -231,26 +235,17 @@ fun NewsResourceShortDescription(
 @Composable
 fun NewsResourceTopics(
     topics: List<FollowableTopic>,
+    onTopicClick: (String) -> Unit,
     modifier: Modifier = Modifier,
 ) {
-    // Store the ID of the Topic which has its "following" menu expanded, if any.
-    // To avoid UI confusion, only one topic can have an expanded menu at a time.
-    var expandedTopicId by remember { mutableStateOf<String?>(null) }
-
     Row(
         modifier = modifier.horizontalScroll(rememberScrollState()), // causes narrow chips
         horizontalArrangement = Arrangement.spacedBy(4.dp),
     ) {
         for (followableTopic in topics) {
             NiaTopicTag(
-                expanded = expandedTopicId == followableTopic.topic.id,
                 followed = followableTopic.isFollowed,
-                onDropdownMenuToggle = { show ->
-                    expandedTopicId = if (show) followableTopic.topic.id else null
-                },
-                onFollowClick = { }, // ToDo
-                onUnfollowClick = { }, // ToDo
-                onBrowseClick = { }, // ToDo
+                onClick = { onTopicClick(followableTopic.topic.id) },
                 text = {
                     val contentDescription = if (followableTopic.isFollowed) {
                         stringResource(
@@ -308,6 +303,7 @@ private fun ExpandedNewsResourcePreview(
                 isBookmarked = true,
                 onToggleBookmark = {},
                 onClick = {},
+                onTopicClick = {},
             )
         }
     }
diff --git a/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCardList.kt b/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCardList.kt
index a63bae657..a2c02f84f 100644
--- a/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCardList.kt
+++ b/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCardList.kt
@@ -37,6 +37,7 @@ fun LazyListScope.userNewsResourceCardItems(
     items: List<UserNewsResource>,
     onToggleBookmark: (item: UserNewsResource) -> Unit,
     onItemClick: ((item: UserNewsResource) -> Unit)? = null,
+    onTopicClick: (String) -> Unit,
     itemModifier: Modifier = Modifier,
 ) = items(
     items = items,
@@ -56,6 +57,7 @@ fun LazyListScope.userNewsResourceCardItems(
                     else -> onItemClick(userNewsResource)
                 }
             },
+            onTopicClick = onTopicClick,
             modifier = itemModifier,
         )
     },
diff --git a/feature/bookmarks/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreenTest.kt b/feature/bookmarks/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreenTest.kt
index f9faca080..3662bd47f 100644
--- a/feature/bookmarks/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreenTest.kt
+++ b/feature/bookmarks/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreenTest.kt
@@ -50,7 +50,8 @@ class BookmarksScreenTest {
         composeTestRule.setContent {
             BookmarksScreen(
                 feedState = NewsFeedUiState.Loading,
-                removeFromBookmarks = { },
+                removeFromBookmarks = {},
+                onTopicClick = {},
             )
         }
 
@@ -68,7 +69,8 @@ class BookmarksScreenTest {
                 feedState = NewsFeedUiState.Success(
                     userNewsResourcesTestData.take(2),
                 ),
-                removeFromBookmarks = { },
+                removeFromBookmarks = {},
+                onTopicClick = {},
             )
         }
 
@@ -110,6 +112,7 @@ class BookmarksScreenTest {
                     assertEquals(userNewsResourcesTestData[0].id, newsResourceId)
                     removeFromBookmarksCalled = true
                 },
+                onTopicClick = {},
             )
         }
 
@@ -138,7 +141,8 @@ class BookmarksScreenTest {
         composeTestRule.setContent {
             BookmarksScreen(
                 feedState = NewsFeedUiState.Success(emptyList()),
-                removeFromBookmarks = { },
+                removeFromBookmarks = {},
+                onTopicClick = {},
             )
         }
 
diff --git a/feature/bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreen.kt b/feature/bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreen.kt
index 1169f5777..5f43fd235 100644
--- a/feature/bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreen.kt
+++ b/feature/bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreen.kt
@@ -66,6 +66,7 @@ import com.google.samples.apps.nowinandroid.core.ui.newsFeed
 @OptIn(ExperimentalLifecycleComposeApi::class)
 @Composable
 internal fun BookmarksRoute(
+    onTopicClick: (String) -> Unit,
     modifier: Modifier = Modifier,
     viewModel: BookmarksViewModel = hiltViewModel(),
 ) {
@@ -73,6 +74,7 @@ internal fun BookmarksRoute(
     BookmarksScreen(
         feedState = feedState,
         removeFromBookmarks = viewModel::removeFromSavedResources,
+        onTopicClick = onTopicClick,
         modifier = modifier,
     )
 }
@@ -85,12 +87,13 @@ internal fun BookmarksRoute(
 internal fun BookmarksScreen(
     feedState: NewsFeedUiState,
     removeFromBookmarks: (String) -> Unit,
+    onTopicClick: (String) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     when (feedState) {
         Loading -> LoadingState(modifier)
         is Success -> if (feedState.feed.isNotEmpty()) {
-            BookmarksGrid(feedState, removeFromBookmarks, modifier)
+            BookmarksGrid(feedState, removeFromBookmarks, onTopicClick, modifier)
         } else {
             EmptyState(modifier)
         }
@@ -112,6 +115,7 @@ private fun LoadingState(modifier: Modifier = Modifier) {
 private fun BookmarksGrid(
     feedState: NewsFeedUiState,
     removeFromBookmarks: (String) -> Unit,
+    onTopicClick: (String) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     val scrollableState = rememberLazyGridState()
@@ -129,6 +133,7 @@ private fun BookmarksGrid(
         newsFeed(
             feedState = feedState,
             onNewsResourcesCheckedChanged = { id, _ -> removeFromBookmarks(id) },
+            onTopicClick = onTopicClick,
         )
         item(span = { GridItemSpan(maxLineSpan) }) {
             Spacer(Modifier.windowInsetsBottomHeight(WindowInsets.safeDrawing))
@@ -193,6 +198,7 @@ private fun BookmarksGridPreview(
         BookmarksGrid(
             feedState = Success(userNewsResources),
             removeFromBookmarks = {},
+            onTopicClick = {},
         )
     }
 }
diff --git a/feature/bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/navigation/BookmarksNavigation.kt b/feature/bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/navigation/BookmarksNavigation.kt
index 188c948e4..eeb7f1576 100644
--- a/feature/bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/navigation/BookmarksNavigation.kt
+++ b/feature/bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/navigation/BookmarksNavigation.kt
@@ -28,8 +28,8 @@ fun NavController.navigateToBookmarks(navOptions: NavOptions? = null) {
     this.navigate(bookmarksRoute, navOptions)
 }
 
-fun NavGraphBuilder.bookmarksScreen() {
+fun NavGraphBuilder.bookmarksScreen(onTopicClick: (String) -> Unit) {
     composable(route = bookmarksRoute) {
-        BookmarksRoute()
+        BookmarksRoute(onTopicClick)
     }
 }
diff --git a/feature/foryou/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenTest.kt b/feature/foryou/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenTest.kt
index a6be20013..ab712cbb5 100644
--- a/feature/foryou/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenTest.kt
+++ b/feature/foryou/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenTest.kt
@@ -53,6 +53,7 @@ class ForYouScreenTest {
                     onboardingUiState = OnboardingUiState.Loading,
                     feedState = NewsFeedUiState.Loading,
                     onTopicCheckedChanged = { _, _ -> },
+                    onTopicClick = {},
                     saveFollowedTopics = {},
                     onNewsResourcesCheckedChanged = { _, _ -> },
                 )
@@ -75,6 +76,7 @@ class ForYouScreenTest {
                     onboardingUiState = OnboardingUiState.NotShown,
                     feedState = NewsFeedUiState.Success(emptyList()),
                     onTopicCheckedChanged = { _, _ -> },
+                    onTopicClick = {},
                     saveFollowedTopics = {},
                     onNewsResourcesCheckedChanged = { _, _ -> },
                 )
@@ -103,6 +105,7 @@ class ForYouScreenTest {
                         feed = emptyList(),
                     ),
                     onTopicCheckedChanged = { _, _ -> },
+                    onTopicClick = {},
                     saveFollowedTopics = {},
                     onNewsResourcesCheckedChanged = { _, _ -> },
                 )
@@ -146,6 +149,7 @@ class ForYouScreenTest {
                         feed = emptyList(),
                     ),
                     onTopicCheckedChanged = { _, _ -> },
+                    onTopicClick = {},
                     saveFollowedTopics = {},
                     onNewsResourcesCheckedChanged = { _, _ -> },
                 )
@@ -182,6 +186,7 @@ class ForYouScreenTest {
                     OnboardingUiState.Shown(topics = followableTopicTestData),
                     feedState = NewsFeedUiState.Loading,
                     onTopicCheckedChanged = { _, _ -> },
+                    onTopicClick = {},
                     saveFollowedTopics = {},
                     onNewsResourcesCheckedChanged = { _, _ -> },
                 )
@@ -204,6 +209,7 @@ class ForYouScreenTest {
                     onboardingUiState = OnboardingUiState.NotShown,
                     feedState = NewsFeedUiState.Loading,
                     onTopicCheckedChanged = { _, _ -> },
+                    onTopicClick = {},
                     saveFollowedTopics = {},
                     onNewsResourcesCheckedChanged = { _, _ -> },
                 )
@@ -227,6 +233,7 @@ class ForYouScreenTest {
                     feed = userNewsResourcesTestData,
                 ),
                 onTopicCheckedChanged = { _, _ -> },
+                onTopicClick = {},
                 saveFollowedTopics = {},
                 onNewsResourcesCheckedChanged = { _, _ -> },
             )
diff --git 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
index 492660142..cb0b0ecd6 100644
--- 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
@@ -92,6 +92,7 @@ import com.google.samples.apps.nowinandroid.core.ui.newsFeed
 @OptIn(ExperimentalLifecycleComposeApi::class)
 @Composable
 internal fun ForYouRoute(
+    onTopicClick: (String) -> Unit,
     modifier: Modifier = Modifier,
     viewModel: ForYouViewModel = hiltViewModel(),
 ) {
@@ -104,6 +105,7 @@ internal fun ForYouRoute(
         onboardingUiState = onboardingUiState,
         feedState = feedState,
         onTopicCheckedChanged = viewModel::updateTopicSelection,
+        onTopicClick = onTopicClick,
         saveFollowedTopics = viewModel::dismissOnboarding,
         onNewsResourcesCheckedChanged = viewModel::updateNewsResourceSaved,
         modifier = modifier,
@@ -116,6 +118,7 @@ internal fun ForYouScreen(
     onboardingUiState: OnboardingUiState,
     feedState: NewsFeedUiState,
     onTopicCheckedChanged: (String, Boolean) -> Unit,
+    onTopicClick: (String) -> Unit,
     saveFollowedTopics: () -> Unit,
     onNewsResourcesCheckedChanged: (String, Boolean) -> Unit,
     modifier: Modifier = Modifier,
@@ -175,6 +178,7 @@ internal fun ForYouScreen(
         newsFeed(
             feedState = feedState,
             onNewsResourcesCheckedChanged = onNewsResourcesCheckedChanged,
+            onTopicClick = onTopicClick,
         )
 
         item(span = { GridItemSpan(maxLineSpan) }) {
@@ -407,6 +411,7 @@ fun ForYouScreenPopulatedFeed(
                 onTopicCheckedChanged = { _, _ -> },
                 saveFollowedTopics = {},
                 onNewsResourcesCheckedChanged = { _, _ -> },
+                onTopicClick = {},
             )
         }
     }
@@ -429,6 +434,7 @@ fun ForYouScreenOfflinePopulatedFeed(
                 onTopicCheckedChanged = { _, _ -> },
                 saveFollowedTopics = {},
                 onNewsResourcesCheckedChanged = { _, _ -> },
+                onTopicClick = {},
             )
         }
     }
@@ -453,6 +459,7 @@ fun ForYouScreenTopicSelection(
                 onTopicCheckedChanged = { _, _ -> },
                 saveFollowedTopics = {},
                 onNewsResourcesCheckedChanged = { _, _ -> },
+                onTopicClick = {},
             )
         }
     }
@@ -470,6 +477,7 @@ fun ForYouScreenLoading() {
                 onTopicCheckedChanged = { _, _ -> },
                 saveFollowedTopics = {},
                 onNewsResourcesCheckedChanged = { _, _ -> },
+                onTopicClick = {},
             )
         }
     }
@@ -492,6 +500,7 @@ fun ForYouScreenPopulatedAndLoading(
                 onTopicCheckedChanged = { _, _ -> },
                 saveFollowedTopics = {},
                 onNewsResourcesCheckedChanged = { _, _ -> },
+                onTopicClick = {},
             )
         }
     }
diff --git a/feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/navigation/ForYouNavigation.kt b/feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/navigation/ForYouNavigation.kt
index f57deab90..c7dea1e96 100644
--- a/feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/navigation/ForYouNavigation.kt
+++ b/feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/navigation/ForYouNavigation.kt
@@ -28,8 +28,8 @@ fun NavController.navigateToForYou(navOptions: NavOptions? = null) {
     this.navigate(forYouNavigationRoute, navOptions)
 }
 
-fun NavGraphBuilder.forYouScreen() {
+fun NavGraphBuilder.forYouScreen(onTopicClick: (String) -> Unit) {
     composable(route = forYouNavigationRoute) {
-        ForYouRoute()
+        ForYouRoute(onTopicClick)
     }
 }
diff --git a/feature/interests/src/androidTest/java/com/google/samples/apps/nowinandroid/interests/InterestsScreenTest.kt b/feature/interests/src/androidTest/java/com/google/samples/apps/nowinandroid/interests/InterestsScreenTest.kt
index 7f06eee6b..492e91fa3 100644
--- a/feature/interests/src/androidTest/java/com/google/samples/apps/nowinandroid/interests/InterestsScreenTest.kt
+++ b/feature/interests/src/androidTest/java/com/google/samples/apps/nowinandroid/interests/InterestsScreenTest.kt
@@ -109,7 +109,7 @@ class InterestsScreenTest {
         InterestsScreen(
             uiState = uiState,
             followTopic = { _, _ -> },
-            navigateToTopic = {},
+            onTopicClick = {},
         )
     }
 }
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.kt
index fd45c7608..ec0179139 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
@@ -37,7 +37,7 @@ import com.google.samples.apps.nowinandroid.core.ui.FollowableTopicPreviewParame
 @OptIn(ExperimentalLifecycleComposeApi::class)
 @Composable
 internal fun InterestsRoute(
-    navigateToTopic: (String) -> Unit,
+    onTopicClick: (String) -> Unit,
     modifier: Modifier = Modifier,
     viewModel: InterestsViewModel = hiltViewModel(),
 ) {
@@ -46,7 +46,7 @@ internal fun InterestsRoute(
     InterestsScreen(
         uiState = uiState,
         followTopic = viewModel::followTopic,
-        navigateToTopic = navigateToTopic,
+        onTopicClick = onTopicClick,
         modifier = modifier,
     )
 }
@@ -55,7 +55,7 @@ internal fun InterestsRoute(
 internal fun InterestsScreen(
     uiState: InterestsUiState,
     followTopic: (String, Boolean) -> Unit,
-    navigateToTopic: (String) -> Unit,
+    onTopicClick: (String) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     Column(
@@ -71,7 +71,7 @@ internal fun InterestsScreen(
             is InterestsUiState.Interests ->
                 TopicsTabContent(
                     topics = uiState.topics,
-                    onTopicClick = navigateToTopic,
+                    onTopicClick = onTopicClick,
                     onFollowButtonClick = followTopic,
                     modifier = modifier,
                 )
@@ -98,7 +98,7 @@ fun InterestsScreenPopulated(
                     topics = followableTopics,
                 ),
                 followTopic = { _, _ -> },
-                navigateToTopic = {},
+                onTopicClick = {},
             )
         }
     }
@@ -112,7 +112,7 @@ fun InterestsScreenLoading() {
             InterestsScreen(
                 uiState = InterestsUiState.Loading,
                 followTopic = { _, _ -> },
-                navigateToTopic = {},
+                onTopicClick = {},
             )
         }
     }
@@ -126,7 +126,7 @@ fun InterestsScreenEmpty() {
             InterestsScreen(
                 uiState = InterestsUiState.Empty,
                 followTopic = { _, _ -> },
-                navigateToTopic = {},
+                onTopicClick = {},
             )
         }
     }
diff --git a/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/navigation/InterestsNavigation.kt b/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/navigation/InterestsNavigation.kt
index 9a5ce7696..bef6987f4 100644
--- a/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/navigation/InterestsNavigation.kt
+++ b/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/navigation/InterestsNavigation.kt
@@ -31,7 +31,7 @@ fun NavController.navigateToInterestsGraph(navOptions: NavOptions? = null) {
 }
 
 fun NavGraphBuilder.interestsGraph(
-    navigateToTopic: (String) -> Unit,
+    onTopicClick: (String) -> Unit,
     nestedGraphs: NavGraphBuilder.() -> Unit,
 ) {
     navigation(
@@ -39,9 +39,7 @@ fun NavGraphBuilder.interestsGraph(
         startDestination = interestsRoute,
     ) {
         composable(route = interestsRoute) {
-            InterestsRoute(
-                navigateToTopic = navigateToTopic,
-            )
+            InterestsRoute(onTopicClick)
         }
         nestedGraphs()
     }
diff --git a/feature/topic/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreenTest.kt b/feature/topic/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreenTest.kt
index 626b0e773..3a267d7e7 100644
--- a/feature/topic/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreenTest.kt
+++ b/feature/topic/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreenTest.kt
@@ -55,8 +55,9 @@ class TopicScreenTest {
             TopicScreen(
                 topicUiState = TopicUiState.Loading,
                 newsUiState = NewsUiState.Loading,
-                onBackClick = { },
-                onFollowClick = { },
+                onBackClick = {},
+                onFollowClick = {},
+                onTopicClick = {},
                 onBookmarkChanged = { _, _ -> },
             )
         }
@@ -73,8 +74,9 @@ class TopicScreenTest {
             TopicScreen(
                 topicUiState = TopicUiState.Success(testTopic),
                 newsUiState = NewsUiState.Loading,
-                onBackClick = { },
-                onFollowClick = { },
+                onBackClick = {},
+                onFollowClick = {},
+                onTopicClick = {},
                 onBookmarkChanged = { _, _ -> },
             )
         }
@@ -96,8 +98,9 @@ class TopicScreenTest {
             TopicScreen(
                 topicUiState = TopicUiState.Loading,
                 newsUiState = NewsUiState.Success(userNewsResourcesTestData),
-                onBackClick = { },
-                onFollowClick = { },
+                onBackClick = {},
+                onFollowClick = {},
+                onTopicClick = {},
                 onBookmarkChanged = { _, _ -> },
             )
         }
@@ -117,8 +120,9 @@ class TopicScreenTest {
                 newsUiState = NewsUiState.Success(
                     userNewsResourcesTestData,
                 ),
-                onBackClick = { },
-                onFollowClick = { },
+                onBackClick = {},
+                onFollowClick = {},
+                onTopicClick = {},
                 onBookmarkChanged = { _, _ -> },
             )
         }
diff --git a/feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt b/feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt
index e7b218072..9d2c3e817 100644
--- a/feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt
+++ b/feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt
@@ -65,6 +65,7 @@ import com.google.samples.apps.nowinandroid.feature.topic.TopicUiState.Loading
 @Composable
 internal fun TopicRoute(
     onBackClick: () -> Unit,
+    onTopicClick: (String) -> Unit,
     modifier: Modifier = Modifier,
     viewModel: TopicViewModel = hiltViewModel(),
 ) {
@@ -78,6 +79,7 @@ internal fun TopicRoute(
         onBackClick = onBackClick,
         onFollowClick = viewModel::followTopicToggle,
         onBookmarkChanged = viewModel::bookmarkNews,
+        onTopicClick = onTopicClick,
     )
 }
 
@@ -88,6 +90,7 @@ internal fun TopicScreen(
     newsUiState: NewsUiState,
     onBackClick: () -> Unit,
     onFollowClick: (Boolean) -> Unit,
+    onTopicClick: (String) -> Unit,
     onBookmarkChanged: (String, Boolean) -> Unit,
     modifier: Modifier = Modifier,
 ) {
@@ -124,6 +127,7 @@ internal fun TopicScreen(
                     news = newsUiState,
                     imageUrl = topicUiState.followableTopic.topic.imageUrl,
                     onBookmarkChanged = onBookmarkChanged,
+                    onTopicClick = onTopicClick,
                 )
             }
         }
@@ -139,13 +143,14 @@ private fun LazyListScope.TopicBody(
     news: NewsUiState,
     imageUrl: String,
     onBookmarkChanged: (String, Boolean) -> Unit,
+    onTopicClick: (String) -> Unit,
 ) {
     // TODO: Show icon if available
     item {
         TopicHeader(name, description, imageUrl)
     }
 
-    userNewsResourceCards(news, onBookmarkChanged)
+    userNewsResourceCards(news, onBookmarkChanged, onTopicClick)
 }
 
 @Composable
@@ -176,12 +181,14 @@ private fun TopicHeader(name: String, description: String, imageUrl: String) {
 private fun LazyListScope.userNewsResourceCards(
     news: NewsUiState,
     onBookmarkChanged: (String, Boolean) -> Unit,
+    onTopicClick: (String) -> Unit,
 ) {
     when (news) {
         is NewsUiState.Success -> {
             userNewsResourceCardItems(
                 items = news.news,
                 onToggleBookmark = { onBookmarkChanged(it.id, !it.isSaved) },
+                onTopicClick = onTopicClick,
                 itemModifier = Modifier.padding(24.dp),
             )
         }
@@ -202,11 +209,12 @@ private fun TopicBodyPreview() {
     NiaTheme {
         LazyColumn {
             TopicBody(
-                "Jetpack Compose",
-                "Lorem ipsum maximum",
-                NewsUiState.Success(emptyList()),
-                "",
-                { _, _ -> },
+                name = "Jetpack Compose",
+                description = "Lorem ipsum maximum",
+                news = NewsUiState.Success(emptyList()),
+                imageUrl = "",
+                onBookmarkChanged = { _, _ -> },
+                onTopicClick = {},
             )
         }
     }
@@ -263,6 +271,7 @@ fun TopicScreenPopulated(
                 onBackClick = {},
                 onFollowClick = {},
                 onBookmarkChanged = { _, _ -> },
+                onTopicClick = {},
             )
         }
     }
@@ -279,6 +288,7 @@ fun TopicScreenLoading() {
                 onBackClick = {},
                 onFollowClick = {},
                 onBookmarkChanged = { _, _ -> },
+                onTopicClick = {},
             )
         }
     }
diff --git a/feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/navigation/TopicNavigation.kt b/feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/navigation/TopicNavigation.kt
index 1cc43bbd1..3a21da1c3 100644
--- a/feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/navigation/TopicNavigation.kt
+++ b/feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/navigation/TopicNavigation.kt
@@ -42,6 +42,7 @@ fun NavController.navigateToTopic(topicId: String) {
 
 fun NavGraphBuilder.topicScreen(
     onBackClick: () -> Unit,
+    onTopicClick: (String) -> Unit,
 ) {
     composable(
         route = "topic_route/{$topicIdArg}",
@@ -49,6 +50,6 @@ fun NavGraphBuilder.topicScreen(
             navArgument(topicIdArg) { type = NavType.StringType },
         ),
     ) {
-        TopicRoute(onBackClick = onBackClick)
+        TopicRoute(onBackClick = onBackClick, onTopicClick = onTopicClick)
     }
 }

From 237375f52a486d94c58dfadbb9ec1e847c2f20ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rton=20Braun?= <zsmb@google.com>
Date: Thu, 19 Jan 2023 10:58:23 +0100
Subject: [PATCH 16/19] Remove unused DropdownMenu component

Change-Id: I7ee7e8f1995667c7e54459f4333594c4605cc5a9
---
 .../samples/apps/niacatalog/ui/Catalog.kt     |  18 --
 .../designsystem/component/DropdownMenu.kt    | 218 ------------------
 .../lint/designsystem/DesignSystemDetector.kt |   1 -
 3 files changed, 237 deletions(-)
 delete mode 100644 core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/DropdownMenu.kt

diff --git a/app-nia-catalog/src/main/java/com/google/samples/apps/niacatalog/ui/Catalog.kt b/app-nia-catalog/src/main/java/com/google/samples/apps/niacatalog/ui/Catalog.kt
index 5f114248a..a18600f33 100644
--- a/app-nia-catalog/src/main/java/com/google/samples/apps/niacatalog/ui/Catalog.kt
+++ b/app-nia-catalog/src/main/java/com/google/samples/apps/niacatalog/ui/Catalog.kt
@@ -38,7 +38,6 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
 import com.google.accompanist.flowlayout.FlowRow
 import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaButton
-import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaDropdownMenuButton
 import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaFilterChip
 import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaIconToggleButton
 import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaNavigationBar
@@ -167,23 +166,6 @@ fun NiaCatalog() {
                     }
                 }
                 item { Text("Dropdown menus", Modifier.padding(top = 16.dp)) }
-                item {
-                    FlowRow(mainAxisSpacing = 16.dp) {
-                        NiaDropdownMenuButton(
-                            text = { Text("Enabled") },
-                            items = listOf("Item 1", "Item 2", "Item 3"),
-                            onItemClick = {},
-                            itemText = { item -> Text(item) },
-                        )
-                        NiaDropdownMenuButton(
-                            text = { Text("Disabled") },
-                            items = listOf("Item 1", "Item 2", "Item 3"),
-                            onItemClick = {},
-                            itemText = { item -> Text(item) },
-                            enabled = false,
-                        )
-                    }
-                }
                 item { Text("Chips", Modifier.padding(top = 16.dp)) }
                 item {
                     FlowRow(mainAxisSpacing = 16.dp) {
diff --git a/core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/DropdownMenu.kt b/core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/DropdownMenu.kt
deleted file mode 100644
index b624ebcb6..000000000
--- a/core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/DropdownMenu.kt
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * 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.designsystem.component
-
-import androidx.compose.foundation.BorderStroke
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.sizeIn
-import androidx.compose.material3.ButtonDefaults
-import androidx.compose.material3.DropdownMenu
-import androidx.compose.material3.DropdownMenuItem
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.OutlinedButton
-import androidx.compose.material3.ProvideTextStyle
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
-import com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIcons
-
-/**
- * Now in Android dropdown menu button with included trailing icon as well as text label and item
- * content slots.
- *
- * @param items The list of items to display in the menu.
- * @param onItemClick Called when the user clicks on a menu item.
- * @param modifier Modifier to be applied to the button.
- * @param enabled Controls the enabled state of the button. When `false`, this button will not be
- * clickable and will appear disabled to accessibility services.
- * @param dismissOnItemClick Whether the menu should be dismissed when an item is clicked.
- * @param itemText The text label content for a given item.
- * @param itemLeadingIcon The leading icon content for a given item.
- * @param itemTrailingIcon The trailing icon content for a given item.
- */
-@Composable
-fun <T> NiaDropdownMenuButton(
-    items: List<T>,
-    onItemClick: (item: T) -> Unit,
-    modifier: Modifier = Modifier,
-    enabled: Boolean = true,
-    dismissOnItemClick: Boolean = true,
-    text: @Composable () -> Unit,
-    itemText: @Composable (item: T) -> Unit,
-    itemLeadingIcon: @Composable ((item: T) -> Unit)? = null,
-    itemTrailingIcon: @Composable ((item: T) -> Unit)? = null,
-) {
-    var expanded by remember { mutableStateOf(false) }
-    Box(modifier = modifier) {
-        OutlinedButton(
-            onClick = { expanded = true },
-            enabled = enabled,
-            colors = ButtonDefaults.outlinedButtonColors(
-                contentColor = MaterialTheme.colorScheme.onBackground,
-            ),
-            border = BorderStroke(
-                width = NiaDropdownMenuDefaults.DropdownMenuButtonBorderWidth,
-                color = if (enabled) {
-                    MaterialTheme.colorScheme.outline
-                } else {
-                    MaterialTheme.colorScheme.onSurface.copy(
-                        alpha = NiaDropdownMenuDefaults.DisabledDropdownMenuButtonBorderAlpha,
-                    )
-                },
-            ),
-            contentPadding = NiaDropdownMenuDefaults.DropdownMenuButtonContentPadding,
-        ) {
-            NiaDropdownMenuButtonContent(
-                text = text,
-                trailingIcon = {
-                    Icon(
-                        imageVector = if (expanded) {
-                            NiaIcons.ArrowDropUp
-                        } else {
-                            NiaIcons.ArrowDropDown
-                        },
-                        contentDescription = null,
-                    )
-                },
-            )
-        }
-        NiaDropdownMenu(
-            expanded = expanded,
-            onDismissRequest = { expanded = false },
-            items = items,
-            onItemClick = onItemClick,
-            dismissOnItemClick = dismissOnItemClick,
-            itemText = itemText,
-            itemLeadingIcon = itemLeadingIcon,
-            itemTrailingIcon = itemTrailingIcon,
-        )
-    }
-}
-
-/**
- * Internal Now in Android dropdown menu button content layout for arranging the text label and
- * trailing icon.
- *
- * @param text The button text label content.
- * @param trailingIcon The button trailing icon content. Default is `null` for no trailing icon.
- */
-@Composable
-private fun NiaDropdownMenuButtonContent(
-    text: @Composable () -> Unit,
-    trailingIcon: @Composable (() -> Unit)? = null,
-) {
-    Box(
-        Modifier
-            .padding(
-                end = if (trailingIcon != null) {
-                    ButtonDefaults.IconSpacing
-                } else {
-                    0.dp
-                },
-            ),
-    ) {
-        ProvideTextStyle(value = MaterialTheme.typography.labelSmall) {
-            text()
-        }
-    }
-    if (trailingIcon != null) {
-        Box(Modifier.sizeIn(maxHeight = ButtonDefaults.IconSize)) {
-            trailingIcon()
-        }
-    }
-}
-
-/**
- * Now in Android dropdown menu with item content slots. Wraps Material 3 [DropdownMenu] and
- * [DropdownMenuItem].
- *
- * @param expanded Whether the menu is currently open and visible to the user.
- * @param onDismissRequest Called when the user requests to dismiss the menu, such as by
- * tapping outside the menu's bounds.
- * @param items The list of items to display in the menu.
- * @param onItemClick Called when the user clicks on a menu item.
- * @param dismissOnItemClick Whether the menu should be dismissed when an item is clicked.
- * @param itemText The text label content for a given item.
- * @param itemLeadingIcon The leading icon content for a given item.
- * @param itemTrailingIcon The trailing icon content for a given item.
- */
-@Composable
-fun <T> NiaDropdownMenu(
-    expanded: Boolean,
-    onDismissRequest: () -> Unit,
-    items: List<T>,
-    onItemClick: (item: T) -> Unit,
-    dismissOnItemClick: Boolean = true,
-    itemText: @Composable (item: T) -> Unit,
-    itemLeadingIcon: @Composable ((item: T) -> Unit)? = null,
-    itemTrailingIcon: @Composable ((item: T) -> Unit)? = null,
-) {
-    DropdownMenu(
-        expanded = expanded,
-        onDismissRequest = onDismissRequest,
-    ) {
-        items.forEach { item ->
-            DropdownMenuItem(
-                text = { itemText(item) },
-                onClick = {
-                    onItemClick(item)
-                    if (dismissOnItemClick) onDismissRequest()
-                },
-                leadingIcon = if (itemLeadingIcon != null) {
-                    { itemLeadingIcon(item) }
-                } else {
-                    null
-                },
-                trailingIcon = if (itemTrailingIcon != null) {
-                    { itemTrailingIcon(item) }
-                } else {
-                    null
-                },
-            )
-        }
-    }
-}
-
-/**
- * Now in Android dropdown menu default values.
- */
-object NiaDropdownMenuDefaults {
-    // TODO: File bug
-    // OutlinedButton border color doesn't respect disabled state by default
-    const val DisabledDropdownMenuButtonBorderAlpha = 0.12f
-
-    // TODO: File bug
-    // OutlinedButton default border width isn't exposed via ButtonDefaults
-    val DropdownMenuButtonBorderWidth = 1.dp
-
-    // TODO: File bug
-    // Various default button padding values aren't exposed via ButtonDefaults
-    val DropdownMenuButtonContentPadding =
-        PaddingValues(
-            start = 24.dp,
-            top = 8.dp,
-            end = 16.dp,
-            bottom = 8.dp,
-        )
-}
diff --git a/lint/src/main/java/com/google/samples/apps/nowinandroid/lint/designsystem/DesignSystemDetector.kt b/lint/src/main/java/com/google/samples/apps/nowinandroid/lint/designsystem/DesignSystemDetector.kt
index 39aa07160..6f4bca0df 100644
--- a/lint/src/main/java/com/google/samples/apps/nowinandroid/lint/designsystem/DesignSystemDetector.kt
+++ b/lint/src/main/java/com/google/samples/apps/nowinandroid/lint/designsystem/DesignSystemDetector.kt
@@ -85,7 +85,6 @@ class DesignSystemDetector : Detector(), Detector.UastScanner {
             "TextButton" to "NiaTextButton",
             "FilterChip" to "NiaFilterChip",
             "ElevatedFilterChip" to "NiaFilterChip",
-            "DropdownMenu" to "NiaDropdownMenu",
             "NavigationBar" to "NiaNavigationBar",
             "NavigationBarItem" to "NiaNavigationBarItem",
             "NavigationRail" to "NiaNavigationRail",

From 50b88aa769928129f8aeb42b7a45c7ec906971c3 Mon Sep 17 00:00:00 2001
From: Don Turner <donturner@google.com>
Date: Thu, 9 Feb 2023 12:16:44 +0000
Subject: [PATCH 17/19] Update lint java version to 11

Change-Id: I7bba0615e3f1ca13523300950932b5f899b60567
---
 lint/build.gradle.kts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lint/build.gradle.kts b/lint/build.gradle.kts
index c87bb7877..bbf24126d 100644
--- a/lint/build.gradle.kts
+++ b/lint/build.gradle.kts
@@ -20,8 +20,8 @@ plugins {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
 }
 
 dependencies {

From d80668407aaa209e10fabf25e71a3444fd5e328a Mon Sep 17 00:00:00 2001
From: Don Turner <donturner@google.com>
Date: Thu, 9 Feb 2023 12:22:08 +0000
Subject: [PATCH 18/19] Bump version to 4

---
 app/build.gradle.kts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index b52d54d12..4163090ce 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -28,8 +28,8 @@ plugins {
 android {
     defaultConfig {
         applicationId = "com.google.samples.apps.nowinandroid"
-        versionCode = 3
-        versionName = "0.0.3" // X.Y.Z; X = Major, Y = minor, Z = Patch level
+        versionCode = 4
+        versionName = "0.0.4" // X.Y.Z; X = Major, Y = minor, Z = Patch level
 
         // Custom test runner to set up Hilt dependency graph
         testInstrumentationRunner = "com.google.samples.apps.nowinandroid.core.testing.NiaTestRunner"

From ded79e617e0fd83ca97fd2d0769e41d6a8ba02c7 Mon Sep 17 00:00:00 2001
From: Alex Vanyo <vanyo@google.com>
Date: Fri, 3 Feb 2023 15:54:00 -0800
Subject: [PATCH 19/19] Add Pixel C API 30 emulator to CI

Change-Id: If386c899496433d4e179111c0230905b36db7c50
---
 .github/workflows/AndroidCIWithGmd.yaml                        | 2 +-
 .../google/samples/apps/nowinandroid/GradleManagedDevices.kt   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/AndroidCIWithGmd.yaml b/.github/workflows/AndroidCIWithGmd.yaml
index eb890c4d5..bae399f47 100644
--- a/.github/workflows/AndroidCIWithGmd.yaml
+++ b/.github/workflows/AndroidCIWithGmd.yaml
@@ -12,7 +12,7 @@ jobs:
     runs-on: macos-12
     strategy:
       matrix:
-        device-config: [ "pixel4api30aospatd" ]
+        device-config: [ "pixel4api30aospatd", "pixelcapi30aospatd" ]
 
     steps:
       - uses: actions/setup-java@v3
diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/GradleManagedDevices.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/GradleManagedDevices.kt
index f16344088..624afeea9 100644
--- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/GradleManagedDevices.kt
+++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/GradleManagedDevices.kt
@@ -30,7 +30,8 @@ internal fun configureGradleManagedDevices(
 ) {
     val deviceConfigs = listOf(
         DeviceConfig("Pixel 4", 30, "aosp-atd"),
-        DeviceConfig("Pixel 6", 31, "aosp")
+        DeviceConfig("Pixel 6", 31, "aosp"),
+        DeviceConfig("Pixel C", 30, "aosp-atd"),
     )
 
     commonExtension.testOptions {