From 412f304855ba4099092493f3f85bb9bba99bdc83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ales=CC=8C=20Kavc=CC=8Cic=CC=8C?= Date: Fri, 25 Aug 2023 13:48:07 +0200 Subject: [PATCH 1/7] Set zoom in/out on vertical/horizontal layout in PDF document --- bouquet/src/main/java/com/rizzi/bouquet/Bouquet.kt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/bouquet/src/main/java/com/rizzi/bouquet/Bouquet.kt b/bouquet/src/main/java/com/rizzi/bouquet/Bouquet.kt index 0ecac0a..54fb93d 100644 --- a/bouquet/src/main/java/com/rizzi/bouquet/Bouquet.kt +++ b/bouquet/src/main/java/com/rizzi/bouquet/Bouquet.kt @@ -341,7 +341,10 @@ fun Modifier.tapToZoomVertical( ) } .pointerInput(Unit) { - detectTransformGestures(true) { centroid, pan, zoom, rotation -> + detectTransformGestures(false) { centroid, pan, zoom, rotation -> + // set zoom in / zoom out + state.mScale = kotlin.math.max(state.mScale * zoom, 1f) + val pair = if (pan.y > 0) { if (state.lazyState.canScrollBackward) { Pair(0f, pan.y) @@ -416,7 +419,10 @@ fun Modifier.tapToZoomHorizontal( ) } .pointerInput(Unit) { - detectTransformGestures(true) { centroid, pan, zoom, rotation -> + detectTransformGestures(false) { centroid, pan, zoom, rotation -> + // set zoom in / zoom out + state.mScale = kotlin.math.max(state.mScale * zoom, 1f) + val nOffset = if (state.scale > 1f) { val maxT = (constraints.maxWidth * state.scale) - constraints.maxWidth val maxY = (constraints.maxHeight * state.scale) - constraints.maxHeight From 1b86db58cbb0e97711375c6220979097de8a9367 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ales=CC=8C=20Kavc=CC=8Cic=CC=8C?= Date: Mon, 28 Aug 2023 14:10:49 +0200 Subject: [PATCH 2/7] Remove dependancy resolution management --- settings.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index 1715d3d..94ffb1f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -6,7 +6,6 @@ pluginManagement { } } dependencyResolutionManagement { - repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories { google() mavenCentral() From 4ada38689a010123eb0729a748188c7109720369 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ales=CC=8C=20Kavc=CC=8Cic=CC=8C?= Date: Mon, 28 Aug 2023 14:31:59 +0200 Subject: [PATCH 3/7] Revert "Remove dependancy resolution management" This reverts commit 1b86db58cbb0e97711375c6220979097de8a9367. --- settings.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/settings.gradle b/settings.gradle index 94ffb1f..1715d3d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -6,6 +6,7 @@ pluginManagement { } } dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories { google() mavenCentral() From 7b4beb84fdd1c5c0430e1ee12e4f58b18dce612d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ales=CC=8C=20Kavc=CC=8Cic=CC=8C?= Date: Mon, 28 Aug 2023 17:23:16 +0200 Subject: [PATCH 4/7] upgrade JAVA version --- app/build.gradle | 4 ++-- bouquet/build.gradle.kts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index b15c837..8d0be4e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -27,8 +27,8 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } kotlinOptions { jvmTarget = '1.8' diff --git a/bouquet/build.gradle.kts b/bouquet/build.gradle.kts index 2c4aabb..4d13006 100644 --- a/bouquet/build.gradle.kts +++ b/bouquet/build.gradle.kts @@ -27,8 +27,8 @@ android { } } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { jvmTarget = "1.8" From 2c6b1d30e2f7612c6c2ef1bde12c9a89f8e977f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ales=CC=8C=20Kavc=CC=8Cic=CC=8C?= Date: Mon, 28 Aug 2023 17:27:20 +0200 Subject: [PATCH 5/7] upgrade JAVA version --- app/build.gradle | 2 +- bouquet/build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 8d0be4e..6fe018a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -31,7 +31,7 @@ android { targetCompatibility JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = '1.8' + jvmTarget = '17' } buildFeatures { compose true diff --git a/bouquet/build.gradle.kts b/bouquet/build.gradle.kts index 4d13006..7c96ea4 100644 --- a/bouquet/build.gradle.kts +++ b/bouquet/build.gradle.kts @@ -31,7 +31,7 @@ android { targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "17" } buildFeatures { compose = true From 83a736fc96473a1ee099856b3c2d42c5b58f7c00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ales=CC=8C=20Kavc=CC=8Cic=CC=8C?= Date: Tue, 29 Aug 2023 10:02:33 +0200 Subject: [PATCH 6/7] Revert "upgrade JAVA version" This reverts commit 2c6b1d30e2f7612c6c2ef1bde12c9a89f8e977f5. --- app/build.gradle | 2 +- bouquet/build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 6fe018a..8d0be4e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -31,7 +31,7 @@ android { targetCompatibility JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = '17' + jvmTarget = '1.8' } buildFeatures { compose true diff --git a/bouquet/build.gradle.kts b/bouquet/build.gradle.kts index 7c96ea4..4d13006 100644 --- a/bouquet/build.gradle.kts +++ b/bouquet/build.gradle.kts @@ -31,7 +31,7 @@ android { targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = "17" + jvmTarget = "1.8" } buildFeatures { compose = true From 8e012c4696b7e1338d37299a179a1f534c619a83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ales=CC=8C=20Kavc=CC=8Cic=CC=8C?= Date: Tue, 29 Aug 2023 10:02:36 +0200 Subject: [PATCH 7/7] Revert "upgrade JAVA version" This reverts commit 7b4beb84fdd1c5c0430e1ee12e4f58b18dce612d. --- app/build.gradle | 4 ++-- bouquet/build.gradle.kts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 8d0be4e..b15c837 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -27,8 +27,8 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } kotlinOptions { jvmTarget = '1.8' diff --git a/bouquet/build.gradle.kts b/bouquet/build.gradle.kts index 4d13006..2c4aabb 100644 --- a/bouquet/build.gradle.kts +++ b/bouquet/build.gradle.kts @@ -27,8 +27,8 @@ android { } } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } kotlinOptions { jvmTarget = "1.8"