diff --git a/feature/interests/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/impl/filter/FilterActivity.kt b/feature/interests/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/impl/filter/FilterActivity.kt index f3db96dd1..25c4836ff 100644 --- a/feature/interests/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/impl/filter/FilterActivity.kt +++ b/feature/interests/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/impl/filter/FilterActivity.kt @@ -103,7 +103,7 @@ fun FilterScreen(modifier: Modifier = Modifier) { val sourceBitmap = remember { decodeSourceBitmap(context) } - val sourceImage = remember(sourceBitmap) { sourceBitmap.asImageBitmap() } + val previewBitmap = createFilteredBitmap(sourceBitmap, selectedFilter) Column( modifier = modifier @@ -122,22 +122,22 @@ fun FilterScreen(modifier: Modifier = Modifier) { Spacer(modifier = Modifier.height(12.dp)) Image( - bitmap = sourceImage, + bitmap = previewBitmap.asImageBitmap(), contentDescription = "Filtered Preview (${selectedFilter.name})", modifier = Modifier .size(300.dp) .clip(RoundedCornerShape(12.dp)) .background(Color.LightGray), - contentScale = ContentScale.Crop, - colorFilter = selectedFilter.colorFilter + contentScale = ContentScale.Crop ) Spacer(modifier = Modifier.height(12.dp)) LazyRow(horizontalArrangement = Arrangement.spacedBy(12.dp)) { items(FILTERS, key = { it.name }) { filter -> + val thumbnail = createFilteredBitmap(sourceBitmap, filter) FilterThumbnail( - image = sourceImage, + image = thumbnail.asImageBitmap(), filter = filter, selected = filter == selectedFilter, onClick = { selectedFilter = filter} @@ -189,7 +189,6 @@ fun FilterThumbnail( contentDescription = filter.name, modifier = Modifier.fillMaxSize(), contentScale = ContentScale.Crop, - colorFilter = filter.colorFilter ) } Spacer(modifier = Modifier.height(4.dp)) diff --git a/feature/interests/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/impl/filter/FilterUtils.kt b/feature/interests/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/impl/filter/FilterUtils.kt index 9a580a460..2ed328cb8 100644 --- a/feature/interests/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/impl/filter/FilterUtils.kt +++ b/feature/interests/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/impl/filter/FilterUtils.kt @@ -99,7 +99,7 @@ val FILTERS = listOf( fun decodeSourceBitmap(context: Context): Bitmap { val options = BitmapFactory.Options().apply { inSampleSize = 4 } - return BitmapFactory.decodeResource(context.resources, R.drawable.feature_interests_impl_large_image, options) + return BitmapFactory.decodeResource(context.resources, R.drawable.img, options) } fun createFilteredBitmap(source: Bitmap, filter: ImageFilter): Bitmap { diff --git a/feature/interests/impl/src/main/res/drawable/img.png b/feature/interests/impl/src/main/res/drawable/img.png new file mode 100644 index 000000000..9ce214e02 Binary files /dev/null and b/feature/interests/impl/src/main/res/drawable/img.png differ