Skip to content

fix: source Interests top-level nav label from feature/interests module #2113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Noahs212 wants to merge 1 commit into
base: main
Choose a base branch
from
+5 −5
Open

fix: source Interests top-level nav label from feature/interests module #2113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/ui/NavigationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

/**
Expand Down Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/TopLevelNavItem.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -62,8 +62,8 @@ val BOOKMARKS = TopLevelNavItem(
val INTERESTS = TopLevelNavItem(
selectedIcon = NiaIcons.Grid3x3,
unselectedIcon = NiaIcons.Grid3x3,
iconTextId = searchR.string.feature_search_api_interests,
titleTextId = searchR.string.feature_search_api_interests,
iconTextId = interestsR.string.feature_interests_api_title,
titleTextId = interestsR.string.feature_interests_api_title,
)

val TOP_LEVEL_NAV_ITEMS = mapOf(
Expand Down