Merge branch 'master' of https://github.com/barteksc/AndroidPdfViewer into pagefit

Author: Flamedek

CHANGELOG.md

@@ -1,3 +1,12 @@
+## 3.1.0-beta.1 (2018-06-29)
+* Merge pull request #557 for snapping pages (scrolling page by page)
+* merge pull request #618 for night mode
+* Merge pull request #566 for `OnLongTapListener`
+* Update PdfiumAndroid to 1.9.0, which uses `c++_shared` instead of `gnustl_static`
+* Update Gradle Plugin
+* Update compile SDK and support library to 26
+* Change minimum SDK to 14
+
 ## 3.0.0-beta.5 (2018-01-06)
 * Fix issue with `Configurator#pages()` from #486
 * Fix `IllegalStateException` from #464

README.md

@@ -10,22 +10,14 @@ Library for displaying PDF documents on Android, with `animations`, `gestures`,
 It is based on [PdfiumAndroid](https://github.com/barteksc/PdfiumAndroid) for decoding PDF files. Works on API 11 (Android 3.0) and higher.
 Licensed under Apache License 2.0.
 
-## What's new in 3.0.0-beta.1?
-* Add support for documents with different page sizes
-* Add support for links
-* Add support for defining page fit policy (fit width, height or both)
-* Update sample.pdf to contain different page sizes
-
-3.0.0-beta.2 fixes rendering with maximum zoom, improves fit policies and updates PdfiumAndroid to 1.8.1
-
-3.0.0-beta.3 fixes bug preventing `OnErrorListener` from being called
-
-3.0.0-beta.4 fixes not loaded pages when using animated `PDFView#jumpTo()` and NPE in `canScrollVertically()` and `canScrollHorizontally()`
-
-3.0.0-beta.5 fixes:
-* Issue with `Configurator#pages()` from #486
-* `IllegalStateException` from #464
-* Not detecting links reported in #447
+## What's new in 3.1.0-beta.1?
+* Merge pull request #557 for snapping pages (scrolling page by page)
+* merge pull request #618 for night mode
+* Merge pull request #566 for `OnLongTapListener`
+* Update PdfiumAndroid to 1.9.0, which uses `c++_shared` instead of `gnustl_static`
+* Update Gradle Plugin
+* Update compile SDK and support library to 26
+* Change minimum SDK to 14
 
 ## Changes in 3.0 API
 * Replaced `Contants.PRELOAD_COUNT` with `PRELOAD_OFFSET`
@@ -38,7 +30,7 @@ Licensed under Apache License 2.0.
 
 Add to _build.gradle_:
 
-`compile 'com.github.barteksc:android-pdf-viewer:3.0.0-beta.5'`
+`compile 'com.github.barteksc:android-pdf-viewer:3.1.0-beta.1'`
 
 or if you want to use more stable version:
 
@@ -94,6 +86,7 @@ pdfView.fromAsset(String)
     .onRender(onRenderListener) // called after document is rendered for the first time
     // called on single tap, return true if handled, false to toggle scroll handle visibility
     .onTap(onTapListener)
+    .onLongPress(onLongPressListener)
     .enableAnnotationRendering(false) // render annotations (such as comments, colors or forms)
     .password(null)
     .scrollHandle(null)
@@ -106,6 +99,7 @@ pdfView.fromAsset(String)
     .fitEachPage(false) // fit each page to the view, else smaller pages are scaled relative to largest page.
     .pageSnap(false) // snap pages to screen boundaries
     .pageFling(false) // make a fling change only a single page like ViewPager
+    .nightMode(false) // toggle night mode
     .load();
 ```
 

android-pdf-viewer/build.gradle

@@ -13,7 +13,7 @@ ext {
     siteUrl = 'https://github.com/barteksc/AndroidPdfViewer'
     gitUrl = 'https://github.com/barteksc/AndroidPdfViewer.git'
 
-    libraryVersion = '3.0.0-beta.5'
+    libraryVersion = '3.1.0-beta.1'
 
     developerId = 'barteksc'
     developerName = 'Bartosz Schiller'
@@ -25,20 +25,20 @@ ext {
 }
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '25.0.3'
+    compileSdkVersion 26
 
     defaultConfig {
-        minSdkVersion 11
-        targetSdkVersion 25
+        minSdkVersion 14
+        targetSdkVersion 26
         versionCode 1
-        versionName "3.0.0-beta.5"
+        versionName "3.1.0-beta.1"
     }
 
 }
 
 dependencies {
-    compile 'com.github.barteksc:pdfium-android:1.8.2'
+    implementation 'com.android.support:support-compat:26.1.0'
+    api 'com.github.barteksc:pdfium-android:1.9.0'
 }
 
 apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle'

android-pdf-viewer/src/main/java/com/github/barteksc/pdfviewer/DragPinchManager.java

@@ -189,7 +189,7 @@ private void onScrollEnd(MotionEvent event) {
 
     @Override
     public void onLongPress(MotionEvent e) {
-
+        pdfView.callbacks.callOnLongPress(e);
     }
 
     @Override

android-pdf-viewer/src/main/java/com/github/barteksc/pdfviewer/PDFView.java

@@ -19,6 +19,8 @@
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Color;
+import android.graphics.ColorMatrix;
+import android.graphics.ColorMatrixColorFilter;
 import android.graphics.Paint;
 import android.graphics.Paint.Style;
 import android.graphics.PaintFlagsDrawFilter;
@@ -40,6 +42,7 @@
 import com.github.barteksc.pdfviewer.listener.OnDrawListener;
 import com.github.barteksc.pdfviewer.listener.OnErrorListener;
 import com.github.barteksc.pdfviewer.listener.OnLoadCompleteListener;
+import com.github.barteksc.pdfviewer.listener.OnLongPressListener;
 import com.github.barteksc.pdfviewer.listener.OnPageChangeListener;
 import com.github.barteksc.pdfviewer.listener.OnPageErrorListener;
 import com.github.barteksc.pdfviewer.listener.OnPageScrollListener;
@@ -179,6 +182,8 @@ enum ScrollDir {
 
     private boolean doubletapEnabled = true;
 
+    private boolean nightMode = false;
+
     private boolean pageSnap = true;
 
     /** Pdfium core for loading and rendering PDFs */
@@ -374,6 +379,23 @@ public void setSwipeEnabled(boolean enableSwipe) {
         this.enableSwipe = enableSwipe;
     }
 
+    public void setNightMode(boolean nightMode) {
+        this.nightMode = nightMode;
+        if (nightMode) {
+            ColorMatrix colorMatrixInverted =
+                    new ColorMatrix(new float[]{
+                            -1, 0, 0, 0, 255,
+                            0, -1, 0, 0, 255,
+                            0, 0, -1, 0, 255,
+                            0, 0, 0, 1, 0});
+
+            ColorMatrixColorFilter filter = new ColorMatrixColorFilter(colorMatrixInverted);
+            paint.setColorFilter(filter);
+        } else {
+            paint.setColorFilter(null);
+        }
+    }
+
     void enableDoubletap(boolean enableDoubletap) {
         this.doubletapEnabled = enableDoubletap;
     }
@@ -550,7 +572,7 @@ protected void onDraw(Canvas canvas) {
 
         Drawable bg = getBackground();
         if (bg == null) {
-            canvas.drawColor(Color.WHITE);
+            canvas.drawColor(nightMode ? Color.BLACK : Color.WHITE);
         } else {
             bg.draw(canvas);
         }
@@ -1294,6 +1316,8 @@ public class Configurator {
 
         private OnTapListener onTapListener;
 
+        private OnLongPressListener onLongPressListener;
+
         private OnPageErrorListener onPageErrorListener;
 
         private LinkHandler linkHandler = new DefaultLinkHandler(PDFView.this);
@@ -1322,6 +1346,8 @@ public class Configurator {
 
         private boolean pageSnap = false;
 
+        private boolean nightMode = false;
+
         private Configurator(DocumentSource documentSource) {
             this.documentSource = documentSource;
         }
@@ -1391,6 +1417,11 @@ public Configurator onTap(OnTapListener onTapListener) {
             return this;
         }
 
+        public Configurator onLongPress(OnLongPressListener onLongPressListener) {
+            this.onLongPressListener = onLongPressListener;
+            return this;
+        }
+
         public Configurator linkHandler(LinkHandler linkHandler) {
             this.linkHandler = linkHandler;
             return this;
@@ -1451,6 +1482,11 @@ public Configurator pageFling(boolean pageFling) {
             return this;
         }
 
+        public Configurator nightMode(boolean nightMode) {
+            this.nightMode = nightMode;
+            return this;
+        }
+
         public void load() {
             if (!hasSize) {
                 waitingDocumentConfigurator = this;
@@ -1465,9 +1501,11 @@ public void load() {
             PDFView.this.callbacks.setOnPageScroll(onPageScrollListener);
             PDFView.this.callbacks.setOnRender(onRenderListener);
             PDFView.this.callbacks.setOnTap(onTapListener);
+            PDFView.this.callbacks.setOnLongPress(onLongPressListener);
             PDFView.this.callbacks.setOnPageError(onPageErrorListener);
             PDFView.this.callbacks.setLinkHandler(linkHandler);
             PDFView.this.setSwipeEnabled(enableSwipe);
+            PDFView.this.setNightMode(nightMode);
             PDFView.this.enableDoubletap(enableDoubletap);
             PDFView.this.setDefaultPage(defaultPage);
             PDFView.this.setSwipeVertical(!swipeHorizontal);

android-pdf-viewer/src/main/java/com/github/barteksc/pdfviewer/listener/Callbacks.java

@@ -64,6 +64,11 @@ public class Callbacks {
      */
     private OnTapListener onTapListener;
 
+    /**
+     * Call back object to call when the user does a long tap gesture
+     */
+    private OnLongPressListener onLongPressListener;
+
     /**
      * Call back object to call when clicking link
      */
@@ -153,6 +158,16 @@ public boolean callOnTap(MotionEvent event) {
         return onTapListener != null && onTapListener.onTap(event);
     }
 
+    public void setOnLongPress(OnLongPressListener onLongPressListener) {
+        this.onLongPressListener = onLongPressListener;
+    }
+
+    public void callOnLongPress(MotionEvent event) {
+        if (onLongPressListener != null) {
+            onLongPressListener.onLongPress(event);
+        }
+    }
+
     public void setLinkHandler(LinkHandler linkHandler) {
         this.linkHandler = linkHandler;
     }

android-pdf-viewer/src/main/java/com/github/barteksc/pdfviewer/listener/OnLongPressListener.java

@@ -0,0 +1,32 @@
+/**
+ * Copyright 2017 Bartosz Schiller
+ * <p>
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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);
+}

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.1.3'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.1'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
     }
 }
 
 allprojects {
     repositories {
+        google()
         jcenter()
     }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sat Nov 11 23:27:31 CET 2017
+#Wed Jun 27 20:37:56 CEST 2018
 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-4.4-all.zip

sample/build.gradle

@@ -1,36 +1,32 @@
 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 26
 
     defaultConfig {
-        minSdkVersion 11
-        targetSdkVersion 25
+        minSdkVersion 14
+        targetSdkVersion 26
         versionCode 3
         versionName "3.0.0"
     }
 
 }
 
 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:26.1.0'
+    implementation 'org.androidannotations:androidannotations-api:4.4.0'
+    annotationProcessor "org.androidannotations:androidannotations:4.4.0"
 }