From fc8bbcba9bf6da4d2ca22411fe6039129deffc83 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 6 Jun 2022 14:33:56 +0000 Subject: [PATCH 1/2] Update dependency androidx.core:core-ktx to v1.8.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 2945fb66a..ec1b31b06 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,7 +6,7 @@ androidxActivity = "1.4.0" androidxAppCompat = "1.3.0" androidxCompose = "1.2.0-beta03" androidxComposeMaterial3 = "1.0.0-alpha13" -androidxCore = "1.7.0" +androidxCore = "1.8.0" androidxCustomView = "1.0.0-beta02" androidxDataStore = "1.0.0" androidxEspresso = "3.3.0" From 04f33f7cca7283cb29cc19eebba3d1c370c32fdd Mon Sep 17 00:00:00 2001 From: Caren Chang Date: Fri, 10 Jun 2022 10:53:01 -0700 Subject: [PATCH 2/2] Fix nullable function call when retrieving locale --- .../apps/nowinandroid/core/ui/NewsResourceCard.kt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/core-ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt b/core-ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt index d31f988ce..718840d17 100644 --- a/core-ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt +++ b/core-ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt @@ -156,8 +156,14 @@ fun NewsResourceAuthors( if (authors.isNotEmpty()) { // Only display first author for now val author = authors[0] - val authorNameFormatted = - author.name.uppercase(ConfigurationCompat.getLocales(LocalConfiguration.current).get(0)) + + val locale = ConfigurationCompat.getLocales(LocalConfiguration.current).get(0) + + val authorNameFormatted = if (locale != null) { + author.name.uppercase(locale) + } else { + author.name.uppercase() + } val authorImageUrl = author.imageUrl