Merge branch 'main' into bw/initialMetrics

feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt

@@ -141,11 +141,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

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>

feature-interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.kt

@@ -96,11 +96,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

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>

gradle/libs.versions.toml

@@ -13,7 +13,7 @@ androidxEspresso = "3.4.0"
 androidxHiltNavigationCompose = "1.0.0"
 androidxLifecycle = "2.5.0-rc02"
 androidxMacroBenchmark = "1.1.0"
-androidxNavigation = "2.4.2"
+androidxNavigation = "2.5.0"
 androidxMetrics = "1.0.0-alpha01"
 androidxProfileinstaller = "1.2.0-rc01"
 androidxSavedState = "1.1.0"