A fully functional Android app built entirely with Kotlin and Jetpack Compose
feat: Show loading progress for Image Component as a solve for //TODO b/228077205,
qamarelsafadi3284eb68a3b7
diff --git a/core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/DynamicAsyncImage.kt b/core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/DynamicAsyncImage.ktindex abd783545..e26a824af 100644--- a/core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/DynamicAsyncImage.kt+++ b/core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/DynamicAsyncImage.kt@@ -16,19 +16,11 @@package com.google.samples.apps.nowinandroid.core.designsystem.component-import androidx.compose.foundation.Image-import androidx.compose.foundation.layout.Box-import androidx.compose.foundation.layout.size-import androidx.compose.material3.CircularProgressIndicator-import androidx.compose.material3.MaterialThemeimport androidx.compose.runtime.Composable-import androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifierimport androidx.compose.ui.graphics.ColorFilterimport androidx.compose.ui.graphics.painter.Painter-import androidx.compose.ui.unit.dpimport coil.compose.AsyncImage-import coil.compose.SubcomposeAsyncImageimport com.google.samples.apps.nowinandroid.core.designsystem.theme.LocalTintTheme/**@@ -42,30 +34,11 @@ fun DynamicAsyncImage(placeholder: Painter? = null,) {val iconTint = LocalTintTheme.current.iconTint- SubcomposeAsyncImage(- error = {- if (placeholder != null) {- Image(- painter = placeholder,- contentDescription = "placeholder image",- )- }- },+ AsyncImage(+ placeholder = placeholder,model = imageUrl,contentDescription = contentDescription,colorFilter = if (iconTint != null) ColorFilter.tint(iconTint) else null,modifier = modifier,- loading = {- Box(- modifier = modifier,- contentAlignment = Alignment.Center,- ) {- CircularProgressIndicator(- Modifier.size(80.dp),- color = MaterialTheme.colorScheme.tertiary,- )- }- },-- )+ )}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.ktindex 0342bfcaf..c9a327881 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@@ -17,7 +17,6 @@package com.google.samples.apps.nowinandroid.core.uiimport androidx.compose.foundation.Canvas-import androidx.compose.foundation.Imageimport androidx.compose.foundation.horizontalScrollimport androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.Box@@ -32,7 +31,6 @@ import androidx.compose.foundation.rememberScrollStateimport androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.material3.Cardimport androidx.compose.material3.CardDefaults-import androidx.compose.material3.CircularProgressIndicatorimport androidx.compose.material3.ExperimentalMaterial3Apiimport androidx.compose.material3.Iconimport androidx.compose.material3.MaterialTheme@@ -46,7 +44,6 @@ import androidx.compose.runtime.mutableStateOfimport androidx.compose.runtime.rememberimport androidx.compose.runtime.setValueimport androidx.compose.ui.Alignment-import androidx.compose.ui.Alignment.Companionimport androidx.compose.ui.Modifierimport androidx.compose.ui.graphics.Colorimport androidx.compose.ui.layout.ContentScale@@ -61,8 +58,6 @@ import androidx.compose.ui.tooling.preview.Previewimport androidx.compose.ui.tooling.preview.PreviewParameterimport androidx.compose.ui.unit.dpimport coil.compose.AsyncImage-import coil.compose.AsyncImagePainter-import coil.compose.SubcomposeAsyncImageimport com.google.samples.apps.nowinandroid.core.designsystem.component.NiaIconToggleButtonimport com.google.samples.apps.nowinandroid.core.designsystem.component.NiaTopicTagimport com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIcons@@ -152,37 +147,20 @@ fun NewsResourceCardExpanded(fun NewsResourceHeaderImage(headerImageUrl: String?,) {-- SubcomposeAsyncImage(+ AsyncImage(+ placeholder = if (LocalInspectionMode.current) {+ painterResource(DesignsystemR.drawable.ic_placeholder_default)+ } else {+ // TODO b/228077205, show specific loading image visual+ null+ },modifier = Modifier.fillMaxWidth().height(180.dp),contentScale = ContentScale.Crop,model = headerImageUrl,// TODO b/226661685: Investigate using alt text of image to populate content description- contentDescription = null, // decorative image,- error = {- if (LocalInspectionMode.current) {- Image(- painter =- painterResource(DesignsystemR.drawable.ic_placeholder_default),- contentDescription = "placeholder image",- )- } else {- null- }- },- loading = {- Box(- modifier = Modifier.size(180.dp),- contentAlignment = Alignment.Center,- ) {- CircularProgressIndicator(- Modifier.size(80.dp),- color = MaterialTheme.colorScheme.tertiary,- )- }- },+ contentDescription = null, // decorative image)}