From cfe6e65311bd900ce9d8525b2fb73c2e0eee39cd Mon Sep 17 00:00:00 2001
From: Muhammad Anas Shamsi <anasshamsi97@gmail.com>
Date: Mon, 19 Dec 2022 17:37:35 +0500
Subject: [PATCH 1/3] Typo fix for search

---
 feature/interests/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/feature/interests/src/main/res/values/strings.xml b/feature/interests/src/main/res/values/strings.xml
index f4496265d..afdc48034 100644
--- a/feature/interests/src/main/res/values/strings.xml
+++ b/feature/interests/src/main/res/values/strings.xml
@@ -23,5 +23,5 @@
     <string name="interests_card_unfollow_button_content_desc">Unfollow interest button</string>
     <string name="interests_top_app_bar_title">Interests</string>
     <string name="interests_top_app_bar_action_menu">Menu</string>
-    <string name="interests_top_app_bar_action_seearch">Search</string>
+    <string name="interests_top_app_bar_action_search">Search</string>
 </resources>

From a9a8a18d160c5db9b5f49e50943b4a6fa040db7e Mon Sep 17 00:00:00 2001
From: Muhammad Anas Shamsi <anasshamsi97@gmail.com>
Date: Mon, 19 Dec 2022 17:42:15 +0500
Subject: [PATCH 2/3] remove the redundant "interests" prefix

---
 .../interests/InterestsScreenTest.kt           |  8 ++++----
 .../feature/interests/InterestsItem.kt         |  4 ++--
 .../feature/interests/InterestsScreen.kt       |  4 ++--
 .../interests/src/main/res/values/strings.xml  | 18 ++++++++----------
 4 files changed, 16 insertions(+), 18 deletions(-)

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 afdc48034..8b5b7c285 100644
--- a/feature/interests/src/main/res/values/strings.xml
+++ b/feature/interests/src/main/res/values/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
      Copyright 2022 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,13 +14,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="interests_empty_header">"No available data"</string>
-    <string name="interests_card_follow_button_content_desc">Follow interest button</string>
-    <string name="interests_card_unfollow_button_content_desc">Unfollow interest button</string>
-    <string name="interests_top_app_bar_title">Interests</string>
-    <string name="interests_top_app_bar_action_menu">Menu</string>
-    <string name="interests_top_app_bar_action_search">Search</string>
+    <string name="loading">Loading data</string>
+    <string name="empty_header">"No available data"</string>
+    <string name="card_follow_button_content_desc">Follow interest button</string>
+    <string name="card_unfollow_button_content_desc">Unfollow interest button</string>
+    <string name="top_app_bar_title">Interests</string>
+    <string name="top_app_bar_action_menu">Menu</string>
+    <string name="top_app_bar_action_search">Search</string>
 </resources>

From 2534bdc5f8e502b69fd7c1cf2d728c231cf7e76d Mon Sep 17 00:00:00 2001
From: Muhammad Anas Shamsi <anasshamsi97@gmail.com>
Date: Tue, 20 Dec 2022 16:42:42 +0500
Subject: [PATCH 3/3] CI error due to invalid file format resolved

---
 feature/interests/src/main/res/values/strings.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/feature/interests/src/main/res/values/strings.xml b/feature/interests/src/main/res/values/strings.xml
index 8b5b7c285..5b9ab83e0 100644
--- a/feature/interests/src/main/res/values/strings.xml
+++ b/feature/interests/src/main/res/values/strings.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!--
+<?xml version="1.0" encoding="utf-8"?>
+<!--
      Copyright 2022 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");