Merge pull request #168 from android/caren/top_bar_cds

Fix content descriptions on app bars
2 years ago · 65228a8c76
parent 1733939841 2dfbfde676
commit 65228a8c76
4 changed files with 8 additions and 8 deletions
--- 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_action_search
                    ),
                    actionIcon = NiaIcons.AccountCircle,
                    actionIconContentDescription = stringResource(
-                        id = R.string.top_app_bar_navigation_button_content_desc
+                        id = R.string.for_you_top_app_bar_action_my_account
                    ),
                    colors = TopAppBarDefaults.centerAlignedTopAppBarColors(
                        containerColor = Color.Transparent
--- 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_my_account">My account</string>
+    <string name="for_you_top_app_bar_action_search">Search</string>

    <!-- Authors-->
    <string name="following">You are following</string>
--- 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_action_seearch
            ),
            actionIcon = NiaIcons.MoreVert,
            actionIconContentDescription = stringResource(
-                id = R.string.top_app_bar_navigation_button_content_desc
+                id = R.string.interests_top_app_bar_action_menu
            ),
            colors = TopAppBarDefaults.centerAlignedTopAppBarColors(
                containerColor = Color.Transparent
--- 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_menu">Menu</string>
+    <string name="interests_top_app_bar_action_seearch">Search</string>
 </resources>