From 0896d38033e3e19dc456e1caa97ba83f56f54bd3 Mon Sep 17 00:00:00 2001
From: Caren Chang <carenc@google.com>
Date: Mon, 11 Jul 2022 13:53:26 -0700
Subject: [PATCH 1/2] Fix content descriptions on app bars

---
 .../samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt  | 4 ++--
 feature-foryou/src/main/res/values/strings.xml                | 4 ++--
 .../apps/nowinandroid/feature/interests/InterestsScreen.kt    | 4 ++--
 feature-interests/src/main/res/values/strings.xml             | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt b/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt
index 7a607be0c..cebe9fc05 100644
--- a/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt
+++ b/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt
@@ -138,11 +138,11 @@ fun ForYouScreen(
                     titleRes = R.string.top_app_bar_title,
                     navigationIcon = NiaIcons.Search,
                     navigationIconContentDescription = stringResource(
-                        id = R.string.top_app_bar_navigation_button_content_desc
+                        id = R.string.for_you_top_app_bar_navigation_button_content_desc
                     ),
                     actionIcon = NiaIcons.AccountCircle,
                     actionIconContentDescription = stringResource(
-                        id = R.string.top_app_bar_navigation_button_content_desc
+                        id = R.string.for_you_top_app_bar_action_button_content_desc
                     ),
                     colors = TopAppBarDefaults.centerAlignedTopAppBarColors(
                         containerColor = Color.Transparent
diff --git a/feature-foryou/src/main/res/values/strings.xml b/feature-foryou/src/main/res/values/strings.xml
index 0c6428ca7..d19271633 100644
--- a/feature-foryou/src/main/res/values/strings.xml
+++ b/feature-foryou/src/main/res/values/strings.xml
@@ -24,8 +24,8 @@
     <string name="onboarding_guidance_title">What are you interested in?</string>
     <string name="onboarding_guidance_subtitle">Updates from topics you follow will appear here. Follow some things to get started.</string>
     <string name="top_app_bar_title">Now in Android</string>
-    <string name="top_app_bar_action_button_content_desc">My account</string>
-    <string name="top_app_bar_navigation_button_content_desc">Search</string>
+    <string name="for_you_top_app_bar_action_button_content_desc">My account</string>
+    <string name="for_you_top_app_bar_navigation_button_content_desc">Search</string>
 
     <!-- Authors-->
     <string name="following">You are following</string>
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 f8a462a5a..912a5a21c 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
@@ -87,11 +87,11 @@ fun InterestsScreen(
             titleRes = R.string.interests,
             navigationIcon = NiaIcons.Search,
             navigationIconContentDescription = stringResource(
-                id = R.string.top_app_bar_navigation_button_content_desc
+                id = R.string.interests_top_app_bar_navigation_button_content_desc
             ),
             actionIcon = NiaIcons.MoreVert,
             actionIconContentDescription = stringResource(
-                id = R.string.top_app_bar_navigation_button_content_desc
+                id = R.string.interests_top_app_bar_action_button_content_desc
             ),
             colors = TopAppBarDefaults.centerAlignedTopAppBarColors(
                 containerColor = Color.Transparent
diff --git a/feature-interests/src/main/res/values/strings.xml b/feature-interests/src/main/res/values/strings.xml
index e8d9f135d..5e5df4b58 100644
--- a/feature-interests/src/main/res/values/strings.xml
+++ b/feature-interests/src/main/res/values/strings.xml
@@ -22,6 +22,6 @@
     <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="top_app_bar_action_button_content_desc">Menu</string>
-    <string name="top_app_bar_navigation_button_content_desc">Search</string>
+    <string name="interests_top_app_bar_action_button_content_desc">Menu</string>
+    <string name="interests_top_app_bar_navigation_button_content_desc">Search</string>
 </resources>

From 8902b415881666c599eb0eefa1a35ac60a623ca4 Mon Sep 17 00:00:00 2001
From: Caren Chang <carenc@google.com>
Date: Wed, 13 Jul 2022 11:24:13 -0700
Subject: [PATCH 2/2] Update string names to be more descriptiv and succint

---
 .../samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt  | 4 ++--
 feature-foryou/src/main/res/values/strings.xml                | 4 ++--
 .../apps/nowinandroid/feature/interests/InterestsScreen.kt    | 4 ++--
 feature-interests/src/main/res/values/strings.xml             | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt b/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt
index cebe9fc05..a918f2a87 100644
--- a/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt
+++ b/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt
@@ -138,11 +138,11 @@ fun ForYouScreen(
                     titleRes = R.string.top_app_bar_title,
                     navigationIcon = NiaIcons.Search,
                     navigationIconContentDescription = stringResource(
-                        id = R.string.for_you_top_app_bar_navigation_button_content_desc
+                        id = R.string.for_you_top_app_bar_action_search
                     ),
                     actionIcon = NiaIcons.AccountCircle,
                     actionIconContentDescription = stringResource(
-                        id = R.string.for_you_top_app_bar_action_button_content_desc
+                        id = R.string.for_you_top_app_bar_action_my_account
                     ),
                     colors = TopAppBarDefaults.centerAlignedTopAppBarColors(
                         containerColor = Color.Transparent
diff --git a/feature-foryou/src/main/res/values/strings.xml b/feature-foryou/src/main/res/values/strings.xml
index d19271633..fb8b02307 100644
--- a/feature-foryou/src/main/res/values/strings.xml
+++ b/feature-foryou/src/main/res/values/strings.xml
@@ -24,8 +24,8 @@
     <string name="onboarding_guidance_title">What are you interested in?</string>
     <string name="onboarding_guidance_subtitle">Updates from topics you follow will appear here. Follow some things to get started.</string>
     <string name="top_app_bar_title">Now in Android</string>
-    <string name="for_you_top_app_bar_action_button_content_desc">My account</string>
-    <string name="for_you_top_app_bar_navigation_button_content_desc">Search</string>
+    <string name="for_you_top_app_bar_action_my_account">My account</string>
+    <string name="for_you_top_app_bar_action_search">Search</string>
 
     <!-- Authors-->
     <string name="following">You are following</string>
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 912a5a21c..8986b9685 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
@@ -87,11 +87,11 @@ fun InterestsScreen(
             titleRes = R.string.interests,
             navigationIcon = NiaIcons.Search,
             navigationIconContentDescription = stringResource(
-                id = R.string.interests_top_app_bar_navigation_button_content_desc
+                id = R.string.interests_top_app_bar_action_seearch
             ),
             actionIcon = NiaIcons.MoreVert,
             actionIconContentDescription = stringResource(
-                id = R.string.interests_top_app_bar_action_button_content_desc
+                id = R.string.interests_top_app_bar_action_menu
             ),
             colors = TopAppBarDefaults.centerAlignedTopAppBarColors(
                 containerColor = Color.Transparent
diff --git a/feature-interests/src/main/res/values/strings.xml b/feature-interests/src/main/res/values/strings.xml
index 5e5df4b58..e265c1e9e 100644
--- a/feature-interests/src/main/res/values/strings.xml
+++ b/feature-interests/src/main/res/values/strings.xml
@@ -22,6 +22,6 @@
     <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_action_button_content_desc">Menu</string>
-    <string name="interests_top_app_bar_navigation_button_content_desc">Search</string>
+    <string name="interests_top_app_bar_action_menu">Menu</string>
+    <string name="interests_top_app_bar_action_seearch">Search</string>
 </resources>