add EnhancedZoom crop demo

Author: SmartToolFactory

README.md

@@ -233,9 +233,10 @@ fun ZoomableImage(
     minZoom: Float = 1f,
     maxZoom: Float = 5f,
     limitPan: Boolean = true,
-    zoomEnabled: Boolean = true,
-    panEnabled: Boolean = true,
-    rotationEnabled: Boolean = false,
+    zoomable: Boolean = true,
+    pannable: Boolean = true,
+    rotatable: Boolean = false,
+    clip: Boolean = true,
     clipTransformToContentScale: Boolean = false,
     consume: Boolean = true,
     onGestureStart: (ZoomData) -> Unit = {},

app/src/main/java/com/smarttoolfactory/composeimage/MainActivity.kt

@@ -18,11 +18,21 @@ import com.google.accompanist.pager.ExperimentalPagerApi
 import com.google.accompanist.pager.HorizontalPager
 import com.google.accompanist.pager.PagerState
 import com.google.accompanist.pager.rememberPagerState
-import com.smarttoolfactory.composeimage.demo.*
+import com.smarttoolfactory.composeimage.demo.ImageWithConstraintsDemo
+import com.smarttoolfactory.composeimage.demo.ThumbnailDemo
+import com.smarttoolfactory.composeimage.demo.beforeafter.BeforeAfterImageDemo
+import com.smarttoolfactory.composeimage.demo.beforeafter.BeforeAfterLayoutDemo
+import com.smarttoolfactory.composeimage.demo.transform.EditScaleDemo
+import com.smarttoolfactory.composeimage.demo.transform.EditSizeDemo
+import com.smarttoolfactory.composeimage.demo.zoom.AnimatedZoomDemo
+import com.smarttoolfactory.composeimage.demo.zoom.EnhancedZoomCropDemo
+import com.smarttoolfactory.composeimage.demo.zoom.EnhancedZoomDemo
+import com.smarttoolfactory.composeimage.demo.zoom.ZoomDemo
 import com.smarttoolfactory.composeimage.ui.theme.ComposeImageTheme
 import kotlinx.coroutines.launch
 
 class MainActivity : ComponentActivity() {
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContent {
@@ -91,9 +101,12 @@ private fun HomeContent() {
                 1 -> ThumbnailDemo()
                 2 -> EditScaleDemo()
                 3 -> EditSizeDemo()
-                4 -> ZoomDemo()
-                5 -> BeforeAfterImageDemo()
-                else -> BeforeAfterLayoutDemo()
+                4 -> BeforeAfterImageDemo()
+                5 -> BeforeAfterLayoutDemo()
+                6 -> ZoomDemo()
+                7 -> EnhancedZoomDemo()
+                8 -> EnhancedZoomCropDemo()
+                else -> AnimatedZoomDemo()
             }
         }
     }
@@ -105,7 +118,10 @@ internal val tabList =
         "Image Thumbnail",
         "Editable Scale",
         "Editable Size",
-        "Zoom",
         "Before/After Image",
         "Before/After Layout",
+        "Zoom",
+        "Enhanced Zoom",
+        "Enhanced Zoom Crop",
+        "Animated Zoom"
     )

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

@@ -199,7 +199,7 @@ private fun CropSample(
     Button(
         modifier = Modifier
             .padding(8.dp)
-            .fillMaxSize(),
+            .fillMaxWidth(),
         onClick = { showDialog = true }) {
         Text("Crop")
     }

app/src/main/java/com/smarttoolfactory/composeimage/demo/beforeafter/SampleExoPlayer.kt

@@ -15,14 +15,13 @@ import com.google.android.exoplayer2.ui.PlayerView
 @Composable
 fun MyPlayer(modifier: Modifier, uri: String) {
     val context = LocalContext.current
-    val player = SimpleExoPlayer.Builder(context).build()
+    val player = remember {
+        SimpleExoPlayer.Builder(context).build()
+    }
     val playerView = remember {
         PlayerView(context)
     }
 
-
-    println("🚀 MyPlayer URI $uri, player: $player, playerView: $playerView")
-
     LaunchedEffect(player, uri) {
         playerView.useController = false
         playerView.resizeMode = AspectRatioFrameLayout.RESIZE_MODE_FILL

…/composeimage/transform/EditScaleDemo.kt …oseimage/demo/transform/EditScaleDemo.ktapp/src/main/java/com/smarttoolfactory/composeimage/transform/EditScaleDemo.kt renamed to app/src/main/java/com/smarttoolfactory/composeimage/demo/transform/EditScaleDemo.kt app/src/main/java/com/smarttoolfactory/composeimage/transform/EditScaleDemo.kt renamed to app/src/main/java/com/smarttoolfactory/composeimage/demo/transform/EditScaleDemo.kt

@@ -1,4 +1,4 @@
-package com.smarttoolfactory.composeimage.transform
+package com.smarttoolfactory.composeimage.demo.transform
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background

…y/composeimage/transform/EditSizeDemo.kt …poseimage/demo/transform/EditSizeDemo.ktapp/src/main/java/com/smarttoolfactory/composeimage/transform/EditSizeDemo.kt renamed to app/src/main/java/com/smarttoolfactory/composeimage/demo/transform/EditSizeDemo.kt app/src/main/java/com/smarttoolfactory/composeimage/transform/EditSizeDemo.kt renamed to app/src/main/java/com/smarttoolfactory/composeimage/demo/transform/EditSizeDemo.kt

@@ -1,4 +1,4 @@
-package com.smarttoolfactory.composeimage.transform
+package com.smarttoolfactory.composeimage.demo.transform
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background

app/src/main/java/com/smarttoolfactory/composeimage/demo/zoom/AnimatedZoomDemo.kt

@@ -1,7 +1,6 @@
 package com.smarttoolfactory.composeimage.demo.zoom
 
 import androidx.compose.foundation.background
-import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.size
@@ -10,25 +9,29 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import com.smarttoolfactory.image.zoom.AnimatedZoomLayout
 
 @Composable
 fun AnimatedZoomDemo() {
 
     Column(modifier = Modifier.fillMaxSize()) {
         AnimatedZoomLayout(
-            modifier = Modifier
-                .fillMaxSize()
-                .border(2.dp, Color.Green)
+            modifier = Modifier.fillMaxSize(),
+            enabled = { zoom, pan, rotation ->
+                (zoom > 1.2f)
+            }
         ) {
             Text(
                 modifier = Modifier
-                    .size(200.dp)
+                    .size(300.dp, height = 400.dp)
                     .background(Color.Yellow),
-                text = "Hello World........\n" +
-                        "asdamsdalşsdkasşl\n" +
-                        "asdasdaskdk\n" +
-                " asads dasdasdasd asdasdasd",
+                text = "This Composable can be zoomed, rotated, or can moved.\n\n" +
+                        "Also can move back to correct bounds if size \n" +
+                        " of content is passed" +
+                        "as parameter to Modifier.animatedZoom\n\n" +
+                        "Fling gesture when last pointer is up",
+                fontSize = 20.sp
             )
         }
     }