Replace zoomable with telephoto

Author: DeweyReed

app/dependencies/dogReleaseRuntimeClasspath.txt

@@ -211,8 +211,8 @@ com.nex3z:toggle-button-group:1.2.3
 com.squareup.moshi:moshi:1.15.2
 com.squareup.okio:okio-jvm:3.17.0
 com.squareup.okio:okio:3.17.0
-dev.drewhamilton.poko:poko-annotations-jvm:0.15.2
-dev.drewhamilton.poko:poko-annotations:0.15.2
+dev.drewhamilton.poko:poko-annotations-jvm:0.18.7
+dev.drewhamilton.poko:poko-annotations:0.18.7
 io.coil-kt.coil3:coil-android:3.4.0
 io.coil-kt.coil3:coil-compose-android:3.4.0
 io.coil-kt.coil3:coil-compose-core-android:3.4.0
@@ -224,8 +224,11 @@ io.coil-kt.coil3:coil-gif:3.4.0
 io.coil-kt.coil3:coil:3.4.0
 jakarta.inject:jakarta.inject-api:2.0.1
 javax.inject:javax.inject:1
+me.saket.telephoto:annotations-android:0.18.0
+me.saket.telephoto:annotations:0.18.0
+me.saket.telephoto:zoomable-android:0.18.0
+me.saket.telephoto:zoomable:0.18.0
 me.zhanghai.android.materialprogressbar:library:1.4.2
-net.engawapg.lib:zoomable:1.6.1
 nl.dionsegijn:konfetti:1.3.2
 org.jetbrains.androidx.lifecycle:lifecycle-common:2.9.6
 org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.6

app/dependencies/googleReleaseRuntimeClasspath.txt

@@ -271,8 +271,8 @@ com.nex3z:toggle-button-group:1.2.3
 com.squareup.moshi:moshi:1.15.2
 com.squareup.okio:okio-jvm:3.17.0
 com.squareup.okio:okio:3.17.0
-dev.drewhamilton.poko:poko-annotations-jvm:0.15.2
-dev.drewhamilton.poko:poko-annotations:0.15.2
+dev.drewhamilton.poko:poko-annotations-jvm:0.18.7
+dev.drewhamilton.poko:poko-annotations:0.18.7
 io.coil-kt.coil3:coil-android:3.4.0
 io.coil-kt.coil3:coil-compose-android:3.4.0
 io.coil-kt.coil3:coil-compose-core-android:3.4.0
@@ -284,8 +284,11 @@ io.coil-kt.coil3:coil-gif:3.4.0
 io.coil-kt.coil3:coil:3.4.0
 jakarta.inject:jakarta.inject-api:2.0.1
 javax.inject:javax.inject:1
+me.saket.telephoto:annotations-android:0.18.0
+me.saket.telephoto:annotations:0.18.0
+me.saket.telephoto:zoomable-android:0.18.0
+me.saket.telephoto:zoomable:0.18.0
 me.zhanghai.android.materialprogressbar:library:1.4.2
-net.engawapg.lib:zoomable:1.6.1
 net.lingala.zip4j:zip4j:2.11.6
 nl.dionsegijn:konfetti:1.3.2
 org.jetbrains.androidx.lifecycle:lifecycle-common:2.9.6

app/dependencies/otherReleaseRuntimeClasspath.txt

@@ -211,8 +211,8 @@ com.nex3z:toggle-button-group:1.2.3
 com.squareup.moshi:moshi:1.15.2
 com.squareup.okio:okio-jvm:3.17.0
 com.squareup.okio:okio:3.17.0
-dev.drewhamilton.poko:poko-annotations-jvm:0.15.2
-dev.drewhamilton.poko:poko-annotations:0.15.2
+dev.drewhamilton.poko:poko-annotations-jvm:0.18.7
+dev.drewhamilton.poko:poko-annotations:0.18.7
 io.coil-kt.coil3:coil-android:3.4.0
 io.coil-kt.coil3:coil-compose-android:3.4.0
 io.coil-kt.coil3:coil-compose-core-android:3.4.0
@@ -224,8 +224,11 @@ io.coil-kt.coil3:coil-gif:3.4.0
 io.coil-kt.coil3:coil:3.4.0
 jakarta.inject:jakarta.inject-api:2.0.1
 javax.inject:javax.inject:1
+me.saket.telephoto:annotations-android:0.18.0
+me.saket.telephoto:annotations:0.18.0
+me.saket.telephoto:zoomable-android:0.18.0
+me.saket.telephoto:zoomable:0.18.0
 me.zhanghai.android.materialprogressbar:library:1.4.2
-net.engawapg.lib:zoomable:1.6.1
 nl.dionsegijn:konfetti:1.3.2
 org.jetbrains.androidx.lifecycle:lifecycle-common:2.9.6
 org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.6

component-key/src/main/java/xyz/aprildown/timer/component/key/ImagePreviewActivity.kt

@@ -8,7 +8,6 @@ import androidx.activity.SystemBarStyle
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.compose.foundation.background
-import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
@@ -18,14 +17,17 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.dp
 import coil3.compose.AsyncImage
 import coil3.request.ImageRequest
 import coil3.request.crossfade
-import net.engawapg.lib.zoomable.rememberZoomState
-import net.engawapg.lib.zoomable.zoomable
+import me.saket.telephoto.zoomable.ZoomSpec
+import me.saket.telephoto.zoomable.ZoomableContentLocation
+import me.saket.telephoto.zoomable.rememberZoomableState
+import me.saket.telephoto.zoomable.zoomable
 import android.graphics.Color as AndroidColor
 import androidx.compose.ui.graphics.Color.Companion as ComposeColor
 
@@ -79,19 +81,33 @@ private fun ImagePreview(
     onDismiss: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
+    val zoomableState = rememberZoomableState(
+        zoomSpec = ZoomSpec(maxZoomFactor = 5f),
+    )
+    val density = LocalDensity.current
+    val padding = 16.dp
     AsyncImage(
         model = ImageRequest.Builder(LocalContext.current)
             .data(data)
             .crossfade(true)
+            .listener { _, result ->
+                val image = result.image
+                val paddingPx = density.run { padding.toPx() } * 2f
+                zoomableState.setContentLocation(
+                    ZoomableContentLocation.scaledInsideAndCenterAligned(
+                        Size(
+                            width = image.width.toFloat() + paddingPx,
+                            height = image.height.toFloat() + paddingPx
+                        )
+                    )
+                )
+            }
             .build(),
         contentDescription = null,
         modifier = modifier
             .fillMaxSize()
             .background(ComposeColor.Black.copy(alpha = 0.5f))
-            .pointerInput(onDismiss) {
-                detectTapGestures(onTap = { onDismiss() })
-            }
-            .padding(16.dp)
-            .zoomable(zoomState = rememberZoomState()),
+            .zoomable(state = zoomableState, onClick = { onDismiss() })
+            .padding(padding),
     )
 }

gradle/libs.versions.toml

@@ -161,7 +161,7 @@ taskerPlugin = "com.joaomgcd:taskerpluginlibrary:0.4.10"
 diskLruCache = "com.github.bumptech.glide:disklrucache:5.0.5"
 coil = "io.coil-kt.coil3:coil-compose:3.4.0"
 coil-gif = "io.coil-kt.coil3:coil-gif:3.4.0"
-zoomable = "net.engawapg.lib:zoomable:1.6.1"
+zoomable = "me.saket.telephoto:zoomable:0.18.0"
 twoWayNestedScrollView = "com.github.ultimate-deej:twowaynestedscrollview:0.1.2"
 accurateCountDownTimer = "com.github.cardinalby:accurate-count-down-timer:1.0"