Merge remote-tracking branch 'origin/ioc-workshop' into ioc-workshop

feature/interests/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/impl/filter/FilterActivity.kt

@@ -138,7 +138,7 @@ fun FilterScreen(modifier: Modifier = Modifier) {
                 val thumbnail = createFilteredBitmap(sourceBitmap, filter)
                 FilterThumbnail(
                     image = thumbnail.asImageBitmap(),
-                    name = filter.name,
+                    filter = filter,
                     selected = filter == selectedFilter,
                     onClick = { selectedFilter = filter}
                 )
@@ -166,7 +166,7 @@ fun FilterScreen(modifier: Modifier = Modifier) {
 @Composable
 fun FilterThumbnail(
     image: ImageBitmap,
-    name: String,
+    filter: ImageFilter,
     selected: Boolean,
     onClick: () -> Unit
 ) {
@@ -186,14 +186,14 @@ fun FilterThumbnail(
         ) {
             Image(
                 bitmap = image,
-                contentDescription = name,
+                contentDescription = filter.name,
                 modifier = Modifier.fillMaxSize(),
-                contentScale = ContentScale.Crop
+                contentScale = ContentScale.Crop,
             )
         }
         Spacer(modifier = Modifier.height(4.dp))
         Text(
-            text = name,
+            text = filter.name,
             style = MaterialTheme.typography.labelMedium,
             fontWeight = if (selected) FontWeight.Bold else FontWeight.Normal
         )

feature/interests/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/impl/filter/FilterUtils.kt

@@ -24,6 +24,7 @@ import android.graphics.Canvas
 import android.graphics.ColorMatrix
 import android.graphics.ColorMatrixColorFilter
 import android.graphics.Paint
+import androidx.compose.ui.graphics.ColorFilter
 import androidx.core.content.FileProvider
 import com.google.samples.apps.nowinandroid.feature.interests.impl.R
 import java.io.File
@@ -32,7 +33,9 @@ import java.io.FileOutputStream
 class ImageFilter(
     val name: String,
     val matrix: FloatArray
-)
+) {
+    val colorFilter by lazy { ColorFilter.colorMatrix(androidx.compose.ui.graphics.ColorMatrix(matrix)) }
+}
 
 val FILTERS = listOf(
     ImageFilter(
@@ -96,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 {