update jumpto center

FIT-16CLC-InteractionBook · Jul 15, 2020 · b8eab86 · b8eab86
1 parent d243b39
commit b8eab86
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 16 deletions.
diff --git a/android-pdf-viewer/build.gradle b/android-pdf-viewer/build.gradle
@@ -10,10 +10,10 @@ ext {
 
     libraryDescription = 'Android view for displaying PDFs rendered with PdfiumAndroid'
 
-    siteUrl = 'https://github.com/barteksc/AndroidPdfViewer'
-    gitUrl = 'https://github.com/barteksc/AndroidPdfViewer.git'
+    siteUrl = 'https://github.com/FIT-16CLC-InteractionBook/AndroidPdfViewer'
+    gitUrl = 'https://github.com/FIT-16CLC-InteractionBook/AndroidPdfViewer.git'
 
-    libraryVersion = '3.2.0-beta.1'
+    libraryVersion = '3.3.0-beta.1'
 
     developerId = 'barteksc'
     developerName = 'Bartosz Schiller'
@@ -31,7 +31,7 @@ android {
         minSdkVersion 14
         targetSdkVersion 28
         versionCode 1
-        versionName "3.2.0-beta.1"
+        versionName "3.3.0-beta.1"
     }
 
 }

diff --git a/android-pdf-viewer/src/main/java/com/github/barteksc/pdfviewer/PDFView.java b/android-pdf-viewer/src/main/java/com/github/barteksc/pdfviewer/PDFView.java
@@ -290,21 +290,18 @@ public void jumpTo(int page, boolean withAnimation) {
             return;
         }
 
+        // assumes swiping horizontal and snapping centre
+
         page = pdfFile.determineValidPageNumberFrom(page);
-        float offset = page == 0 ? 0 : -pdfFile.getPageOffset(page, zoom);
-        if (swipeVertical) {
-            if (withAnimation) {
-                animationManager.startYAnimation(currentYOffset, offset);
-            } else {
-                moveTo(currentXOffset, offset);
-            }
+        float offset = page == 0 ? 0 : -pdfFile.getPageOffset(page, getZoom());
+        offset += pdfFile.getPageSpacing(page, getZoom()) / 2f;
+
+        if (withAnimation) {
+            animationManager.startXAnimation(getCurrentXOffset(), offset);
         } else {
-            if (withAnimation) {
-                animationManager.startXAnimation(currentXOffset, offset);
-            } else {
-                moveTo(offset, currentYOffset);
-            }
+            moveTo(offset, getCurrentYOffset());
         }
+
         showPage(page);
     }
 

diff --git a/build.gradle b/build.gradle
@@ -3,6 +3,7 @@ buildscript {
     repositories {
         google()
         jcenter()
+        maven { url 'https://jitpack.io' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.4.2'