Merge pull request #122 from factisresearch/raw-pdf

Add support for reading PDF from byte data (merged)

Author: endigo

README.md

@@ -63,6 +63,7 @@ import 'package:flutter_pdfview/flutter_pdfview.dart';
 | onLinkHandle          |   ✅    | ✅  |      `null`       |
 | gestureRecognizers    |   ✅    | ✅  |      `null`       |
 | filePath              |   ✅    | ✅  |                   |
+| pdfData               |   ✅    | ✅  |                   |
 | fitPolicy             |   ✅    | ❌  | `FitPolicy.WIDTH` |
 | enableSwipe           |   ✅    | ✅  |      `true`       |
 | swipeHorizontal       |   ✅    | ✅  |      `false`      |

android/src/main/java/io/endigo/plugins/pdfviewflutter/FlutterPDFView.java

@@ -16,6 +16,7 @@
 import java.util.Map;
 
 import com.github.barteksc.pdfviewer.PDFView;
+import com.github.barteksc.pdfviewer.PDFView.Configurator;
 import com.github.barteksc.pdfviewer.listener.*;
 import com.github.barteksc.pdfviewer.util.Constants;
 import com.github.barteksc.pdfviewer.util.FitPolicy;
@@ -37,12 +38,18 @@ public class FlutterPDFView implements PlatformView, MethodCallHandler {
 
         linkHandler = new PDFLinkHandler(context, pdfView, methodChannel, preventLinkNavigation);
 
-        if (params.containsKey("filePath")) {
-            String filePath = (String) params.get("filePath");
-
-            Constants.PRELOAD_OFFSET = 3;
+        Configurator config = null;
+        if (params.get("filePath") != null) {
+          String filePath = (String) params.get("filePath");
+          config = pdfView.fromUri(getURI(filePath));
+        }
+        else if (params.get("pdfData") != null) {
+          byte[] data = (byte[]) params.get("pdfData");
+          config = pdfView.fromBytes(data);
+        }
 
-            pdfView.fromUri(getURI(filePath))
+        if (config != null) {
+            config
                     .enableSwipe(getBoolean(params, "enableSwipe"))
                     .swipeHorizontal(getBoolean(params, "swipeHorizontal"))
                     .password(getString(params, "password"))

ios/Classes/FlutterPDFView.m

@@ -67,51 +67,54 @@ - (instancetype)initWithFrame:(CGRect)frame
         NSInteger defaultPage = [args[@"defaultPage"] integerValue];
 
         NSString* filePath = args[@"filePath"];
+        FlutterStandardTypedData* pdfData = args[@"pdfData"];
 
+        PDFDocument* document;
         if ([filePath isKindOfClass:[NSString class]]) {
-            NSURL * sourcePDFUrl = [NSURL fileURLWithPath:filePath];
-            PDFDocument * document = [[PDFDocument alloc] initWithURL: sourcePDFUrl];
+            NSURL* sourcePDFUrl = [NSURL fileURLWithPath:filePath];
+            document = [[PDFDocument alloc] initWithURL: sourcePDFUrl];
+        } else if ([pdfData isKindOfClass:[FlutterStandardTypedData class]]) {
+            NSData* sourcePDFdata = [pdfData data];
+            document = [[PDFDocument alloc] initWithData: sourcePDFdata];
+        }
 
-            if (document == nil) {
-                [_channel invokeMethod:@"onError" arguments:@{@"error" : @"cannot create document: File not in PDF format or corrupted."}];
+        if (document == nil) {
+            [_channel invokeMethod:@"onError" arguments:@{@"error" : @"cannot create document: File not in PDF format or corrupted."}];
+        } else {
+            _pdfView.autoresizesSubviews = YES;
+            _pdfView.autoresizingMask = UIViewAutoresizingFlexibleWidth;
+            _pdfView.backgroundColor = [UIColor colorWithWhite:0.95 alpha:1.0];
+            BOOL swipeHorizontal = [args[@"swipeHorizontal"] boolValue];
+            if (swipeHorizontal) {
+                _pdfView.displayDirection = kPDFDisplayDirectionHorizontal;
             } else {
-                _pdfView.autoresizesSubviews = YES;
-                _pdfView.autoresizingMask = UIViewAutoresizingFlexibleWidth;
-                
-                _pdfView.backgroundColor = [UIColor colorWithWhite:0.95 alpha:1.0];
-                BOOL swipeHorizontal = [args[@"swipeHorizontal"] boolValue];
-                if (swipeHorizontal) {
-                    _pdfView.displayDirection = kPDFDisplayDirectionHorizontal;
-                } else {
-                    _pdfView.displayDirection = kPDFDisplayDirectionVertical;
-                }
+                _pdfView.displayDirection = kPDFDisplayDirectionVertical;
+            }
 
-                [_pdfView usePageViewController:pageFling withViewOptions:nil];
-                _pdfView.displayMode = enableSwipe ? kPDFDisplaySinglePageContinuous : kPDFDisplaySinglePage;
-                _pdfView.document = document;
-                _pdfView.autoScales = autoSpacing;
-                
-                NSString* password = args[@"password"];
-                if ([password isKindOfClass:[NSString class]] && [_pdfView.document isEncrypted]) {
-                    [_pdfView.document unlockWithPassword:password];
-                }
+            [_pdfView usePageViewController:pageFling withViewOptions:nil];
+            _pdfView.displayMode = enableSwipe ? kPDFDisplaySinglePageContinuous : kPDFDisplaySinglePage;
+            _pdfView.document = document;
+            _pdfView.autoScales = autoSpacing;
+            NSString* password = args[@"password"];
+            if ([password isKindOfClass:[NSString class]] && [_pdfView.document isEncrypted]) {
+                [_pdfView.document unlockWithPassword:password];
+            }
 
-                NSUInteger pageCount = [document pageCount];
+            NSUInteger pageCount = [document pageCount];
 
-                if (pageCount <= defaultPage) {
-                    defaultPage = pageCount - 1;
-                }
+            if (pageCount <= defaultPage) {
+                defaultPage = pageCount - 1;
+            }
 
-                PDFPage* page = [document pageAtIndex: defaultPage];
-                [_pdfView goToPage: page];
+        PDFPage* page = [document pageAtIndex: defaultPage];
+        [_pdfView goToPage: page];
 
-                _pdfView.minScaleFactor = _pdfView.scaleFactorForSizeToFit;
-                _pdfView.maxScaleFactor = 4.0;
+            _pdfView.minScaleFactor = _pdfView.scaleFactorForSizeToFit;
+            _pdfView.maxScaleFactor = 4.0;
 
-                dispatch_async(dispatch_get_main_queue(), ^{
-                    [weakSelf handleRenderCompleted:[NSNumber numberWithUnsignedLong: [document pageCount]]];
-                });
-            }
+            dispatch_async(dispatch_get_main_queue(), ^{
+                [weakSelf handleRenderCompleted:[NSNumber numberWithUnsignedLong: [document pageCount]]];
+            });
         }
 
         if (@available(iOS 11.0, *)) {

lib/flutter_pdfview.dart

@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:typed_data';
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter/gestures.dart';
@@ -17,7 +18,8 @@ enum FitPolicy { WIDTH, HEIGHT, BOTH }
 class PDFView extends StatefulWidget {
   const PDFView({
     Key key,
-    @required this.filePath,
+    this.filePath,
+    this.pdfData,
     this.onViewCreated,
     this.onRender,
     this.onPageChanged,
@@ -36,7 +38,8 @@ class PDFView extends StatefulWidget {
     this.defaultPage = 0,
     this.fitPolicy = FitPolicy.WIDTH,
     this.preventLinkNavigation = false,
-  }) : super(key: key);
+  }) : assert(filePath != null || pdfData != null),
+       super(key: key);
 
   @override
   _PDFViewState createState() => _PDFViewState();
@@ -62,6 +65,7 @@ class PDFView extends StatefulWidget {
 
   /// The initial URL to load.
   final String filePath;
+  final Uint8List pdfData;
 
   final bool enableSwipe;
   final bool swipeHorizontal;
@@ -121,23 +125,27 @@ class _PDFViewState extends State<PDFView> {
 class _CreationParams {
   _CreationParams({
     this.filePath,
+    this.pdfData,
     this.settings,
   });
 
   static _CreationParams fromWidget(PDFView widget) {
     return _CreationParams(
       filePath: widget.filePath,
+      pdfData: widget.pdfData,
       settings: _PDFViewSettings.fromWidget(widget),
     );
   }
 
   final String filePath;
+  final Uint8List pdfData;
 
   final _PDFViewSettings settings;
 
   Map<String, dynamic> toMap() {
     Map<String, dynamic> params = {
       'filePath': filePath,
+      'pdfData': pdfData,
     };
 
     params.addAll(settings.toMap());