msb-public
/
nowinandroid
mirror of https://github.com/android/nowinandroid.git
1
0
Code Issues Projects Releases Wiki Activity

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

Browse Source
pull/2113/head
Noah Statton 4 months ago
parent 7d45eae4f8
commit 814343be5d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File

4
app/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/ui/NavigationTest.kt
Unescape View File

@ -52,7 +52,7 @@ import org.junit.Test
import javax.inject.Inject import javax.inject.Inject
import com.google.samples.apps.nowinandroid.feature.bookmarks.api.R as BookmarksR 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.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 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 // The strings used for matching in these tests
private val navigateUp by composeTestRule.stringResource(FeatureForyouR.string.feature_foryou_api_navigate_up) 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 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 sampleTopic = "Headlines"
private val appName by composeTestRule.stringResource(R.string.app_name) private val appName by composeTestRule.stringResource(R.string.app_name)
private val saved by composeTestRule.stringResource(BookmarksR.string.feature_bookmarks_api_title) private val saved by composeTestRule.stringResource(BookmarksR.string.feature_bookmarks_api_title)

6
app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/TopLevelNavItem.kt
Unescape View File

@ -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.interests.api.navigation.InterestsNavKey
import com.google.samples.apps.nowinandroid.feature.bookmarks.api.R as bookmarksR 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.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 * 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( val INTERESTS = TopLevelNavItem(
selectedIcon = NiaIcons.Grid3x3, selectedIcon = NiaIcons.Grid3x3,
unselectedIcon = 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( val TOP_LEVEL_NAV_ITEMS = mapOf(

Write Preview
Loading…
Cancel
Save