Merge branch 'main' of github.com:takagimeow/nowinandroid into fix/provide-true-to-local-inspection-mode

� Conflicts:
�	core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt

Author: takagimeow

.github/workflows/AndroidCIWithGmd.yaml

@@ -10,6 +10,9 @@ jobs:
 
   android-ci:
     runs-on: macos-12
+    strategy:
+      matrix:
+        device-config: [ "pixel4api30aospatd", "pixelcapi30aospatd" ]
 
     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

.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>

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) {
@@ -315,45 +297,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,
                         )

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"

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 = {},
+                )
             },
         )
     }

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

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
     }

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 {

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"

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)