Merge pull request #499 from anasshamsi97/main

Typo fix for search & Remove the redundant "interests" prefix

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)
+            interestsLoading = getString(R.string.loading)
-            interestsEmptyHeader = getString(R.string.interests_empty_header)
+            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)
         }
     }
 

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
                     )
                 )
             }

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

feature/interests/src/main/res/values/strings.xml

@@ -15,13 +15,12 @@
      limitations under the License.
 -->
 <resources>
-    <!-- TODO: Remove the redundant "interests" prefix -->
     <string name="interests">Interests</string>
-    <string name="interests_loading">Loading data</string>
+    <string name="loading">Loading data</string>
-    <string name="interests_empty_header">"No available data"</string>
+    <string name="empty_header">"No available data"</string>
-    <string name="interests_card_follow_button_content_desc">Follow interest button</string>
+    <string name="card_follow_button_content_desc">Follow interest button</string>
-    <string name="interests_card_unfollow_button_content_desc">Unfollow interest button</string>
+    <string name="card_unfollow_button_content_desc">Unfollow interest button</string>
-    <string name="interests_top_app_bar_title">Interests</string>
+    <string name="top_app_bar_title">Interests</string>
-    <string name="interests_top_app_bar_action_menu">Menu</string>
+    <string name="top_app_bar_action_menu">Menu</string>
-    <string name="interests_top_app_bar_action_seearch">Search</string>
+    <string name="top_app_bar_action_search">Search</string>
 </resources>