From 4434fc3691fa3c589e388344a77a6608b6b905a3 Mon Sep 17 00:00:00 2001
From: Caren <calren24@gmail.com>
Date: Fri, 30 Sep 2022 13:56:15 -0700
Subject: [PATCH] Printing out topic name clicked on

Change-Id: Idc8b1faa18771051811ceb6c3b8b80e29faa6715
---
 .../google/samples/apps/nowinandroid/core/ui/NewsFeed.kt  | 8 ++++++--
 .../samples/apps/nowinandroid/core/ui/NewsResourceCard.kt | 2 +-
 .../apps/nowinandroid/core/ui/NewsResourceCardList.kt     | 2 +-
 .../apps/nowinandroid/feature/topic/TopicScreen.kt        | 4 ++--
 4 files changed, 10 insertions(+), 6 deletions(-)

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 7a9b74f5f..3f1ef9183 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
@@ -56,7 +56,7 @@ fun LazyGridScope.newsFeed(
     feedState: NewsFeedUiState,
     showLoadingUIIfLoading: Boolean,
     @StringRes loadingContentDescription: Int,
-    onNewsResourcesCheckedChanged: (String, Boolean) -> Unit
+    onNewsResourcesCheckedChanged: (String, Boolean) -> Unit,
 ) {
     when (feedState) {
         NewsFeedUiState.Loading -> {
@@ -82,7 +82,7 @@ fun LazyGridScope.newsFeed(
                 NewsResourceCardExpanded(
                     newsResource = saveableNewsResource.newsResource,
                     isBookmarked = saveableNewsResource.isSaved,
-                    onTopicClicked = { Log.i("Caren", "Clicked on topic") },
+                    onTopicClicked = { onTopicClicked(it) },
                     onClick = { ContextCompat.startActivity(context, launchResourceIntent, null) },
                     onToggleBookmark = {
                         onNewsResourcesCheckedChanged(
@@ -96,6 +96,10 @@ fun LazyGridScope.newsFeed(
     }
 }
 
+fun onTopicClicked(id: String) {
+    Log.i("Caren", "Topic clicked: $id")
+}
+
 /**
  * A sealed hierarchy describing the state of the feed of news resources.
  */
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 cf9da058e..acc0c94f2 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
@@ -278,7 +278,7 @@ fun NewsResourceTopics(
         for (topic in topics) {
             NiaTopicTag(
                 followed = true, // ToDo: Check if topic is followed
-                onClick = { onTopicClicked(topic.id) },
+                onClick = { onTopicClicked(topic.name) },
                 text = { Text(text = topic.name.uppercase(Locale.getDefault())) }
             )
         }
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 26c51b8b6..0ad16f21e 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
@@ -63,7 +63,7 @@ fun <T> LazyListScope.newsResourceCardItems(
                 }
             },
             modifier = itemModifier,
-            onTopicClicked = { }
+            onTopicClicked = { onTopicClicked(item)}
         )
     },
 )
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 6cb67050b..12424f36b 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
@@ -177,9 +177,9 @@ private fun LazyListScope.TopicCards(
                 items = news.news,
                 newsResourceMapper = { it.newsResource },
                 isBookmarkedMapper = { it.isSaved },
-                onToggleBookmark = { /* TODO */ },
+                onToggleBookmark = { onBookmarkChanged(it.newsResource.id, !it.isSaved) },
                 itemModifier = Modifier.padding(24.dp),
-                onTopicClicked = { },
+                onTopicClicked = { }
             )
         }
         is NewsUiState.Loading -> item {