diff --git a/android-pdf-viewer/build.gradle b/android-pdf-viewer/build.gradle index 58878110..5ccef011 100644 --- a/android-pdf-viewer/build.gradle +++ b/android-pdf-viewer/build.gradle @@ -24,6 +24,10 @@ ext { allLicenses = ["Apache-2.0"] } +repositories { + jcenter() +} + android { compileSdkVersion 23 buildToolsVersion '23.0.2' @@ -39,7 +43,4 @@ android { dependencies { compile 'com.github.barteksc:pdfium-android:1.4.0' -} - -apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle' -apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle' \ No newline at end of file +} \ No newline at end of file diff --git a/android-pdf-viewer/src/main/java/com/github/barteksc/pdfviewer/DragPinchManager.java b/android-pdf-viewer/src/main/java/com/github/barteksc/pdfviewer/DragPinchManager.java index 91d13e75..bd16a281 100644 --- a/android-pdf-viewer/src/main/java/com/github/barteksc/pdfviewer/DragPinchManager.java +++ b/android-pdf-viewer/src/main/java/com/github/barteksc/pdfviewer/DragPinchManager.java @@ -93,9 +93,7 @@ public boolean onSingleTapConfirmed(MotionEvent e) { @Override public boolean onDoubleTap(MotionEvent e) { - if (pdfView.getZoom() < pdfView.getMidZoom()) { - pdfView.zoomWithAnimation(e.getX(), e.getY(), pdfView.getMidZoom()); - } else if (pdfView.getZoom() < pdfView.getMaxZoom()) { + if (pdfView.getZoom() < pdfView.getMaxZoom()) { pdfView.zoomWithAnimation(e.getX(), e.getY(), pdfView.getMaxZoom()); } else { pdfView.resetZoomWithAnimation(); 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 index 00c84f4b..dd86bc18 100644 --- 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 @@ -28,7 +28,6 @@ import android.os.AsyncTask; import android.util.AttributeSet; import android.util.Log; -import android.view.View; import android.widget.RelativeLayout; import com.github.barteksc.pdfviewer.exception.FileNotFoundException; @@ -465,7 +464,7 @@ public void recycle() { scrollHandle = null; isScrollHandleInit = false; currentXOffset = currentYOffset = 0; - zoom = 1f; + zoom = 2f; recycled = true; state = State.DEFAULT; } @@ -529,7 +528,7 @@ protected void onDraw(Canvas canvas) { // abstraction of the screen position when rendering the parts. // Draws background - canvas.drawColor(Color.WHITE); + canvas.drawColor(Color.BLACK); if (recycled) { return; @@ -1129,6 +1128,8 @@ public Configurator fromFile(File file) { return new Configurator(file.getAbsolutePath(), false); } + + /** * Use Uri as the pdf source, for use with content provider */ diff --git a/android-pdf-viewer/src/main/java/com/github/barteksc/pdfviewer/util/Constants.java b/android-pdf-viewer/src/main/java/com/github/barteksc/pdfviewer/util/Constants.java index 7a148fb6..ea08d697 100644 --- a/android-pdf-viewer/src/main/java/com/github/barteksc/pdfviewer/util/Constants.java +++ b/android-pdf-viewer/src/main/java/com/github/barteksc/pdfviewer/util/Constants.java @@ -47,7 +47,7 @@ interface Pinch { float MAXIMUM_ZOOM = 10; - float MINIMUM_ZOOM = 1; + float MINIMUM_ZOOM = 2; } diff --git a/build.gradle b/build.gradle index ef5c179e..f9c411f6 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.3' + classpath 'com.android.tools.build:gradle:2.2.1' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1' }