Implement SearchScreen

- Empty search screen if the search result is empty - Topics contents that reuses the TopicsTabContent for InterestsScreen - Updates contents that reuses the newsFeed for ForYouScreen TODO: Needs to add RecentSearch Change-Id: I19179336a60b5165e8b59508fb03dd8f55a16f96
android · Apr 11, 2023 · 347e714 · 347e714
1 parent 506492c
commit 347e714
Show file tree

Hide file tree

Showing 11 changed files with 501 additions and 122 deletions.
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
@@ -24,9 +24,12 @@ import com.google.samples.apps.nowinandroid.feature.bookmarks.navigation.bookmar
 import com.google.samples.apps.nowinandroid.feature.foryou.navigation.forYouNavigationRoute
 import com.google.samples.apps.nowinandroid.feature.foryou.navigation.forYouScreen
 import com.google.samples.apps.nowinandroid.feature.interests.navigation.interestsGraph
+import com.google.samples.apps.nowinandroid.feature.interests.navigation.navigateToInterestsGraph
 import com.google.samples.apps.nowinandroid.feature.search.navigation.searchScreen
 import com.google.samples.apps.nowinandroid.feature.topic.navigation.navigateToTopic
 import com.google.samples.apps.nowinandroid.feature.topic.navigation.topicScreen
+import com.google.samples.apps.nowinandroid.navigation.TopLevelDestination.INTERESTS
+import com.google.samples.apps.nowinandroid.ui.NiaAppState
 
 /**
  * Top-level navigation graph. Navigation is organized as explained at
@@ -37,10 +40,11 @@ import com.google.samples.apps.nowinandroid.feature.topic.navigation.topicScreen
  */
 @Composable
 fun NiaNavHost(
-    navController: NavHostController,
+    appState: NiaAppState,
     modifier: Modifier = Modifier,
     startDestination: String = forYouNavigationRoute,
 ) {
+    val navController = appState.navController
     NavHost(
         navController = navController,
         startDestination = startDestination,
@@ -49,7 +53,11 @@ fun NiaNavHost(
         // TODO: handle topic clicks from each top level destination
         forYouScreen(onTopicClick = {})
         bookmarksScreen(onTopicClick = {})
-        searchScreen(onBackClick = navController::popBackStack)
+        searchScreen(
+            onBackClick = navController::popBackStack,
+            onInterestsClick = { appState.navigateToTopLevelDestination(INTERESTS) },
+            onTopicClick = {}
+        )
         interestsGraph(
             onTopicClick = { topicId ->
                 navController.navigateToTopic(topicId)

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
@@ -181,7 +181,7 @@ fun NiaApp(
                             )
                         }
 
-                        NiaNavHost(appState.navController)
+                        NiaNavHost(appState)
                     }
 
                     // TODO: We may want to add padding or spacer when the snackbar is shown so that

diff --git a/.../com/google/samples/apps/nowinandroid/core/ui/UserNewsResourcePreviewParameterProvider.kt b/.../com/google/samples/apps/nowinandroid/core/ui/UserNewsResourcePreviewParameterProvider.kt
@@ -25,6 +25,7 @@ import com.google.samples.apps.nowinandroid.core.model.data.NewsResourceType.Vid
 import com.google.samples.apps.nowinandroid.core.model.data.ThemeBrand
 import com.google.samples.apps.nowinandroid.core.model.data.Topic
 import com.google.samples.apps.nowinandroid.core.model.data.UserData
+import com.google.samples.apps.nowinandroid.core.ui.PreviewParameterData.newsResources
 import kotlinx.datetime.Instant
 import kotlinx.datetime.LocalDateTime
 import kotlinx.datetime.TimeZone
@@ -36,100 +37,100 @@ import kotlinx.datetime.toInstant
  * provides list of [UserNewsResource] for Composable previews.
  */
 class UserNewsResourcePreviewParameterProvider : PreviewParameterProvider<List<UserNewsResource>> {
-    override val values: Sequence<List<UserNewsResource>>
-        get() {
-            val userData: UserData = UserData(
-                bookmarkedNewsResources = setOf("1", "3"),
-                followedTopics = emptySet(),
-                themeBrand = ThemeBrand.ANDROID,
-                darkThemeConfig = DarkThemeConfig.DARK,
-                shouldHideOnboarding = true,
-                useDynamicColor = false,
-            )
+    override val values: Sequence<List<UserNewsResource>> = sequenceOf(newsResources)
+}
 
-            val topics = listOf(
-                Topic(
-                    id = "2",
-                    name = "Headlines",
-                    shortDescription = "News we want everyone to see",
-                    longDescription = "Stay up to date with the latest events and announcements from Android!",
-                    imageUrl = "https://firebasestorage.googleapis.com/v0/b/now-in-android.appspot.com/o/img%2Fic_topic_Headlines.svg?alt=media&token=506faab0-617a-4668-9e63-4a2fb996603f",
-                    url = "",
-                ),
-                Topic(
-                    id = "3",
-                    name = "UI",
-                    shortDescription = "Material Design, Navigation, Text, Paging, Accessibility (a11y), Internationalization (i18n), Localization (l10n), Animations, Large Screens, Widgets",
-                    longDescription = "Learn how to optimize your app's user interface - everything that users can see and interact with. Stay up to date on tocpis such as Material Design, Navigation, Text, Paging, Compose, Accessibility (a11y), Internationalization (i18n), Localization (l10n), Animations, Large Screens, Widgets, and many more!",
-                    imageUrl = "https://firebasestorage.googleapis.com/v0/b/now-in-android.appspot.com/o/img%2Fic_topic_UI.svg?alt=media&token=0ee1842b-12e8-435f-87ba-a5bb02c47594",
-                    url = "",
-                ),
-                Topic(
-                    id = "4",
-                    name = "Testing",
-                    shortDescription = "CI, Espresso, TestLab, etc",
-                    longDescription = "Testing is an integral part of the app development process. By running tests against your app consistently, you can verify your app's correctness, functional behavior, and usability before you release it publicly. Stay up to date on the latest tricks in CI, Espresso, and Firebase TestLab.",
-                    imageUrl = "https://firebasestorage.googleapis.com/v0/b/now-in-android.appspot.com/o/img%2Fic_topic_Testing.svg?alt=media&token=a11533c4-7cc8-4b11-91a3-806158ebf428",
-                    url = "",
-                ),
-            )
+object PreviewParameterData {
 
-            return sequenceOf(
-                listOf(
-                    UserNewsResource(
-                        newsResource = NewsResource(
-                            id = "1",
-                            title = "Android Basics with Compose",
-                            content = "We released the first two units of Android Basics with Compose, our first free course that teaches Android Development with Jetpack Compose to anyone; you do not need any prior programming experience other than basic computer literacy to get started. You’ll learn the fundamentals of programming in Kotlin while building Android apps using Jetpack Compose, Android’s modern toolkit that simplifies and accelerates native UI development. These two units are just the beginning; more will be coming soon. Check out Android Basics with Compose to get started on your Android development journey",
-                            url = "https://android-developers.googleblog.com/2022/05/new-android-basics-with-compose-course.html",
-                            headerImageUrl = "https://developer.android.com/images/hero-assets/android-basics-compose.svg",
-                            publishDate = LocalDateTime(
-                                year = 2022,
-                                monthNumber = 5,
-                                dayOfMonth = 4,
-                                hour = 23,
-                                minute = 0,
-                                second = 0,
-                                nanosecond = 0,
-                            ).toInstant(TimeZone.UTC),
-                            type = NewsResourceType.Codelab,
-                            topics = listOf(topics[2]),
-                        ),
-                        userData = userData,
-                    ),
-                    UserNewsResource(
-                        newsResource = NewsResource(
-                            id = "2",
-                            title = "Thanks for helping us reach 1M YouTube Subscribers",
-                            content = "Thank you everyone for following the Now in Android series and everything the " +
-                                "Android Developers YouTube channel has to offer. During the Android Developer " +
-                                "Summit, our YouTube channel reached 1 million subscribers! Here’s a small video to " +
-                                "thank you all.",
-                            url = "https://youtu.be/-fJ6poHQrjM",
-                            headerImageUrl = "https://i.ytimg.com/vi/-fJ6poHQrjM/maxresdefault.jpg",
-                            publishDate = Instant.parse("2021-11-09T00:00:00.000Z"),
-                            type = Video,
-                            topics = topics.take(2),
-                        ),
-                        userData = userData,
-                    ),
-                    UserNewsResource(
-                        newsResource = NewsResource(
-                            id = "3",
-                            title = "Transformations and customisations in the Paging Library",
-                            content = "A demonstration of different operations that can be performed " +
-                                "with Paging. Transformations like inserting separators, when to " +
-                                "create a new pager, and customisation options for consuming " +
-                                "PagingData.",
-                            url = "https://youtu.be/ZARz0pjm5YM",
-                            headerImageUrl = "https://i.ytimg.com/vi/ZARz0pjm5YM/maxresdefault.jpg",
-                            publishDate = Instant.parse("2021-11-01T00:00:00.000Z"),
-                            type = Video,
-                            topics = listOf(topics[2]),
-                        ),
-                        userData = userData,
-                    ),
-                ),
-            )
-        }
-}
+    private val userData: UserData = UserData(
+        bookmarkedNewsResources = setOf("1", "3"),
+        followedTopics = emptySet(),
+        themeBrand = ThemeBrand.ANDROID,
+        darkThemeConfig = DarkThemeConfig.DARK,
+        shouldHideOnboarding = true,
+        useDynamicColor = false,
+    )
+
+    val topics = listOf(
+        Topic(
+            id = "2",
+            name = "Headlines",
+            shortDescription = "News we want everyone to see",
+            longDescription = "Stay up to date with the latest events and announcements from Android!",
+            imageUrl = "https://firebasestorage.googleapis.com/v0/b/now-in-android.appspot.com/o/img%2Fic_topic_Headlines.svg?alt=media&token=506faab0-617a-4668-9e63-4a2fb996603f",
+            url = "",
+        ),
+        Topic(
+            id = "3",
+            name = "UI",
+            shortDescription = "Material Design, Navigation, Text, Paging, Accessibility (a11y), Internationalization (i18n), Localization (l10n), Animations, Large Screens, Widgets",
+            longDescription = "Learn how to optimize your app's user interface - everything that users can see and interact with. Stay up to date on tocpis such as Material Design, Navigation, Text, Paging, Compose, Accessibility (a11y), Internationalization (i18n), Localization (l10n), Animations, Large Screens, Widgets, and many more!",
+            imageUrl = "https://firebasestorage.googleapis.com/v0/b/now-in-android.appspot.com/o/img%2Fic_topic_UI.svg?alt=media&token=0ee1842b-12e8-435f-87ba-a5bb02c47594",
+            url = "",
+        ),
+        Topic(
+            id = "4",
+            name = "Testing",
+            shortDescription = "CI, Espresso, TestLab, etc",
+            longDescription = "Testing is an integral part of the app development process. By running tests against your app consistently, you can verify your app's correctness, functional behavior, and usability before you release it publicly. Stay up to date on the latest tricks in CI, Espresso, and Firebase TestLab.",
+            imageUrl = "https://firebasestorage.googleapis.com/v0/b/now-in-android.appspot.com/o/img%2Fic_topic_Testing.svg?alt=media&token=a11533c4-7cc8-4b11-91a3-806158ebf428",
+            url = "",
+        ),
+    )
+
+    val newsResources = listOf(
+        UserNewsResource(
+            newsResource = NewsResource(
+                id = "1",
+                title = "Android Basics with Compose",
+                content = "We released the first two units of Android Basics with Compose, our first free course that teaches Android Development with Jetpack Compose to anyone; you do not need any prior programming experience other than basic computer literacy to get started. You’ll learn the fundamentals of programming in Kotlin while building Android apps using Jetpack Compose, Android’s modern toolkit that simplifies and accelerates native UI development. These two units are just the beginning; more will be coming soon. Check out Android Basics with Compose to get started on your Android development journey",
+                url = "https://android-developers.googleblog.com/2022/05/new-android-basics-with-compose-course.html",
+                headerImageUrl = "https://developer.android.com/images/hero-assets/android-basics-compose.svg",
+                publishDate = LocalDateTime(
+                    year = 2022,
+                    monthNumber = 5,
+                    dayOfMonth = 4,
+                    hour = 23,
+                    minute = 0,
+                    second = 0,
+                    nanosecond = 0,
+                ).toInstant(TimeZone.UTC),
+                type = NewsResourceType.Codelab,
+                topics = listOf(topics[2]),
+            ),
+            userData = userData,
+        ),
+        UserNewsResource(
+            newsResource = NewsResource(
+                id = "2",
+                title = "Thanks for helping us reach 1M YouTube Subscribers",
+                content = "Thank you everyone for following the Now in Android series and everything the " +
+                    "Android Developers YouTube channel has to offer. During the Android Developer " +
+                    "Summit, our YouTube channel reached 1 million subscribers! Here’s a small video to " +
+                    "thank you all.",
+                url = "https://youtu.be/-fJ6poHQrjM",
+                headerImageUrl = "https://i.ytimg.com/vi/-fJ6poHQrjM/maxresdefault.jpg",
+                publishDate = Instant.parse("2021-11-09T00:00:00.000Z"),
+                type = Video,
+                topics = topics.take(2),
+            ),
+            userData = userData,
+        ),
+        UserNewsResource(
+            newsResource = NewsResource(
+                id = "3",
+                title = "Transformations and customisations in the Paging Library",
+                content = "A demonstration of different operations that can be performed " +
+                    "with Paging. Transformations like inserting separators, when to " +
+                    "create a new pager, and customisation options for consuming " +
+                    "PagingData.",
+                url = "https://youtu.be/ZARz0pjm5YM",
+                headerImageUrl = "https://i.ytimg.com/vi/ZARz0pjm5YM/maxresdefault.jpg",
+                publishDate = Instant.parse("2021-11-01T00:00:00.000Z"),
+                type = Video,
+                topics = listOf(topics[2]),
+            ),
+            userData = userData,
+        ),
+    )
+}
diff --git a/...erests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/TabContent.kt b/...erests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/TabContent.kt
@@ -35,6 +35,7 @@ fun TopicsTabContent(
     onTopicClick: (String) -> Unit,
     onFollowButtonClick: (String, Boolean) -> Unit,
     modifier: Modifier = Modifier,
+    withBottomSpacer: Boolean = true
 ) {
     LazyColumn(
         modifier = modifier
@@ -56,8 +57,10 @@ fun TopicsTabContent(
             }
         }
 
-        item {
-            Spacer(Modifier.windowInsetsBottomHeight(WindowInsets.safeDrawing))
+        if (withBottomSpacer) {
+            item {
+                Spacer(Modifier.windowInsetsBottomHeight(WindowInsets.safeDrawing))
+            }
         }
     }
 }
diff --git a/feature/search/build.gradle.kts b/feature/search/build.gradle.kts
@@ -26,3 +26,9 @@ android {
     namespace = "com.google.samples.apps.nowinandroid.feature.search"
 }
 
+dependencies {
+    implementation(project(":feature:foryou"))
+    implementation(project(":feature:interests"))
+    implementation(libs.kotlinx.datetime)
+}
+