From 1c4ff0d37edd8cf0ca08a7c645514615e4136f87 Mon Sep 17 00:00:00 2001 From: jota Date: Wed, 11 Jul 2018 18:44:05 +0200 Subject: [PATCH 01/20] added long-press listener to 2.X version added google repo in build.gradle for support tools --- .../barteksc/pdfviewer/DragPinchManager.java | 4 ++- .../github/barteksc/pdfviewer/PDFView.java | 28 ++++++++++++++++ .../listener/OnLongPressListener.java | 32 +++++++++++++++++++ build.gradle | 2 ++ 4 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 android-pdf-viewer/src/main/java/com/github/barteksc/pdfviewer/listener/OnLongPressListener.java 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 f90af11..58ef318 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 @@ -149,7 +149,9 @@ public void onScrollEnd(MotionEvent event) { @Override public void onLongPress(MotionEvent e) { - + if(pdfView.getOnLongPressListener() != null){ + pdfView.getOnLongPressListener().onLongPress(e); + } } @Override 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 6965649..3b25e12 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 @@ -31,12 +31,14 @@ import android.os.HandlerThread; import android.util.AttributeSet; import android.util.Log; +import android.view.MotionEvent; import android.widget.RelativeLayout; import com.github.barteksc.pdfviewer.exception.PageRenderingException; 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; @@ -223,6 +225,11 @@ enum ScrollDir { */ private OnPageScrollListener onPageScrollListener; + /** + * Call back object to call when the user does a long tap gesture + */ + private OnLongPressListener onLongPressListener; + /** * Call back object to call when the above layer is to drawn */ @@ -531,6 +538,15 @@ OnTapListener getOnTapListener() { return this.onTapListener; } + private void setOnLongPressListener(OnLongPressListener onLongPressListener) { + this.onLongPressListener = onLongPressListener; + } + + OnLongPressListener getOnLongPressListener() { + return this.onLongPressListener; + } + + private void setOnDrawListener(OnDrawListener onDrawListener) { this.onDrawListener = onDrawListener; } @@ -1399,6 +1415,10 @@ public Configurator fromStream(InputStream stream) { return new Configurator(new InputStreamSource(stream)); } + void onLongPress(MotionEvent e){ + + } + /** * Use custom source as pdf source */ @@ -1426,6 +1446,8 @@ public class Configurator { private OnErrorListener onErrorListener; + private OnLongPressListener onLongPressListener; + private OnPageChangeListener onPageChangeListener; private OnPageScrollListener onPageScrollListener; @@ -1521,6 +1543,11 @@ public Configurator onTap(OnTapListener onTapListener) { return this; } + public Configurator onLongPress(OnLongPressListener onLongPressListener) { + this.onLongPressListener = onLongPressListener; + return this; + } + public Configurator defaultPage(int defaultPage) { this.defaultPage = defaultPage; return this; @@ -1563,6 +1590,7 @@ public void load() { PDFView.this.setOnPageChangeListener(onPageChangeListener); PDFView.this.setOnPageScrollListener(onPageScrollListener); PDFView.this.setOnRenderListener(onRenderListener); + PDFView.this.setOnLongPressListener(onLongPressListener); PDFView.this.setOnTapListener(onTapListener); PDFView.this.setOnPageErrorListener(onPageErrorListener); PDFView.this.enableSwipe(enableSwipe); diff --git a/android-pdf-viewer/src/main/java/com/github/barteksc/pdfviewer/listener/OnLongPressListener.java b/android-pdf-viewer/src/main/java/com/github/barteksc/pdfviewer/listener/OnLongPressListener.java new file mode 100644 index 0000000..fc94c72 --- /dev/null +++ b/android-pdf-viewer/src/main/java/com/github/barteksc/pdfviewer/listener/OnLongPressListener.java @@ -0,0 +1,32 @@ +/** + * Copyright 2017 Bartosz Schiller + *

+ * 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/build.gradle b/build.gradle index 9cb085f..1fbb341 100644 --- a/build.gradle +++ b/build.gradle @@ -2,6 +2,7 @@ buildscript { repositories { jcenter() + google() } dependencies { classpath 'com.android.tools.build:gradle:2.3.3' @@ -13,5 +14,6 @@ buildscript { allprojects { repositories { jcenter() + google() } } From bb94ed170f01a6ea0468cbad9a69a6e987bf8b2a Mon Sep 17 00:00:00 2001 From: jota Date: Wed, 11 Jul 2018 18:50:20 +0200 Subject: [PATCH 02/20] removed needless method with no code (forgot at cleanup) --- .../src/main/java/com/github/barteksc/pdfviewer/PDFView.java | 3 --- 1 file changed, 3 deletions(-) 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 3b25e12..aba89c8 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 @@ -1415,9 +1415,6 @@ public Configurator fromStream(InputStream stream) { return new Configurator(new InputStreamSource(stream)); } - void onLongPress(MotionEvent e){ - - } /** * Use custom source as pdf source From ca8899a2225033d41f5b4be55cd4a80baee83623 Mon Sep 17 00:00:00 2001 From: jota Date: Wed, 11 Jul 2018 23:58:12 +0200 Subject: [PATCH 03/20] .typo in gradle file --- android-pdf-viewer/build.gradle | 17 +++++++++++++++-- .../github/barteksc/sample/PDFViewActivity.java | 8 ++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/android-pdf-viewer/build.gradle b/android-pdf-viewer/build.gradle index dc570f7..afc7063 100644 --- a/android-pdf-viewer/build.gradle +++ b/android-pdf-viewer/build.gradle @@ -1,4 +1,17 @@ apply plugin: 'com.android.library' +apply plugin: 'maven' + +group = 'com.github.barteksc' +version = '2.8.3' + +uploadArchives { + repositories { + mavenDeployer { + repository(url: mavenLocal().getUrl()) + } + } +} + ext { bintrayRepo = 'maven' @@ -13,7 +26,7 @@ ext { siteUrl = 'https://github.com/barteksc/AndroidPdfViewer' gitUrl = 'https://github.com/barteksc/AndroidPdfViewer.git' - libraryVersion = '2.8.2' + libraryVersion = '2.8.3' developerId = 'barteksc' developerName = 'Bartosz Schiller' @@ -32,7 +45,7 @@ android { minSdkVersion 11 targetSdkVersion 25 versionCode 1 - versionName "2.8.2" + versionName "2.8.3" } } diff --git a/sample/src/main/java/com/github/barteksc/sample/PDFViewActivity.java b/sample/src/main/java/com/github/barteksc/sample/PDFViewActivity.java index 2e1ae6d..2684111 100755 --- a/sample/src/main/java/com/github/barteksc/sample/PDFViewActivity.java +++ b/sample/src/main/java/com/github/barteksc/sample/PDFViewActivity.java @@ -27,10 +27,12 @@ import android.support.v4.content.ContextCompat; import android.support.v7.app.AppCompatActivity; import android.util.Log; +import android.view.MotionEvent; import android.widget.Toast; import com.github.barteksc.pdfviewer.PDFView; 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.scroll.DefaultScrollHandle; @@ -118,6 +120,12 @@ private void displayFromAsset(String assetFileName) { .onPageChange(this) .enableAnnotationRendering(true) .onLoad(this) + .onLongPress(new OnLongPressListener() { + @Override + public void onLongPress(MotionEvent e) { + System.out.println("LONG PRESS FROM ASSET!"); + } + }) .scrollHandle(new DefaultScrollHandle(this)) .spacing(10) // in dp .onPageError(this) From b2c4f5ec6d2deb417f5f8936d552fe8b6570c65b Mon Sep 17 00:00:00 2001 From: jota Date: Fri, 13 Jul 2018 11:49:17 +0200 Subject: [PATCH 04/20] .init commit --- .../main/java/com/github/barteksc/pdfviewer/PDFView.java | 8 ++++++++ 1 file changed, 8 insertions(+) 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 aba89c8..ebc9895 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 @@ -1251,6 +1251,14 @@ public float getOptimalPageHeight() { return optimalPageHeight; } + public float getPageWidth(){ + return pageWidth; + } + + public float getPageHeight(){ + return pageHeight; + } + private void setDefaultPage(int defaultPage) { this.defaultPage = defaultPage; } From bf2391329319898a676018c3140ce4046d0fad18 Mon Sep 17 00:00:00 2001 From: jota Date: Tue, 31 Jul 2018 17:04:56 +0200 Subject: [PATCH 05/20] .added global on load listener .added method to change alpha of bitmaps .raised version number .integrated to jiptkac.io --- android-pdf-viewer/build.gradle | 14 +++++++------- .../com/github/barteksc/pdfviewer/PDFView.java | 14 +++++++++++++- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/android-pdf-viewer/build.gradle b/android-pdf-viewer/build.gradle index afc7063..7a82dba 100644 --- a/android-pdf-viewer/build.gradle +++ b/android-pdf-viewer/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.android.library' apply plugin: 'maven' -group = 'com.github.barteksc' +group = 'com.github.barteksc.devjtafork' version = '2.8.3' uploadArchives { @@ -17,20 +17,20 @@ ext { bintrayRepo = 'maven' bintrayName = 'android-pdf-viewer' - publishedGroupId = 'com.github.barteksc' + publishedGroupId = 'com.github.barteksc.devjtafork' libraryName = 'AndroidPdfViewer' artifact = 'android-pdf-viewer' 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/devjta/AndroidPdfViewerV2' + gitUrl = 'https://github.com/devjta/AndroidPdfViewerV2.git' libraryVersion = '2.8.3' - developerId = 'barteksc' - developerName = 'Bartosz Schiller' - developerEmail = 'barteksch@boo.pl' + developerId = 'devjta' + developerName = 'Joerg Taschek' + developerEmail = 'behaveu@gmail.com' licenseName = 'The Apache Software License, Version 2.0' licenseUrl = 'http://www.apache.org/licenses/LICENSE-2.0.txt' 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 ebc9895..033509b 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 @@ -93,6 +93,7 @@ public class PDFView extends RelativeLayout { private float minZoom = DEFAULT_MIN_SCALE; private float midZoom = DEFAULT_MID_SCALE; private float maxZoom = DEFAULT_MAX_SCALE; + private OnLoadCompleteListener globalOnLoadCompleteListener; /** * START - scrolling in first page direction @@ -889,7 +890,9 @@ void loadComplete(PdfDocument pdfDocument, int pageWidth, int pageHeight) { if (onLoadCompleteListener != null) { onLoadCompleteListener.loadComplete(documentPageCount); } - + if(globalOnLoadCompleteListener != null){ + globalOnLoadCompleteListener.loadComplete(documentPageCount); + } jumpTo(defaultPage, false); } @@ -1388,6 +1391,15 @@ public List getTableOfContents() { return pdfiumCore.getTableOfContents(pdfDocument); } + public void setGlobalOnLoad(OnLoadCompleteListener onLoadCompleteListener){ + this.globalOnLoadCompleteListener = onLoadCompleteListener; + } + + public void setAlpha(int alpha){ + paint.setAlpha(alpha); + invalidate(); + } + /** * Use an asset file as the pdf source */ From c08e5a05e68815a878b3cad2521f298c40c65df6 Mon Sep 17 00:00:00 2001 From: Joerg Taschek Date: Sun, 5 Aug 2018 17:15:37 +0200 Subject: [PATCH 06/20] .use @aar --- android-pdf-viewer/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android-pdf-viewer/build.gradle b/android-pdf-viewer/build.gradle index 7a82dba..4d0ebd2 100644 --- a/android-pdf-viewer/build.gradle +++ b/android-pdf-viewer/build.gradle @@ -51,7 +51,7 @@ android { } dependencies { - compile 'com.github.barteksc:pdfium-android:1.7.1' + compile 'com.github.barteksc:pdfium-android:1.7.1@aar' } apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle' From 01c5841857eebfcd085a2e1079631769ece999b0 Mon Sep 17 00:00:00 2001 From: Joerg Taschek Date: Sun, 5 Aug 2018 17:26:46 +0200 Subject: [PATCH 07/20] .added support for pdfium --- android-pdf-viewer/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/android-pdf-viewer/build.gradle b/android-pdf-viewer/build.gradle index 4d0ebd2..f1358ae 100644 --- a/android-pdf-viewer/build.gradle +++ b/android-pdf-viewer/build.gradle @@ -51,6 +51,7 @@ android { } dependencies { + compile 'com.android.support:support-v4:25.+' compile 'com.github.barteksc:pdfium-android:1.7.1@aar' } From 09fb6c6afce17c91670c8228c97b10410a0575e2 Mon Sep 17 00:00:00 2001 From: Joerg Taschek Date: Sun, 5 Aug 2018 17:43:57 +0200 Subject: [PATCH 08/20] .removed sample from build .revmoed mips file as jitpack.io/ndk17 bug --- android-pdf-viewer/build.gradle | 4 +++- settings.gradle | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/android-pdf-viewer/build.gradle b/android-pdf-viewer/build.gradle index f1358ae..c84b675 100644 --- a/android-pdf-viewer/build.gradle +++ b/android-pdf-viewer/build.gradle @@ -47,7 +47,9 @@ android { versionCode 1 versionName "2.8.3" } - + packagingOptions{ + doNotStrip '*/mips/*.so' + } } dependencies { diff --git a/settings.gradle b/settings.gradle index 90ef0b9..9f83d3b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,2 @@ include ':android-pdf-viewer' -include ':sample' \ No newline at end of file +//include ':sample' \ No newline at end of file From 073ee00f140382f60a6d8263ee32fdb8e2262c00 Mon Sep 17 00:00:00 2001 From: Joerg Taschek Date: Sun, 5 Aug 2018 17:50:13 +0200 Subject: [PATCH 09/20] .revmoed mips file as jitpack.io/ndk17 bug --- android-pdf-viewer/build.gradle | 1 + sample/build.gradle | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/android-pdf-viewer/build.gradle b/android-pdf-viewer/build.gradle index c84b675..69cf69d 100644 --- a/android-pdf-viewer/build.gradle +++ b/android-pdf-viewer/build.gradle @@ -49,6 +49,7 @@ android { } packagingOptions{ doNotStrip '*/mips/*.so' + doNotStrip '*/mips64/*.so' } } diff --git a/sample/build.gradle b/sample/build.gradle index d963053..64dca14 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -25,7 +25,10 @@ android { versionCode 3 versionName "2.0.0" } - + packagingOptions{ + doNotStrip '*/mips/*.so' + doNotStrip '*/mips64/*.so' + } } dependencies { From 6a85b2f2ebde6333581c6306037bd7d9783f1920 Mon Sep 17 00:00:00 2001 From: Joerg Taschek Date: Sun, 5 Aug 2018 17:54:26 +0200 Subject: [PATCH 10/20] .test with pdfium 1.8.2 --- android-pdf-viewer/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android-pdf-viewer/build.gradle b/android-pdf-viewer/build.gradle index 69cf69d..2b5ca78 100644 --- a/android-pdf-viewer/build.gradle +++ b/android-pdf-viewer/build.gradle @@ -55,7 +55,7 @@ android { dependencies { compile 'com.android.support:support-v4:25.+' - compile 'com.github.barteksc:pdfium-android:1.7.1@aar' + compile 'com.github.barteksc:pdfium-android:1.8.2@aar' } apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle' From 9463d920163ba32e929c16f324ec300afdadd145 Mon Sep 17 00:00:00 2001 From: Joerg Taschek Date: Sun, 5 Aug 2018 19:04:53 +0200 Subject: [PATCH 11/20] .test with pdfium 1.9.0 --- android-pdf-viewer/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android-pdf-viewer/build.gradle b/android-pdf-viewer/build.gradle index 2b5ca78..b2bb395 100644 --- a/android-pdf-viewer/build.gradle +++ b/android-pdf-viewer/build.gradle @@ -55,7 +55,7 @@ android { dependencies { compile 'com.android.support:support-v4:25.+' - compile 'com.github.barteksc:pdfium-android:1.8.2@aar' + compile 'com.github.barteksc:pdfium-android:1.9.0' } apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle' From 874cc1c077f29693f02c8d14e9d7d1541aa57cbe Mon Sep 17 00:00:00 2001 From: Joerg Taschek Date: Sun, 5 Aug 2018 19:32:21 +0200 Subject: [PATCH 12/20] .test --- android-pdf-viewer/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android-pdf-viewer/build.gradle b/android-pdf-viewer/build.gradle index b2bb395..d143e39 100644 --- a/android-pdf-viewer/build.gradle +++ b/android-pdf-viewer/build.gradle @@ -58,5 +58,5 @@ dependencies { compile 'com.github.barteksc:pdfium-android:1.9.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 +//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 From ce1a5b8164fecb195980723cba28e238d3fb5cc5 Mon Sep 17 00:00:00 2001 From: Joerg Taschek Date: Sun, 5 Aug 2018 19:36:53 +0200 Subject: [PATCH 13/20] .test --- android-pdf-viewer/build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/android-pdf-viewer/build.gradle b/android-pdf-viewer/build.gradle index d143e39..b88dbb6 100644 --- a/android-pdf-viewer/build.gradle +++ b/android-pdf-viewer/build.gradle @@ -38,11 +38,11 @@ ext { } android { - compileSdkVersion 25 - buildToolsVersion '25.0.3' + compileSdkVersion 26 + buildToolsVersion '26.0.1' defaultConfig { - minSdkVersion 11 + minSdkVersion 14 targetSdkVersion 25 versionCode 1 versionName "2.8.3" @@ -54,7 +54,7 @@ android { } dependencies { - compile 'com.android.support:support-v4:25.+' + compile 'com.android.support:support-v4:26.+' compile 'com.github.barteksc:pdfium-android:1.9.0' } From c99ce75213005118f7b5fd491836c5dfbb9f1de5 Mon Sep 17 00:00:00 2001 From: Joerg Taschek Date: Sun, 5 Aug 2018 19:40:48 +0200 Subject: [PATCH 14/20] .test --- build.gradle | 10 ++++++++-- sample/build.gradle | 6 +++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 1fbb341..3841bdb 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,11 @@ buildscript { repositories { - jcenter() google() + maven { + url 'https://maven.google.com' + } + jcenter() } dependencies { classpath 'com.android.tools.build:gradle:2.3.3' @@ -13,7 +16,10 @@ buildscript { allprojects { repositories { - jcenter() google() + maven { + url 'https://maven.google.com' + } + jcenter() } } diff --git a/sample/build.gradle b/sample/build.gradle index 64dca14..aa1d5dd 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -16,8 +16,8 @@ apply plugin: 'com.android.application' apply plugin: 'android-apt' android { - compileSdkVersion 25 - buildToolsVersion "25.0.3" + compileSdkVersion 26 + buildToolsVersion "26.0.1" defaultConfig { minSdkVersion 11 @@ -33,7 +33,7 @@ android { dependencies { compile project(':android-pdf-viewer') - compile 'com.android.support:appcompat-v7:25.3.1' + compile 'com.android.support:appcompat-v7:26.0.1' provided 'org.androidannotations:androidannotations:4.0.0' compile 'org.androidannotations:androidannotations-api:4.0.0' } From ec9dbeb61d9cb97a79d4fa7fe26d3bdd3191a89e Mon Sep 17 00:00:00 2001 From: Joerg Taschek Date: Sun, 5 Aug 2018 20:21:10 +0200 Subject: [PATCH 15/20] .test --- sample/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sample/build.gradle b/sample/build.gradle index aa1d5dd..9f2ad07 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -17,7 +17,7 @@ apply plugin: 'android-apt' android { compileSdkVersion 26 - buildToolsVersion "26.0.1" + buildToolsVersion "26.1.0" defaultConfig { minSdkVersion 11 @@ -33,7 +33,7 @@ android { dependencies { compile project(':android-pdf-viewer') - compile 'com.android.support:appcompat-v7:26.0.1' + compile 'com.android.support:appcompat-v7:26.1.0' provided 'org.androidannotations:androidannotations:4.0.0' compile 'org.androidannotations:androidannotations-api:4.0.0' } From 9ba15b84448660e6d4fac3b43546fe448f9468c9 Mon Sep 17 00:00:00 2001 From: Joerg Taschek Date: Sun, 5 Aug 2018 20:25:46 +0200 Subject: [PATCH 16/20] .test --- android-pdf-viewer/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/android-pdf-viewer/build.gradle b/android-pdf-viewer/build.gradle index b88dbb6..82da4a6 100644 --- a/android-pdf-viewer/build.gradle +++ b/android-pdf-viewer/build.gradle @@ -54,6 +54,7 @@ android { } dependencies { + compile 'com.android.support:support-compat:26.1.0' compile 'com.android.support:support-v4:26.+' compile 'com.github.barteksc:pdfium-android:1.9.0' } From 9908b8284c48bab740140636ec7c6244d9d977cc Mon Sep 17 00:00:00 2001 From: Joerg Taschek Date: Sun, 5 Aug 2018 20:26:07 +0200 Subject: [PATCH 17/20] .test --- android-pdf-viewer/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android-pdf-viewer/build.gradle b/android-pdf-viewer/build.gradle index 82da4a6..7bb73a8 100644 --- a/android-pdf-viewer/build.gradle +++ b/android-pdf-viewer/build.gradle @@ -55,7 +55,7 @@ android { dependencies { compile 'com.android.support:support-compat:26.1.0' - compile 'com.android.support:support-v4:26.+' + compile 'com.android.support:support-v4:26.1.0' compile 'com.github.barteksc:pdfium-android:1.9.0' } From fb8e22e2819e4df8084c8bd14f9ef91749308bd7 Mon Sep 17 00:00:00 2001 From: Joerg Taschek Date: Sun, 5 Aug 2018 20:52:51 +0200 Subject: [PATCH 18/20] .ndk filter --- android-pdf-viewer/build.gradle | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/android-pdf-viewer/build.gradle b/android-pdf-viewer/build.gradle index 7bb73a8..9984fc7 100644 --- a/android-pdf-viewer/build.gradle +++ b/android-pdf-viewer/build.gradle @@ -42,6 +42,9 @@ android { buildToolsVersion '26.0.1' defaultConfig { + ndk { + abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86' // <- only the supported ones + } minSdkVersion 14 targetSdkVersion 25 versionCode 1 @@ -53,6 +56,8 @@ android { } } + + dependencies { compile 'com.android.support:support-compat:26.1.0' compile 'com.android.support:support-v4:26.1.0' From 8ad5209cb7e549db377b907cbf8fcac1a2240e9b Mon Sep 17 00:00:00 2001 From: jota Date: Mon, 29 Oct 2018 17:07:35 +0100 Subject: [PATCH 19/20] .maybe fix for mips with newer sdk (fix = removing) --- android-pdf-viewer/build.gradle | 14 +++++++------- .../pdfviewer/scroll/DefaultScrollHandle.java | 5 +++++ gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/android-pdf-viewer/build.gradle b/android-pdf-viewer/build.gradle index 9984fc7..be5de33 100644 --- a/android-pdf-viewer/build.gradle +++ b/android-pdf-viewer/build.gradle @@ -38,15 +38,15 @@ ext { } android { - compileSdkVersion 26 - buildToolsVersion '26.0.1' + compileSdkVersion 28 + buildToolsVersion '28.0.3' defaultConfig { - ndk { +/* ndk { abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86' // <- only the supported ones - } + }*/ minSdkVersion 14 - targetSdkVersion 25 + targetSdkVersion 26 versionCode 1 versionName "2.8.3" } @@ -59,8 +59,8 @@ android { dependencies { - compile 'com.android.support:support-compat:26.1.0' - compile 'com.android.support:support-v4:26.1.0' + compile 'com.android.support:support-compat:28.0.0' + compile 'com.android.support:support-v4:28.0.0' compile 'com.github.barteksc:pdfium-android:1.9.0' } 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 c74cf5e..4b77ecd 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 @@ -198,6 +198,11 @@ private boolean isPDFViewReady() { return pdfView != null && pdfView.getPageCount() > 0 && !pdfView.documentFitsView(); } + @Override + public boolean performClick() { + return super.performClick(); + } + @Override public boolean onTouchEvent(MotionEvent event) { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 336d099..bec76ab 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip From a6581d54c36a59b7c7998bf7e3407abbfb0aa49e Mon Sep 17 00:00:00 2001 From: jota Date: Mon, 29 Oct 2018 17:15:05 +0100 Subject: [PATCH 20/20] .gradle plugin udpated --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 3841bdb..b5089a6 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.2.1' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' }