Change NSDocumentDirectory to NSCachesDirectory

.github/workflows/publish_pub.yml

@@ -0,0 +1,26 @@
+name: Publish to pub.dev
+on:
+  push:
+    branches:   
+      - master
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container:
+      image:  google/dart:latest
+    steps:
+    - uses: actions/checkout@v1
+    - name: Setup credentials
+      run: | 
+        mkdir -p ~/.pub-cache 
+        cat <<EOF > ~/.pub-cache/credentials.json
+        {
+          "accessToken":"${{ secrets.OAUTH_ACCESS_TOKEN }}",
+          "refreshToken":"${{ secrets.OAUTH_REFRESH_TOKEN }}",
+          "tokenEndpoint":"https://accounts.google.com/o/oauth2/token",
+          "scopes": [ "openid", "https://www.googleapis.com/auth/userinfo.email" ],
+          "expiration": 1584628470088
+        }
+        EOF
+    - name: Publish package
+      run: pub publish -f

.gitignore

@@ -5,3 +5,6 @@
 .pub/
 
 build/
+example/ios/Flutter/flutter_export_environment.sh
+example/.flutter-plugins-dependencies
+android/.idea/

CHANGELOG.md

@@ -1,43 +1,38 @@
-## 1.0.7
+# Changelog
 
-- Updated project to meet changed requirements by Flutter
-- Updated third-party dependencies
-- Fixes issue #21, #23
+## 1.2.0
+* updated to work with Flutter 1.20+
 
-## 1.0.6
+## 1.1.6
+* Exposing `ZoomableWidget` from [flutter_advanced_networkimage](https://pub.dartlang.org/packages/flutter_advanced_networkimage) parameters (minScale, zoomSteps, maxScale,panLimit)
 
-- Fixed issue in 1.0.5 on iOS that caused xcode build to fail
+## 1.1.5
+* Page controller initial page setting fixed (making able to set initially loaded page)
 
-## 1.0.5
+## 1.1.4
+* Proper android cache cleanup
+* iOS build fix
 
-- Fixed bug in iOS where due to caching of Flutter ImageProvider when switching documents old pages would persist
-- Added more cases in example demo
+## 1.1.3
+- Option to pass in controller `PDFViewer(document: document,controller: PageController())` that you can use to control the pageview rendering the PDF pages.
 
-## 1.0.4
+## 1.1.2
+- Option to preload all pages in memory `PDFViewer(document: document,lazyLoad: false)`
 
-- Refactored PDFdocument.getAllPages() method (Thanks for @SergioBernal8 for PR )
-- Added white background to page (iOS)
-- Changed page resolution in iOS to 300 dpi
-- Moved tooltips to a proper class
+## 1.1.1
+- Option to disable swipe navigation `PDFViewer(document: document,scrollDirection: Aixs.vertical)`
+- Option to change scroll axis to vertical or horizontal `PDFViewer(document: document,scrollDirection: Aixs.vertical)`
 
-## 1.0.3
-
-- Added white background to page (Android)
-- Fixed cocoapods name
-- User can now define tooltips and page selection dialog strings
-- Tapping on page indicator now prompts to user to page selection dialog
-- Added zoom to PDFPage
-
-## 1.0.2
-
-- Bottom appbar no longer appears if PDF has only one page (Thanks for @markathomas for suggesting this )
-- Fixed opening PDF from assets not working.
-- Example now opens file from assets
+## 1.1.0
+- Removed rxdart dependency
+- Upgraded to androidX
+- Added support to optional header while loading document from url
+- Auto hide picker for 1 page documents
 
 ## 1.0.1
-
-- Updated readme.md and added screenshots to package
+- Swipe control
+- Zoom scale up to 5.0
 
 ## 1.0.0
-
-- Initial release
+- First upgraded version after fork
+- Cool new customization features

README.md

@@ -1,12 +1,15 @@
-# flutter_plugin_pdf_viewer
+# advance_pdf_viewer
+
+A flutter plugin for handling PDF files. Works on both Android & iOS. Originally forked from (https://github.com/CrossPT/flutter_plugin_pdf_viewer).
+
+[![Pub Package](https://img.shields.io/pub/v/advance_pdf_viewer.svg?style=flat-square)](https://pub.dartlang.org/packages/advance_pdf_viewer)
 
-A flutter plugin for handling PDF files. Works on both Android & iOS
 
 ## Installation
 
-Add  *flutter_plugin_pdf_viewer*  as a dependency in [your pubspec.yaml file](https://flutter.io/platform-plugins/).
+Add  *advance_pdf_viewer*  as a dependency in [your pubspec.yaml file](https://flutter.io/platform-plugins/).
 ```
-flutter_plugin_pdf_viewer: any
+advance_pdf_viewer: any
 ```
 
 ---
@@ -57,7 +60,7 @@ Use the pre-built PDF Viewer
 
 This code produces the following view:
 
-<img height="500px" src="https://raw.githubusercontent.com/CrossPT/flutter_pdf_viewer/master/demo.png" alt="Demo Screenshot 1"/>
+<img height="500px" src="https://raw.githubusercontent.com/lohanidamodar/pdf_viewer/master/demo.png" alt="Demo Screenshot 1"/>
 
 ---
 
@@ -66,7 +69,7 @@ This code produces the following view:
 * Allow password-protected files
 * ~~Refactor PDFDocument.getAll() method~~
 * ~~Increase page resolution~~
-* Add swipe to change page
+* ~~Add swipe to change page~~
 
 ---
 

android/.settings/org.eclipse.buildship.core.prefs

@@ -1,2 +1,13 @@
+arguments=--scan
+auto.sync=false
+build.scans.enabled=false
+connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(6.0-20191016123526+0000))
 connection.project.dir=
 eclipse.preferences.version=1
+gradle.user.home=
+java.home=/Library/Java/JavaVirtualMachines/jdk-11.0.4.jdk/Contents/Home
+jvm.arguments=
+offline.mode=false
+override.workspace.settings=true
+show.console.view=true
+show.executions.view=true

android/build.gradle

@@ -26,7 +26,7 @@ android {
 
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'

android/gradle.properties

@@ -1 +1,3 @@
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536M

android/src/main/java/pt/tribeiro/flutter_plugin_pdf_viewer/FlutterPluginPdfViewerPlugin.java

@@ -10,6 +10,7 @@
 
 import java.io.File;
 import java.io.FileOutputStream;
+import java.io.FilenameFilter;
 
 import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
@@ -30,6 +31,7 @@ public class FlutterPluginPdfViewerPlugin implements MethodCallHandler {
     private HandlerThread handlerThread;
     private Handler backgroundHandler;
     private final Object pluginLocker = new Object();
+    private final String filePrefix = "FlutterPluginPdfViewer";
 
     /**
      * Plugin registration.
@@ -42,49 +44,50 @@ public static void registerWith(Registrar registrar) {
 
     @Override
     public void onMethodCall(final MethodCall call, final Result result) {
-        synchronized(pluginLocker){
+        synchronized (pluginLocker) {
             if (backgroundHandler == null) {
                 handlerThread = new HandlerThread("flutterPdfViewer", Process.THREAD_PRIORITY_BACKGROUND);
                 handlerThread.start();
                 backgroundHandler = new Handler(handlerThread.getLooper());
             }
         }
         final Handler mainThreadHandler = new Handler();
-        backgroundHandler.post(
+        backgroundHandler.post(//
                 new Runnable() {
                     @Override
                     public void run() {
                         switch (call.method) {
-                            case "getNumberOfPages":
-                                final String numResult = getNumberOfPages((String) call.argument("filePath"));
-                                mainThreadHandler.post(new Runnable(){
-                                    @Override
-                                    public void run() {
-                                        result.success(numResult);
-                                    }
-                                });
-                                break;
-                            case "getPage":
-                                final String pageResult = getPage((String) call.argument("filePath"), (int) call.argument("pageNumber"));
-                                mainThreadHandler.post(new Runnable(){
-                                    @Override
-                                    public void run() {
-                                        result.success(pageResult);
-                                    }
-                                });
-                                break;
-                            default:
-                                result.notImplemented();
-                                break;
+                        case "getNumberOfPages":
+                            final String numResult = getNumberOfPages((String) call.argument("filePath"));
+                            mainThreadHandler.post(new Runnable() {
+                                @Override
+                                public void run() {
+                                    result.success(numResult);
+                                }
+                            });
+                            break;
+                        case "getPage":
+                            final String pageResult = getPage((String) call.argument("filePath"),
+                                    (int) call.argument("pageNumber"));
+                            mainThreadHandler.post(new Runnable() {
+                                @Override
+                                public void run() {
+                                    result.success(pageResult);
+                                }
+                            });
+                            break;
+                        default:
+                            result.notImplemented();
+                            break;
                         }
                     }
-                }
-        );
+                });
     }
 
     private String getNumberOfPages(String filePath) {
         File pdf = new File(filePath);
         try {
+            clearCacheDir();
             PdfRenderer renderer = new PdfRenderer(ParcelFileDescriptor.open(pdf, ParcelFileDescriptor.MODE_READ_ONLY));
             Bitmap bitmap;
             final int pageCount = renderer.getPageCount();
@@ -95,12 +98,39 @@ private String getNumberOfPages(String filePath) {
         return null;
     }
 
-    private String createTempPreview(Bitmap bmp, String name, int page) {
+    private boolean clearCacheDir() {
+        try {
+            File directory = instance.context().getCacheDir();
+            FilenameFilter myFilter = new FilenameFilter() {
+                @Override
+                public boolean accept(File dir, String name) {
+                    return name.toLowerCase().startsWith(filePrefix.toLowerCase());
+                }
+            };
+            File[] files = directory.listFiles(myFilter);
+            // Log.d("Cache Files", "Size: " + files.length);
+            for (int i = 0; i < files.length; i++) {
+                // Log.d("Files", "FileName: " + files[i].getName());
+                files[i].delete();
+            }
+            return true;
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return false;
+        }
+    }
+
+    private String getFileNameFromPath(String name) {
         String filePath = name.substring(name.lastIndexOf('/') + 1);
-        filePath = name.substring(name.lastIndexOf('.'));
+        filePath = filePath.substring(0, filePath.lastIndexOf('.'));
+        return String.format("%s-%s", filePrefix, filePath);
+    }
+
+    private String createTempPreview(Bitmap bmp, String name, int page) {
+        String fileNameOnly = getFileNameFromPath(name);
         File file;
         try {
-            String fileName = String.format("%s-%d.png", filePath, page);
+            String fileName = String.format("%s-%d.png", fileNameOnly, page);
             file = File.createTempFile(fileName, null, instance.context().getCacheDir());
             FileOutputStream out = new FileOutputStream(file);
             bmp.compress(Bitmap.CompressFormat.PNG, 100, out);
@@ -113,7 +143,6 @@ private String createTempPreview(Bitmap bmp, String name, int page) {
         return file.getAbsolutePath();
     }
 
-
     private String getPage(String filePath, int pageNumber) {
         File pdf = new File(filePath);
         try {

example/android/.settings/org.eclipse.buildship.core.prefs

@@ -1,11 +1,11 @@
-arguments=
+arguments=--scan
 auto.sync=false
 build.scans.enabled=false
-connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(5.4))
+connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(6.0-20191016123526+0000))
 connection.project.dir=
 eclipse.preferences.version=1
 gradle.user.home=
-java.home=
+java.home=/Library/Java/JavaVirtualMachines/jdk-11.0.4.jdk/Contents/Home
 jvm.arguments=
 offline.mode=false
 override.workspace.settings=true

example/android/app/build.gradle

@@ -38,7 +38,7 @@ android {
         targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -56,6 +56,6 @@ flutter {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
 }

example/android/app/src/main/AndroidManifest.xml

@@ -10,7 +10,7 @@
          FlutterApplication and put your custom class here. -->
     <application
         android:name="io.flutter.app.FlutterApplication"
-        android:label="flutter_plugin_pdf_viewer_example"
+        android:label="pdf_viewer_example"
         android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"

example/android/gradle.properties

@@ -1 +1,4 @@
 org.gradle.jvmargs=-Xmx1536M
+android.enableR8=true
+android.useAndroidX=true
+android.enableJetifier=true