Skip to content

WIP Telephoto zoomable #372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

WIP Telephoto zoomable #372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ dependencyResolutionManagement {
}
}
mavenCentral()
mavenLocal()
}
}

Expand Down
2 changes: 2 additions & 0 deletions shared/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,8 @@ kotlin {
api(libs.kmpnotifier)

implementation(libs.doistx.normalize)

implementation("me.saket.telephoto:zoomable:0.16.0-SNAPSHOT")
}

commonTest.dependencies {
Expand Down
99 changes: 54 additions & 45 deletions shared/src/commonMain/kotlin/org/jetbrains/kotlinconf/screens/MapScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import androidx.compose.runtime.saveable.Saver
import androidx.compose.runtime.saveable.SaverScope
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clipToBounds
import androidx.compose.ui.geometry.Offset
Expand All @@ -39,6 +40,8 @@ import kotlinconfapp.shared.generated.resources.map_ground_floor
import kotlinconfapp.shared.generated.resources.map_title
import kotlinx.coroutines.async
import kotlinx.coroutines.launch
import me.saket.telephoto.zoomable.rememberZoomableState
import me.saket.telephoto.zoomable.zoomable
import org.jetbrains.compose.resources.ExperimentalResourceApi
import org.jetbrains.compose.resources.StringResource
import org.jetbrains.compose.resources.stringResource
Expand Down Expand Up @@ -175,64 +178,70 @@ private fun Map(
val validOffsetX = (-svg.width * 0.5f)..(svg.height * 0.5f)
val validOffsetY = (-svg.height * 0.5f)..(svg.height * 0.5f)

val zoomableState = rememberZoomableState().apply {
contentAlignment = Alignment.Center
}
// zoomableState.contentAlignment =

val interactiveModifiers = if (!interactive) {
Modifier
} else {
Modifier
.transformable(rememberTransformableState { zoomChange, panChange, _ ->
if (!interactive) return@rememberTransformableState

scope.launch {
scale.snapTo((scale.value * zoomChange).coerceIn(zoomRange))
offsetX.snapTo((offsetX.value + panChange.x / scale.value).coerceIn(validOffsetX))
offsetY.snapTo((offsetY.value + panChange.y / scale.value).coerceIn(validOffsetY))
}
})
.pointerInput(Unit) {
if (!interactive) return@pointerInput

detectTapGestures(
onDoubleTap = { tapOffset ->
val spec = tween<Float>(500, easing = EaseOutCubic)

if (scale.value >= zoomRange.endInclusive - 0.1f) {
scope.launch { scale.animateTo(initialZoom, spec) }
} else {
val newScale = (scale.value * 2f).coerceIn(zoomRange)

val newOffsetX = (offsetX.value + (size.width / 2 - tapOffset.x) / 2 / scale.value)
.coerceIn(validOffsetX)
val newOffsetY = (offsetY.value + (size.height / 2 - tapOffset.y) / 2 / scale.value)
.coerceIn(validOffsetY)

scope.launch {
async { scale.animateTo(newScale, spec) }
async { offsetX.animateTo(newOffsetX, spec) }
async { offsetY.animateTo(newOffsetY, spec) }
}
}
}
)
}
// .transformable(rememberTransformableState { zoomChange, panChange, _ ->
// if (!interactive) return@rememberTransformableState
//
// scope.launch {
// scale.snapTo((scale.value * zoomChange).coerceIn(zoomRange))
// offsetX.snapTo((offsetX.value + panChange.x / scale.value).coerceIn(validOffsetX))
// offsetY.snapTo((offsetY.value + panChange.y / scale.value).coerceIn(validOffsetY))
// }
// })
// .pointerInput(Unit) {
// if (!interactive) return@pointerInput
//
// detectTapGestures(
// onDoubleTap = { tapOffset ->
// val spec = tween<Float>(500, easing = EaseOutCubic)
//
// if (scale.value >= zoomRange.endInclusive - 0.1f) {
// scope.launch { scale.animateTo(initialZoom, spec) }
// } else {
// val newScale = (scale.value * 2f).coerceIn(zoomRange)
//
// val newOffsetX = (offsetX.value + (size.width / 2 - tapOffset.x) / 2 / scale.value)
// .coerceIn(validOffsetX)
// val newOffsetY = (offsetY.value + (size.height / 2 - tapOffset.y) / 2 / scale.value)
// .coerceIn(validOffsetY)
//
// scope.launch {
// async { scale.animateTo(newScale, spec) }
// async { offsetX.animateTo(newOffsetX, spec) }
// async { offsetY.animateTo(newOffsetY, spec) }
// }
// }
// }
// )
// }
}

Canvas(
modifier
.clipToBounds()
.fillMaxSize()
.zoomable(zoomableState)
.then(interactiveModifiers)
) {
translate(
left = offsetX.value + (size.width - svg.width) / 2,
top = offsetY.value + (size.height - svg.height) / 2,
) {
scale(
scale = scale.value,
pivot = Offset(svg.width / 2 - offsetX.value, svg.height / 2 - offsetY.value),
) {
// translate(
// left = offsetX.value + (size.width - svg.width) / 2,
// top = offsetY.value + (size.height - svg.height) / 2,
// ) {
// scale(
// scale = scale.value,
// pivot = Offset(svg.width / 2 - offsetX.value, svg.height / 2 - offsetY.value),
// ) {
svg.renderTo(this)
}
}
// }
// }
}
}

Expand Down
Loading