From 2d26f563271c8bd59b9fa2e46ae291da95d32519 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 30 Jun 2022 00:18:23 +0000 Subject: [PATCH 1/3] Update dependency androidx.navigation:navigation-compose to v2.5.0 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c37b6388e..7984aa377 100644 --- a/gradle/libs.versions.toml +++ b/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" androidxProfileinstaller = "1.2.0-rc01" androidxSavedState = "1.1.0" androidxStartup = "1.1.1" From ef902234957f96725eefc4e5069e86fdfb1a6261 Mon Sep 17 00:00:00 2001 From: Caren Chang Date: Mon, 11 Jul 2022 13:53:26 -0700 Subject: [PATCH 2/3] 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 @@ What are you interested in? Updates from topics you follow will appear here. Follow some things to get started. Now in Android - My account - Search + My account + Search You are following 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 @@ "No available data" Follow interest button Unfollow interest button - Menu - Search + Menu + Search From 2dfbfde676ede6309e6be1622feb26dfa5e3df8a Mon Sep 17 00:00:00 2001 From: Caren Chang Date: Wed, 13 Jul 2022 11:24:13 -0700 Subject: [PATCH 3/3] 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 @@ What are you interested in? Updates from topics you follow will appear here. Follow some things to get started. Now in Android - My account - Search + My account + Search You are following 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 @@ "No available data" Follow interest button Unfollow interest button - Menu - Search + Menu + Search