diff --git a/feature/interests/src/androidTest/java/com/google/samples/apps/nowinandroid/interests/InterestsScreenTest.kt b/feature/interests/src/androidTest/java/com/google/samples/apps/nowinandroid/interests/InterestsScreenTest.kt index 8bd47a8a8..e44086c4c 100644 --- a/feature/interests/src/androidTest/java/com/google/samples/apps/nowinandroid/interests/InterestsScreenTest.kt +++ b/feature/interests/src/androidTest/java/com/google/samples/apps/nowinandroid/interests/InterestsScreenTest.kt @@ -52,12 +52,12 @@ class InterestsScreenTest { @Before fun setup() { composeTestRule.activity.apply { - interestsLoading = getString(R.string.interests_loading) - interestsEmptyHeader = getString(R.string.interests_empty_header) + interestsLoading = getString(R.string.loading) + interestsEmptyHeader = getString(R.string.empty_header) interestsTopicCardFollowButton = - getString(R.string.interests_card_follow_button_content_desc) + getString(R.string.card_follow_button_content_desc) interestsTopicCardUnfollowButton = - getString(R.string.interests_card_unfollow_button_content_desc) + getString(R.string.card_unfollow_button_content_desc) } } diff --git a/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsItem.kt b/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsItem.kt index 32e645094..de04f59f1 100644 --- a/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsItem.kt +++ b/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsItem.kt @@ -76,7 +76,7 @@ fun InterestsItem( Icon( imageVector = NiaIcons.Add, contentDescription = stringResource( - id = string.interests_card_follow_button_content_desc + id = string.card_follow_button_content_desc ) ) }, @@ -84,7 +84,7 @@ fun InterestsItem( Icon( imageVector = NiaIcons.Check, contentDescription = stringResource( - id = string.interests_card_unfollow_button_content_desc + id = string.card_unfollow_button_content_desc ) ) } diff --git a/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.kt b/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.kt index d062b5fe9..8cce790c4 100644 --- a/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.kt +++ b/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.kt @@ -65,7 +65,7 @@ internal fun InterestsScreen( InterestsUiState.Loading -> NiaLoadingWheel( modifier = modifier, - contentDesc = stringResource(id = R.string.interests_loading), + contentDesc = stringResource(id = R.string.loading), ) is InterestsUiState.Interests -> TopicsTabContent( @@ -81,7 +81,7 @@ internal fun InterestsScreen( @Composable private fun InterestsEmptyScreen() { - Text(text = stringResource(id = R.string.interests_empty_header)) + Text(text = stringResource(id = R.string.empty_header)) } @DevicePreviews diff --git a/feature/interests/src/main/res/values/strings.xml b/feature/interests/src/main/res/values/strings.xml index f4496265d..5b9ab83e0 100644 --- a/feature/interests/src/main/res/values/strings.xml +++ b/feature/interests/src/main/res/values/strings.xml @@ -15,13 +15,12 @@ limitations under the License. --> - Interests - Loading data - "No available data" - Follow interest button - Unfollow interest button - Interests - Menu - Search + Loading data + "No available data" + Follow interest button + Unfollow interest button + Interests + Menu + Search