+ * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + *
+ * http://www.apache.org/licenses/LICENSE-2.0 + *
+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.github.barteksc.pdfviewer.listener; + +import android.view.MotionEvent; + +/** + * Implement this interface to receive events from PDFView + * when view has been long pressed + */ +public interface OnLongPressListener { + + /** + * Called when the user has a long tap gesture, before processing scroll handle toggling + * + * @param e MotionEvent that registered as a confirmed long press + */ + void onLongPress(MotionEvent e); +} diff --git a/android-pdf-viewer/src/main/java/com/github/barteksc/pdfviewer/scroll/DefaultScrollHandle.java b/android-pdf-viewer/src/main/java/com/github/barteksc/pdfviewer/scroll/DefaultScrollHandle.java index 81b9956b..8195a540 100644 --- a/android-pdf-viewer/src/main/java/com/github/barteksc/pdfviewer/scroll/DefaultScrollHandle.java +++ b/android-pdf-viewer/src/main/java/com/github/barteksc/pdfviewer/scroll/DefaultScrollHandle.java @@ -110,7 +110,9 @@ public void setScroll(float position) { } else { handler.removeCallbacks(hidePageScrollerRunnable); } - setPosition((pdfView.isSwipeVertical() ? pdfView.getHeight() : pdfView.getWidth()) * position); + if (pdfView != null) { + setPosition((pdfView.isSwipeVertical() ? pdfView.getHeight() : pdfView.getWidth()) * position); + } } private void setPosition(float pos) { diff --git a/android-pdf-viewer/src/main/java/com/github/barteksc/pdfviewer/util/PageSizeCalculator.java b/android-pdf-viewer/src/main/java/com/github/barteksc/pdfviewer/util/PageSizeCalculator.java index 02992a21..4d678c98 100644 --- a/android-pdf-viewer/src/main/java/com/github/barteksc/pdfviewer/util/PageSizeCalculator.java +++ b/android-pdf-viewer/src/main/java/com/github/barteksc/pdfviewer/util/PageSizeCalculator.java @@ -28,13 +28,15 @@ public class PageSizeCalculator { private SizeF optimalMaxHeightPageSize; private float widthRatio; private float heightRatio; + private boolean fitEachPage; public PageSizeCalculator(FitPolicy fitPolicy, Size originalMaxWidthPageSize, Size originalMaxHeightPageSize, - Size viewSize) { + Size viewSize, boolean fitEachPage) { this.fitPolicy = fitPolicy; this.originalMaxWidthPageSize = originalMaxWidthPageSize; this.originalMaxHeightPageSize = originalMaxHeightPageSize; this.viewSize = viewSize; + this.fitEachPage = fitEachPage; calculateMaxPages(); } @@ -42,13 +44,15 @@ public SizeF calculate(Size pageSize) { if (pageSize.getWidth() <= 0 || pageSize.getHeight() <= 0) { return new SizeF(0, 0); } + float maxWidth = fitEachPage ? viewSize.getWidth() : pageSize.getWidth() * widthRatio; + float maxHeight = fitEachPage ? viewSize.getHeight() : pageSize.getHeight() * heightRatio; switch (fitPolicy) { case HEIGHT: - return fitHeight(pageSize, pageSize.getHeight() * heightRatio); + return fitHeight(pageSize, maxHeight); case BOTH: - return fitBoth(pageSize, pageSize.getWidth() * widthRatio, pageSize.getHeight() * heightRatio); + return fitBoth(pageSize, maxWidth, maxHeight); default: - return fitWidth(pageSize, pageSize.getWidth() * widthRatio); + return fitWidth(pageSize, maxWidth); } } diff --git a/build.gradle b/build.gradle index 9cb085f4..0a9a0ba0 100644 --- a/build.gradle +++ b/build.gradle @@ -1,17 +1,19 @@ buildscript { repositories { + google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' - classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3' - classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' + classpath 'com.android.tools.build:gradle:3.4.2' + classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4' + classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' } } allprojects { repositories { + google() jcenter() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6a9c9fe9..1a59b22b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Nov 11 23:27:31 CET 2017 +#Sun Aug 18 01:14:14 CEST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip diff --git a/sample/build.gradle b/sample/build.gradle index bfe6643b..133bcdde 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -1,27 +1,23 @@ buildscript { repositories { + google() jcenter() } - dependencies { - // replace with the current version of the android-apt plugin - classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' - } } repositories { + google() jcenter() } apply plugin: 'com.android.application' -apply plugin: 'android-apt' android { - compileSdkVersion 25 - buildToolsVersion "25.0.3" + compileSdkVersion 28 defaultConfig { - minSdkVersion 11 - targetSdkVersion 25 + minSdkVersion 14 + targetSdkVersion 28 versionCode 3 versionName "3.0.0" } @@ -29,8 +25,8 @@ android { } dependencies { - compile project(':android-pdf-viewer') - compile 'com.android.support:appcompat-v7:25.3.1' - provided 'org.androidannotations:androidannotations:4.0.0' - compile 'org.androidannotations:androidannotations-api:4.0.0' + implementation project(':android-pdf-viewer') + implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'org.androidannotations:androidannotations-api:4.6.0' + annotationProcessor "org.androidannotations:androidannotations:4.6.0" }