Merge pull request #11 from PSPDFKit/julian/3.1.0

Update plugin for usage with PSPDFKit 3.1.0

Author: davidschreiber

README.md

@@ -69,7 +69,7 @@ var options {
 	disableBookmarkEditing: true, // hide bookmark editing (default: false)
 	hidePageLabels: true, // hide page labels (if available in PDF) in page overlay and thumbnail grid (default: false)  
 	hidePageNumberOverlay: false, // hide the overlay showing the current page (default: false)
-	hideThumbnailBar: true, // hide the thumbnail bar (default: false)
+	thumbnailBarMode: PSPDFKit.ThumbnailBarMode.THUMBNAIL_BAR_MODE_DEFAULT, // show static thumbnail bar. Also valid: THUMBNAIL_BAR_MODE_DEFAULT, THUMBNAIL_BAR_MODE_SCROLLABLE
 	hideThumbnailGrid: false, // hide the thumbnail grid menu (default: false)
 	pageFitMode: PSPDFKit.PageFitMode.FIT_TO_WIDTH, // also valid: PSPDFKit.PageFitMode.FIT_TO_SCREEN
 	scrollDirection: PSPDFKit.PageScrollDirection.VERTICAL, // also valid: PSPDFKit.PageScrollDirection.HORIZONTAL

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pspdfkit-cordova-android",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "description": "Integration of the PSPDFKit for Android library.",
   "cordova": {
     "id": "pspdfkit-cordova-android",

src/android/java/com/pspdfkit/cordova/PSPDFKitCordovaPlugin.java

@@ -27,7 +27,7 @@
 import com.pspdfkit.PSPDFKit;
 import com.pspdfkit.R;
 import com.pspdfkit.configuration.activity.PdfActivityConfiguration;
-import com.pspdfkit.configuration.annotations.AnnotationEditingConfiguration;
+import com.pspdfkit.configuration.activity.ThumbnailBarMode;
 import com.pspdfkit.configuration.page.PageFitMode;
 import com.pspdfkit.configuration.page.PageScrollDirection;
 import com.pspdfkit.configuration.page.PageScrollMode;
@@ -133,8 +133,8 @@ public class PSPDFKitCordovaPlugin extends CordovaPlugin {
                     builder.hidePageLabels();
                 } else if ("hidePageNumberOverlay".equals(option) && ((Boolean) value)) {
                     builder.hidePageNumberOverlay();
-                } else if ("hideThumbnailBar".equals(option) && ((Boolean) value)) {
-                    builder.hideThumbnailBar();
+                } else if ("thumbnailBarMode".equals(option)) {
+                    builder.setThumbnailBarMode(ThumbnailBarMode.valueOf((String) value));
                 } else if ("hideThumbnailGrid".equals(option) && ((Boolean) value)) {
                     builder.hideThumbnailGrid();
                 } else if ("diskCacheSize".equals(option)) {
@@ -171,7 +171,6 @@ public class PSPDFKitCordovaPlugin extends CordovaPlugin {
                 } else if ("autosaveEnabled".equals(option)) {
                     builder.autosaveEnabled(options.getBoolean("autosaveEnabled"));
                 } else if ("annotationEditing".equals(option)) {
-                    final AnnotationEditingConfiguration.Builder annotationBuilder = new AnnotationEditingConfiguration.Builder(themedContext);
                     final JSONObject annotationEditing = options.getJSONObject("annotationEditing");
                     final Iterator<String> annotationOptionIterator = annotationEditing.keys();
 
@@ -180,16 +179,14 @@ public class PSPDFKitCordovaPlugin extends CordovaPlugin {
                         final Object annotationEditingValue = annotationEditing.get(annotationEditingOption);
 
                         if ("enabled".equals(annotationEditingOption)) {
-                            if ((Boolean) annotationEditingValue) annotationBuilder.enableAnnotationEditing();
-                            else annotationBuilder.disableAnnotationEditing();
+                            if ((Boolean) annotationEditingValue) builder.enableAnnotationEditing();
+                            else builder.disableAnnotationEditing();
                         } else if ("creatorName".equals(annotationEditingOption)) {
                             PSPDFKitPreferences.get(activity).setAnnotationCreator(fromJsonString(annotationEditing.getString("creatorName")));
                         } else {
                             throw new IllegalArgumentException(String.format("Invalid annotation editing option '%s'", annotationEditingOption));
                         }
                     }
-
-                    builder.annotationEditingConfiguration(annotationBuilder.build());
                 } else {
                     throw new IllegalArgumentException(String.format("Invalid plugin option '%s'", option));
                 }

src/android/res/values/styles.xml

@@ -27,7 +27,7 @@
         <item name="pspdf__modularSearchStyle">@style/pspdf__SearchViewModular</item>
         <item name="pspdf__thumbnailBarStyle">@style/pspdf__ThumbnailBar</item>
         <item name="pspdf__thumbnailGridStyle">@style/pspdf__ThumbnailGrid</item>
-        <item name="pspdf__documentStyle">@style/pspdf__Document</item>
+        <item name="pspdf__searchResultHighlighterStyle">@style/pspdf__SearchResultHighlighter</item>
         <item name="pspdf__annotationStyle">@style/pspdf__Annotation</item>
         <item name="pspdf__annotationSelectionStyle">@style/pspdf__AnnotationSelection</item>
         <item name="pspdf__annotationCreationToolbarIconsStyle">@style/pspdf__AnnotationCreationToolbarIcons</item>

tests/package.json

@@ -0,0 +1,18 @@
+{
+  "name": "pspdfkit-cordova-android-tests",
+  "version": "3.1.0",
+  "description": "Test suite of the PSPDFKit for Android library Cordova plugin.",
+  "cordova": {
+    "id": "pspdfkit-cordova-android-tests",
+    "platforms": []
+  },
+  "keywords": [
+    "pdf",
+    "pspdfkit",
+    "android",
+    "ecosystem:cordova",
+    "cordova-android"
+  ],
+  "author": "PSPDFKit",
+  "license": "MIT"
+}

tests/plugin.xml

@@ -13,7 +13,7 @@
 -->
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
         id="pspdfkit-cordova-android-tests"
-        version="1.0.2-dev">
+        version="3.1.0">
     <name>PSPDFKit-Android Tests</name>
     <license>MIT</license>
 

tests/tests.js

@@ -49,6 +49,12 @@ exports.defineAutoTests = function () {
               expect(window.PSPDFKit.SearchType).toBeDefined();
           });
         });
+
+        describe('ThumbnailBarMode', function() {
+          it('should exist', function () {
+              expect(window.PSPDFKit.ThumbnailBarMode).toBeDefined();
+          });
+        })
     });
 };
 
@@ -68,11 +74,12 @@ exports.defineManualTests = function(contentEl, createActionButton) {
     createActionButton('Vertical continuous scrolling', function() {
         var asset = 'www/Guide.pdf';
         var options = {
-        	scrollDirection: PSPDFKit.PageScrollDirection.VERTICAL,
-        	scrollMode: PSPDFKit.ScrollMode.CONTINUOUS,
-        	title: "Custom Title",
-        	page: 2,
-        	useImmersiveMode: true
+          scrollDirection: PSPDFKit.PageScrollDirection.VERTICAL,
+          scrollMode: PSPDFKit.ScrollMode.CONTINUOUS,
+          title: "Custom Title",
+          page: 2,
+          useImmersiveMode: true,
+          thumbnailBarMode: PSPDFKit.ThumbnailBarMode.THUMBNAIL_BAR_MODE_SCROLLABLE
         };
 
         console.log('Opening document ' + asset);

www/PSPDFKit.js

@@ -100,3 +100,21 @@ exports.SearchType = {
    */
   SEARCH_INLINE: "SEARCH_INLINE"
 };
+
+/**
+ * Constant values used for setting the 'thumbnailBarMode' option.
+ */
+exports.ThumbnailBarMode = {
+  /**
+   * Default (static) thumbnail bar.
+   */
+  THUMBNAIL_BAR_MODE_DEFAULT: "THUMBNAIL_BAR_MODE_DEFAULT",
+  /**
+   * Scrollable thumbnail bar.
+   */
+  THUMBNAIL_BAR_MODE_SCROLLABLE: "THUMBNAIL_BAR_MODE_SCROLLABLE",
+  /**
+   * No thumbnail bar.
+   */
+  THUMBNAIL_BAR_MODE_NONE: "THUMBNAIL_BAR_MODE_NONE"
+};