Merge remote-tracking branch 'github/main' into feb9automerger

* github/main:
  Bump version to 4
  Remove unused DropdownMenu component
  Route topic chip tap events up to NiaNavHost
  Apply suggestions from code review
  Migrate custom room configuration into a convention plugin
  Update docs/ArchitectureLearningJourney.md - User action follow topic
  Update docs/ArchitectureLearningJourney.md - Writing data

Change-Id: I417abcaba792bbf297a8156bb1c4cf677dcb8bea

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

@@ -29,8 +29,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
  }

build-logic/convention/build.gradle.kts

@@ -30,6 +30,7 @@ dependencies {
  compileOnly(libs.kotlin.gradlePlugin)
  compileOnly(libs.firebase.performance.gradle)
  compileOnly(libs.firebase.crashlytics.gradle)
+ compileOnly(libs.ksp.gradlePlugin)
 }
 
 gradlePlugin {
@@ -70,6 +71,10 @@ gradlePlugin {
  id = "nowinandroid.android.hilt"
  implementationClass = "AndroidHiltConventionPlugin"
  }
+ register("androidRoom") {
+ id = "nowinandroid.android.room"
+ implementationClass = "AndroidRoomConventionPlugin"
+ }
  register("androidFirebase") {
  id = "nowinandroid.android.application.firebase"
  implementationClass = "AndroidApplicationFirebaseConventionPlugin"
@@ -78,6 +83,5 @@ gradlePlugin {
  id = "nowinandroid.android.application.flavors"
  implementationClass = "AndroidApplicationFlavorsConventionPlugin"
  }
-
  }
 }

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}")
+ }
+}

build.gradle.kts

@@ -33,5 +33,6 @@ plugins {
  alias(libs.plugins.firebase.perf) apply false
  alias(libs.plugins.gms) apply false
  alias(libs.plugins.hilt) apply false
+ alias(libs.plugins.ksp) apply false
  alias(libs.plugins.secrets) apply false
 }

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)