From f7259c5b40b942569bbc87aa81ce3b6ebdff18d7 Mon Sep 17 00:00:00 2001 From: GG Bond Date: Sun, 17 Mar 2024 14:39:54 +0800 Subject: [PATCH] Individual zoomableState per pager item --- .../main/kotlin/com/hippo/ehviewer/ui/reader/GalleryPager.kt | 4 ++-- gradle/libs.versions.toml | 2 +- settings.gradle.kts | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/reader/GalleryPager.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/reader/GalleryPager.kt index ae7b6a4f1..2ecb6a8b3 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/reader/GalleryPager.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/reader/GalleryPager.kt @@ -43,7 +43,6 @@ fun GalleryPager( val items = pageLoader.pages when (type) { DEFAULT, LEFT_TO_RIGHT, RIGHT_TO_LEFT -> { - val zoomableState = rememberZoomableState(zoomSpec = zoomSpec) HorizontalPager( state = pagerState, modifier = modifier, @@ -51,6 +50,7 @@ fun GalleryPager( key = { it }, ) { index -> val page = items[index] + val zoomableState = rememberZoomableState(zoomSpec = zoomSpec) val status by page.status.collectAsState() val boxModifier = if (status == Page.State.READY) { Modifier.zoomable( @@ -79,13 +79,13 @@ fun GalleryPager( } } VERTICAL -> { - val zoomableState = rememberZoomableState(zoomSpec = zoomSpec) VerticalPager( state = pagerState, modifier = modifier, key = { it }, ) { index -> val page = items[index] + val zoomableState = rememberZoomableState(zoomSpec = zoomSpec) val status by page.status.collectAsState() val boxModifier = if (status == Page.State.READY) { Modifier.zoomable( diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 291af6771..24b4b9cc8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -28,7 +28,7 @@ ksp = "2.0.0-Beta4-1.0.19" ktor = "3.0.0-beta-1" okio = "3.9.0" splitties = "3.0.0" -telephoto = "0.8.0" +telephoto = "0.9.0-SNAPSHOT" xmlutil = "0.86.3" [libraries] diff --git a/settings.gradle.kts b/settings.gradle.kts index e3685e6a5..9e5ee20bb 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -11,6 +11,7 @@ dependencyResolutionManagement { repositories { google() mavenCentral() + maven("https://oss.sonatype.org/content/repositories/snapshots") maven("https://jitpack.io") maven("https://androidx.dev/storage/compose-compiler/repository/") maven("https://androidx.dev/snapshots/builds/11527796/artifacts/repository")