Merge 814343be5d into 12f80da651

app/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/ui/NavigationTest.kt

@@ -52,7 +52,7 @@ import org.junit.Test
 import javax.inject.Inject
 import com.google.samples.apps.nowinandroid.feature.bookmarks.api.R as BookmarksR
 import com.google.samples.apps.nowinandroid.feature.foryou.api.R as FeatureForyouR
-import com.google.samples.apps.nowinandroid.feature.search.api.R as FeatureSearchR
+import com.google.samples.apps.nowinandroid.feature.interests.api.R as FeatureInterestsR
 import com.google.samples.apps.nowinandroid.feature.settings.impl.R as SettingsR
 
 /**
@@ -88,7 +88,7 @@ class NavigationTest {
     // The strings used for matching in these tests
     private val navigateUp by composeTestRule.stringResource(FeatureForyouR.string.feature_foryou_api_navigate_up)
     private val forYou by composeTestRule.stringResource(FeatureForyouR.string.feature_foryou_api_title)
-    private val interests by composeTestRule.stringResource(FeatureSearchR.string.feature_search_api_interests)
+    private val interests by composeTestRule.stringResource(FeatureInterestsR.string.feature_interests_api_title)
     private val sampleTopic = "Headlines"
     private val appName by composeTestRule.stringResource(R.string.app_name)
     private val saved by composeTestRule.stringResource(BookmarksR.string.feature_bookmarks_api_title)

app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/TopLevelNavItem.kt

@@ -25,7 +25,7 @@ import com.google.samples.apps.nowinandroid.feature.foryou.api.navigation.ForYou
 import com.google.samples.apps.nowinandroid.feature.interests.api.navigation.InterestsNavKey
 import com.google.samples.apps.nowinandroid.feature.bookmarks.api.R as bookmarksR
 import com.google.samples.apps.nowinandroid.feature.foryou.api.R as forYouR
-import com.google.samples.apps.nowinandroid.feature.search.api.R as searchR
+import com.google.samples.apps.nowinandroid.feature.interests.api.R as interestsR
 
 /**
  * Type for the top level navigation items in the application. Contains UI information about the
@@ -62,8 +62,8 @@ val BOOKMARKS = TopLevelNavItem(
 val INTERESTS = TopLevelNavItem(
     selectedIcon = NiaIcons.Grid3x3,
     unselectedIcon = NiaIcons.Grid3x3,
-    iconTextId = searchR.string.feature_search_api_interests,
+    iconTextId = interestsR.string.feature_interests_api_title,
-    titleTextId = searchR.string.feature_search_api_interests,
+    titleTextId = interestsR.string.feature_interests_api_title,
 )
 
 val TOP_LEVEL_NAV_ITEMS = mapOf(