A fully functional Android app built entirely with Kotlin and Jetpack Compose
Merge pull request #767 from SimonMarquis/resource-prefix
Don Turner89d39a724228
diff --cc core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.ktindex 114e845d4,687604ccc..9eca6b141--- a/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt+++ b/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt@@@ -183,11 -183,10 +183,11 @@@ fun NewsResourceHeaderImagepainter = if (isError.not() && !isLocalInspection) {imageLoader} else {- painterResource(drawable.ic_placeholder_default)+ painterResource(drawable.core_designsystem_ic_placeholder_default)},// TODO b/226661685: Investigate using alt text of image to populate content description- contentDescription = null, // decorative image,+ // decorative image,+ contentDescription = null,)}}diff --cc feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.ktindex f0899b448,fb2752e08..30134715b--- a/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt+++ b/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt@@@ -269,10 -268,10 +269,10 @@@ private fun LazyStaggeredGridScope.onbo-> Unitis OnboardingUiState.Shown -> {- item(span = { GridItemSpan(maxLineSpan) }, contentType = "onboarding") {+ item(span = StaggeredGridItemSpan.FullLine, contentType = "onboarding") {Column(modifier = interestsItemModifier) {Text(- text = stringResource(R.string.onboarding_guidance_title),+ text = stringResource(R.string.feature_foryou_onboarding_guidance_title),textAlign = TextAlign.Center,modifier = Modifier.fillMaxWidth()@@@ -435,10 -434,9 +435,10 @@@ fun TopicIconmodifier: Modifier = Modifier,) {DynamicAsyncImage(- placeholder = painterResource(R.drawable.ic_icon_placeholder),+ placeholder = painterResource(R.drawable.feature_foryou_ic_icon_placeholder),imageUrl = imageUrl,- contentDescription = null, // decorative+ // decorative+ contentDescription = null,modifier = modifier.padding(10.dp).size(32.dp),