From f3ac637e540e1eb381c651b18aa192c935972942 Mon Sep 17 00:00:00 2001
From: yveskalume <yvkalume@gmail.com>
Date: Tue, 22 Nov 2022 17:35:08 +0200
Subject: [PATCH] fix conflict

---
 .../apps/nowinandroid/feature/bookmarks/BookmarksScreen.kt | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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 39ce1aef8..312205064 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
@@ -84,12 +84,13 @@ internal fun BookmarksRoute(
 internal fun BookmarksScreen(
     feedState: NewsFeedUiState,
     removeFromBookmarks: (String) -> Unit,
+    onBrowseTopic: (String) -> Unit,
     modifier: Modifier = Modifier
 ) {
     when (feedState) {
         Loading -> LoadingState(modifier)
         is Success -> if (feedState.feed.isNotEmpty()) {
-            BookmarksGrid(feedState, removeFromBookmarks, modifier)
+            BookmarksGrid(feedState, removeFromBookmarks, onBrowseTopic, modifier)
         } else {
             EmptyState(modifier)
         }
@@ -129,6 +130,7 @@ private fun BookmarksGrid(
         newsFeed(
             feedState = feedState,
             onNewsResourcesCheckedChanged = { id, _ -> removeFromBookmarks(id) },
+            onBrowseTopic = onBrowseTopic
         )
         item(span = { GridItemSpan(maxLineSpan) }) {
             Spacer(Modifier.windowInsetsBottomHeight(WindowInsets.safeDrawing))
@@ -191,7 +193,8 @@ private fun BookmarksGridPreview() {
                     SaveableNewsResource(it, false)
                 }
             ),
-            removeFromBookmarks = {}
+            removeFromBookmarks = {},
+            onBrowseTopic = {}
         )
     }
 }