update demos

Author: SmartToolFactory

app/src/main/java/com/smarttoolfactory/composeimage/demo/ImageScaleDemo.kt

@@ -1,6 +1,7 @@
 package com.smarttoolfactory.composeimage.demo
 
 import android.graphics.Bitmap
+import androidx.compose.animation.core.*
 import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -11,6 +12,7 @@ import androidx.compose.ui.draw.clipToBounds
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.*
 import androidx.compose.ui.graphics.drawscope.Stroke
+import androidx.compose.ui.graphics.drawscope.drawIntoCanvas
 import androidx.compose.ui.input.pointer.PointerInputChange
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
@@ -319,20 +321,50 @@ private fun Drawing(modifier: Modifier) {
     // This is previous motion event before next touch is saved into this current position
     var previousPosition by remember { mutableStateOf(Offset.Unspecified) }
 
-    val brush = remember {
-        Brush.verticalGradient(
-            colors = listOf(
-                Color.Red,
-                Color.Green,
-                Color.Yellow,
-                Color.Blue,
-                Color.Cyan,
-                Color.Magenta,
-                Color.Red,
-            )
+
+    val transition: InfiniteTransition = rememberInfiniteTransition()
+
+    // Infinite phase animation for PathEffect
+    val phase by transition.animateFloat(
+        initialValue = .9f,
+        targetValue = .3f,
+        animationSpec = infiniteRepeatable(
+            animation = tween(
+                durationMillis = 1000,
+                easing = FastOutSlowInEasing
+            ),
+            repeatMode = RepeatMode.Reverse
         )
+    )
+
+    val color = Color.Green
+
+    val paint = remember {
+        Paint().apply {
+            style = PaintingStyle.Stroke
+            strokeWidth = 15f
+            strokeCap = StrokeCap.Round
+
+
+            this.asFrameworkPaint().apply {
+                val transparent = color
+                    .copy(alpha = 0f)
+                    .toArgb()
+
+                this.color = transparent
+            }
+        }
     }
 
+    paint.asFrameworkPaint().setShadowLayer(
+        30f * phase,
+        0f,
+        0f,
+        color
+            .copy(alpha = phase)
+            .toArgb()
+    )
+
     // Path is what is used for drawing line on Canvas
     val path = remember(modifier) { Path() }
 
@@ -385,10 +417,15 @@ private fun Drawing(modifier: Modifier) {
             else -> Unit
         }
 
-        drawPath(
-            brush = brush,
-            path = path,
-            style = Stroke(width = 4.dp.toPx(), cap = StrokeCap.Round, join = StrokeJoin.Round)
-        )
+        this.drawIntoCanvas {
+
+            it.drawPath(path, paint)
+
+            drawPath(
+                color = Color.White.copy((0.4f + phase).coerceAtMost(1f)),
+                path = path,
+                style = Stroke(width = 4.dp.toPx(), cap = StrokeCap.Round, join = StrokeJoin.Round)
+            )
+        }
     }
 }

app/src/main/java/com/smarttoolfactory/composeimage/demo/ThumbnailDemo.kt

@@ -81,10 +81,8 @@ private fun ThumbnailDemoSamples(imageBitmap: ImageBitmap) {
     ThumbnailCallbackSample(modifier, imageBitmap, contentScale)
     ThumbnailPositionChangeSample(modifier)
     ThumbnailUIPropertiesSample(modifier)
-    ThumbnailScaleModeSample()
 }
 
-
 @Composable
 private fun ThumbnailScaleModeCustomImageSample(
     modifier: Modifier,
@@ -309,199 +307,6 @@ private fun ThumbnailUIPropertiesSample(
         ),
         contentDescription = null
         )
-
-    }
-}
-
-@Composable
-private fun ThumbnailScaleModeSample() {
-    val modifier = Modifier
-        .background(Color.LightGray)
-        .fillMaxWidth()
-        .aspectRatio(4 / 3f)
-
-    val bitmap1 = ImageBitmap.imageResource(
-        LocalContext.current.resources,
-        R.drawable.landscape1
-    )
-
-    val bitmap2 = ImageBitmap.imageResource(
-        LocalContext.current.resources,
-        R.drawable.landscape2
-    )
-
-    val bitmap3 = ImageBitmap.imageResource(
-        LocalContext.current.resources,
-        R.drawable.landscape3
-    )
-
-    ExpandableColumnWithTitle(
-        title = "Content Scale",
-        color = MaterialTheme.colorScheme.primary,
-        initialExpandState = false
-    ) {
-
-        Text(
-            "Demonstrates correct positions are returned even if image is " +
-                    "scaled with ContentScale modes"
-        )
-
-        // Bitmap1 1920x1280
-        Text(text = "ContentScale.None")
-        ImageWithThumbnail(
-            imageBitmap = bitmap1,
-            modifier = modifier,
-            contentScale = ContentScale.None,
-            contentDescription = null
-        )
-
-        Spacer(modifier = Modifier.height(30.dp))
-        Text(text = "ContentScale.Fit")
-        ImageWithThumbnail(
-            imageBitmap = bitmap1,
-            modifier = modifier,
-            contentScale = ContentScale.Fit,
-            contentDescription = null
-        )
-
-        Spacer(modifier = Modifier.height(30.dp))
-        Text(text = "ContentScale.Crop")
-        ImageWithThumbnail(
-            imageBitmap = bitmap1,
-            modifier = modifier,
-            contentScale = ContentScale.Crop,
-            contentDescription = null
-        )
-
-        Spacer(modifier = Modifier.height(30.dp))
-        Text(text = "ContentScale.FillBounds")
-        ImageWithThumbnail(
-            imageBitmap = bitmap1,
-            modifier = modifier,
-            contentScale = ContentScale.FillBounds,
-            contentDescription = null
-        )
-
-        Spacer(modifier = Modifier.height(30.dp))
-        Text(text = "ContentScale.FillWidth")
-        ImageWithThumbnail(
-            imageBitmap = bitmap1,
-            modifier = modifier,
-            contentScale = ContentScale.FillWidth,
-            contentDescription = null
-        )
-
-        Spacer(modifier = Modifier.height(30.dp))
-        Text(text = "ContentScale.FillHeight")
-        ImageWithThumbnail(
-            imageBitmap = bitmap1,
-            modifier = modifier,
-            contentScale = ContentScale.FillHeight,
-            contentDescription = null
-        )
-
-        Spacer(modifier = Modifier.height(30.dp))
-        Text(text = "ContentScale.Inside")
-        ImageWithThumbnail(
-            imageBitmap = bitmap1,
-            modifier = modifier,
-            contentScale = ContentScale.Inside,
-            contentDescription = null
-        )
-
-        // Bitmap2 480x270
-
-        Spacer(modifier = Modifier.height(30.dp))
-        Text(text = "ContentScale.None")
-        ImageWithThumbnail(
-            imageBitmap = bitmap2,
-            modifier = modifier,
-            contentScale = ContentScale.None,
-            contentDescription = null
-        )
-
-        Spacer(modifier = Modifier.height(30.dp))
-        Text(text = "ContentScale.Fit")
-        ImageWithThumbnail(
-            imageBitmap = bitmap2,
-            modifier = modifier,
-            contentScale = ContentScale.Fit,
-            contentDescription = null
-        )
-
-        Spacer(modifier = Modifier.height(30.dp))
-        Text(text = "ContentScale.Crop")
-        ImageWithThumbnail(
-            imageBitmap = bitmap2,
-            modifier = modifier,
-            contentScale = ContentScale.Crop,
-            contentDescription = null
-        )
-
-        Spacer(modifier = Modifier.height(30.dp))
-        Text(text = "ContentScale.FillBounds")
-        ImageWithThumbnail(
-            imageBitmap = bitmap2,
-            modifier = modifier,
-            contentScale = ContentScale.FillBounds,
-            contentDescription = null
-        )
-
-        Spacer(modifier = Modifier.height(30.dp))
-        Text(text = "ContentScale.FillWidth")
-        ImageWithThumbnail(
-            imageBitmap = bitmap2,
-            modifier = modifier,
-            contentScale = ContentScale.FillWidth,
-            contentDescription = null
-        )
-
-        Spacer(modifier = Modifier.height(30.dp))
-        Text(text = "ContentScale.FillHeight")
-        ImageWithThumbnail(
-            imageBitmap = bitmap2,
-            modifier = modifier,
-            contentScale = ContentScale.FillHeight,
-            contentDescription = null
-        )
-
-        Spacer(modifier = Modifier.height(30.dp))
-        Text(text = "ContentScale.Inside")
-        ImageWithThumbnail(
-            imageBitmap = bitmap2,
-            modifier = modifier,
-            contentScale = ContentScale.Inside,
-            contentDescription = null
-        )
-
-        // Bitmap3 1000x1000
-
-        Spacer(modifier = Modifier.height(30.dp))
-        Text(text = "ContentScale.FillBounds")
-        ImageWithThumbnail(
-            imageBitmap = bitmap3,
-            modifier = modifier,
-            contentScale = ContentScale.FillBounds,
-            contentDescription = null
-        )
-
-        Spacer(modifier = Modifier.height(30.dp))
-        Text(text = "ContentScale.Fit")
-        ImageWithThumbnail(
-            imageBitmap = bitmap3,
-            modifier = modifier,
-            contentScale = ContentScale.Fit,
-            contentDescription = null
-        )
-
-        Spacer(modifier = Modifier.height(30.dp))
-        Text(text = "ContentScale.Crop")
-        ImageWithThumbnail(
-            imageBitmap = bitmap3,
-            modifier = modifier,
-            contentScale = ContentScale.Crop,
-            contentDescription = null
-        )
     }
 }