Skip to content

Commit 6c0d6ad

Browse files
Fixes icons size in onboarding and restores LocalInspection for images (#909)
* Fixes icons size in onboarding and restores LocalInspection for images
1 parent 6645ec9 commit 6c0d6ad

File tree

2 files changed

+10
-4
lines changed
  • core

2 files changed

+10
-4
lines changed

core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/DynamicAsyncImage.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import androidx.compose.ui.Modifier
3131
import androidx.compose.ui.graphics.ColorFilter
3232
import androidx.compose.ui.graphics.painter.Painter
3333
import androidx.compose.ui.layout.ContentScale
34+
import androidx.compose.ui.platform.LocalInspectionMode
3435
import androidx.compose.ui.res.painterResource
3536
import androidx.compose.ui.unit.dp
3637
import coil.compose.AsyncImage
@@ -60,11 +61,12 @@ fun DynamicAsyncImage(
6061
isError = state is Error
6162
},
6263
)
64+
val isLocalInspection = LocalInspectionMode.current
6365
Box(
6466
modifier = modifier,
6567
contentAlignment = Alignment.Center,
6668
) {
67-
if (isLoading) {
69+
if (isLoading && !isLocalInspection) {
6870
// Display a progress bar while loading
6971
CircularProgressIndicator(
7072
modifier = Modifier
@@ -75,10 +77,9 @@ fun DynamicAsyncImage(
7577
}
7678
Image(
7779
contentScale = ContentScale.Crop,
78-
painter = if (isError.not()) imageLoader else placeholder,
80+
painter = if (isError.not() && !isLocalInspection) imageLoader else placeholder,
7981
contentDescription = contentDescription,
8082
colorFilter = if (iconTint != null) ColorFilter.tint(iconTint) else null,
81-
modifier = modifier,
8283
)
8384
}
8485
}

core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ fun NewsResourceHeaderImage(
158158
isError = state is AsyncImagePainter.State.Error
159159
},
160160
)
161+
val isLocalInspection = LocalInspectionMode.current
161162
Box(
162163
modifier = Modifier
163164
.fillMaxWidth()
@@ -179,7 +180,11 @@ fun NewsResourceHeaderImage(
179180
.fillMaxWidth()
180181
.height(180.dp),
181182
contentScale = ContentScale.Crop,
182-
painter = if (isError.not()) imageLoader else painterResource(drawable.ic_placeholder_default),
183+
painter = if (isError.not() && !isLocalInspection) {
184+
imageLoader
185+
} else {
186+
painterResource(drawable.ic_placeholder_default)
187+
},
183188
// TODO b/226661685: Investigate using alt text of image to populate content description
184189
contentDescription = null, // decorative image,
185190
)

0 commit comments

Comments
 (0)