Merge pull request #16 from PSPDFKit/simone/issue/upgrade-react-native-0.45.1

izacus · web-flow · commit 9585e228710e · 2017-06-19T17:42:52.000+02:00
Upgrade Android to React Native 0.45.1
diff --git a/README.md b/README.md
@@ -111,8 +111,8 @@ PSPDFKit.present('document.pdf', {
 - Android SDK
 - Android Build Tools 23.0.1 (React Native)
 - Android Build Tools 25.0.2 (PSPDFKit module)
-- PSPDFKit >= 3.0.0
-- react-native >= 0.41.2
+- PSPDFKit >= 3.2.0
+- react-native >= 0.45.1
 
 #### Getting Started
 
diff --git a/android/build.gradle b/android/build.gradle
@@ -2,7 +2,7 @@
 *   Contains gradle configuration constants
 */
 ext {
-    PSPDFKIT_VERSION = '3.0.0'
+    PSPDFKIT_VERSION = '3.2.0'
 }
 
 buildscript {
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
@@ -1,3 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ AndroidManifest.xml
+  ~
+  ~   PSPDFKit
+  ~
+  ~   Copyright © 2017 PSPDFKit GmbH. All rights reserved.
+  ~
+  ~   THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
+  ~   AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE PSPDFKIT LICENSE AGREEMENT.
+  ~   UNAUTHORIZED REPRODUCTION OR DISTRIBUTION IS SUBJECT TO CIVIL AND CRIMINAL PENALTIES.
+  ~   This notice may not be removed from this file.
+  -->
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.pspdfkit.react"
     android:versionCode="1"
diff --git a/android/src/main/java/com/pspdfkit/react/ConfigurationAdapter.java b/android/src/main/java/com/pspdfkit/react/ConfigurationAdapter.java
@@ -1,8 +1,9 @@
 /*
- *   ConfigurationAdapter.java
+ * ConfigurationAdapter.java
+ *
  *   PSPDFKit
  *
- *   Copyright (c) 2014-2016 PSPDFKit GmbH. All rights reserved.
+ *   Copyright © 2017 PSPDFKit GmbH. All rights reserved.
  *
  *   THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
  *   AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE PSPDFKIT LICENSE AGREEMENT.
@@ -20,7 +21,7 @@
 import com.facebook.react.bridge.ReadableMapKeySetIterator;
 import com.pspdfkit.configuration.activity.HudViewMode;
 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;
@@ -40,6 +41,9 @@ public class ConfigurationAdapter {
     private static final String SHOW_SEARCH_ACTION = "showSearchAction";
     private static final String INLINE_SEARCH = "inlineSearch";
     private static final String SHOW_THUMBNAIL_BAR = "showThumbnailBar";
+    private static final String SHOW_THUMBNAIL_BAR_DEFAULT = "default";
+    private static final String SHOW_THUMBNAIL_BAR_SCROLLABLE = "scrollable";
+    private static final String SHOW_THUMBNAIL_BAR_NONE = "none";
     private static final String SHOW_THUMBNAIL_GRID_ACTION = "showThumbnailGridAction";
     private static final String SHOW_OUTLINE_ACTION = "showOutlineAction";
     private static final String SHOW_ANNOTATION_LIST_ACTION = "showAnnotationListAction";
@@ -91,9 +95,6 @@ public ConfigurationAdapter(@NonNull Activity activity, ReadableMap configuratio
             if (configuration.hasKey(IMMERSIVE_MODE)) {
                 configureImmersiveMode(configuration.getBoolean(IMMERSIVE_MODE));
             }
-            if (configuration.hasKey(SHOW_THUMBNAIL_BAR)) {
-                configureShowThumbnailBar(configuration.getBoolean(SHOW_THUMBNAIL_BAR));
-            }
             if (configuration.hasKey(SHOW_THUMBNAIL_GRID_ACTION)) {
                 configureShowThumbnailGridAction(configuration.getBoolean(SHOW_THUMBNAIL_GRID_ACTION));
             }
@@ -127,6 +128,9 @@ public ConfigurationAdapter(@NonNull Activity activity, ReadableMap configuratio
             if (configuration.hasKey(ENABLE_TEXT_SELECTION)) {
                 configureEnableTextSelection(configuration.getBoolean(ENABLE_TEXT_SELECTION));
             }
+            if (configuration.hasKey(SHOW_THUMBNAIL_BAR)) {
+                configureShowThumbnailBar(configuration.getString(SHOW_THUMBNAIL_BAR));
+            }
         }
     }
 
@@ -191,12 +195,16 @@ private void configureImmersiveMode(boolean immersiveMode) {
         configuration.useImmersiveMode(immersiveMode);
     }
 
-    private void configureShowThumbnailBar(boolean showThumbnailBar) {
-        if (showThumbnailBar) {
-            configuration.showThumbnailBar();
-        } else {
-            configuration.hideThumbnailBar();
+    private void configureShowThumbnailBar(String showThumbnailBar) {
+        ThumbnailBarMode thumbnailBarMode = ThumbnailBarMode.THUMBNAIL_BAR_MODE_DEFAULT;
+        if (showThumbnailBar.equals(SHOW_THUMBNAIL_BAR_DEFAULT)) {
+            thumbnailBarMode = ThumbnailBarMode.THUMBNAIL_BAR_MODE_DEFAULT;
+        } else if (showThumbnailBar.equals(SHOW_THUMBNAIL_BAR_SCROLLABLE)) {
+            thumbnailBarMode = ThumbnailBarMode.THUMBNAIL_BAR_MODE_SCROLLABLE;
+        } else if (showThumbnailBar.equals(SHOW_THUMBNAIL_BAR_NONE)) {
+            thumbnailBarMode = ThumbnailBarMode.THUMBNAIL_BAR_MODE_NONE;
         }
+        configuration.setThumbnailBarMode(thumbnailBarMode);
     }
 
     private void configureShowThumbnailGridAction(boolean showThumbnailGridAction) {
@@ -240,13 +248,11 @@ private void configureInvertColors(boolean invertColors) {
     }
 
     private void configureEnableAnnotationEditing(boolean enableAnnotationEditing) {
-        AnnotationEditingConfiguration.Builder annotationEditingConfiguration = new AnnotationEditingConfiguration.Builder(activity);
         if (enableAnnotationEditing) {
-            annotationEditingConfiguration.enableAnnotationEditing();
+            configuration.enableAnnotationEditing();
         } else {
-            annotationEditingConfiguration.disableAnnotationEditing();
+            configuration.disableAnnotationEditing();
         }
-        configuration.annotationEditingConfiguration(annotationEditingConfiguration.build());
     }
 
     private void configureShowShareAction(boolean showShareAction) {
@@ -280,6 +286,7 @@ public static PdfActivityConfiguration.Builder getDefaultConfiguration(Context c
         final PageFitMode pageFitMode = PageFitMode.FIT_TO_WIDTH;
         final int searchType = PdfActivityConfiguration.SEARCH_INLINE;
         final HudViewMode hudViewMode = HudViewMode.HUD_VIEW_MODE_AUTOMATIC;
+        final ThumbnailBarMode thumbnailBarMode = ThumbnailBarMode.THUMBNAIL_BAR_MODE_DEFAULT;
         int startPage = 0;
 
         PdfActivityConfiguration.Builder configuration = new PdfActivityConfiguration.Builder(context)
@@ -288,10 +295,9 @@ public static PdfActivityConfiguration.Builder getDefaultConfiguration(Context c
                 .fitMode(pageFitMode)
                 .setHudViewMode(hudViewMode)
                 .setSearchType(searchType)
+                .setThumbnailBarMode(thumbnailBarMode)
                 .page(startPage);
 
-        AnnotationEditingConfiguration.Builder annotationEditingConfiguration = new AnnotationEditingConfiguration.Builder(context);
-        configuration.annotationEditingConfiguration(annotationEditingConfiguration.build());
         return configuration;
     }
 }
diff --git a/android/src/main/java/com/pspdfkit/react/MainActivity.java b/android/src/main/java/com/pspdfkit/react/MainActivity.java
@@ -1,8 +1,9 @@
 /*
- *   MainActivity.java
+ * MainActivity.java
+ *
  *   PSPDFKit
  *
- *   Copyright (c) 2014-2016 PSPDFKit GmbH. All rights reserved.
+ *   Copyright © 2017 PSPDFKit GmbH. All rights reserved.
  *
  *   THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
  *   AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE PSPDFKIT LICENSE AGREEMENT.
diff --git a/android/src/main/java/com/pspdfkit/react/MainApplication.java b/android/src/main/java/com/pspdfkit/react/MainApplication.java
@@ -1,8 +1,9 @@
 /*
- *   MainApplication.java
+ * MainApplication.java
+ *
  *   PSPDFKit
  *
- *   Copyright (c) 2014-2016 PSPDFKit GmbH. All rights reserved.
+ *   Copyright © 2017 PSPDFKit GmbH. All rights reserved.
  *
  *   THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
  *   AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE PSPDFKIT LICENSE AGREEMENT.
diff --git a/android/src/main/java/com/pspdfkit/react/PSPDFKitModule.java b/android/src/main/java/com/pspdfkit/react/PSPDFKitModule.java
@@ -1,8 +1,9 @@
 /*
- *   PSPDFKitModule.java
+ * PSPDFKitModule.java
+ *
  *   PSPDFKit
  *
- *   Copyright (c) 2014-2016 PSPDFKit GmbH. All rights reserved.
+ *   Copyright © 2017 PSPDFKit GmbH. All rights reserved.
  *
  *   THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
  *   AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE PSPDFKIT LICENSE AGREEMENT.
diff --git a/android/src/main/java/com/pspdfkit/react/PSPDFKitPackage.java b/android/src/main/java/com/pspdfkit/react/PSPDFKitPackage.java
@@ -1,8 +1,9 @@
 /*
- *   PSPDFKitPackage.java
+ * PSPDFKitPackage.java
+ *
  *   PSPDFKit
  *
- *   Copyright (c) 2014-2016 PSPDFKit GmbH. All rights reserved.
+ *   Copyright © 2017 PSPDFKit GmbH. All rights reserved.
  *
  *   THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
  *   AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE PSPDFKIT LICENSE AGREEMENT.
diff --git a/package.json b/package.json
@@ -1,14 +1,18 @@
 {
   "name": "react-native-pspdfkit",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "A React Native module for the PSPDFKit library.",
-  "keywords": ["react native", "pspdfkit", "pdf"],
+  "keywords": [
+    "react native",
+    "pspdfkit",
+    "pdf"
+  ],
   "homepage": "https://github.com/PSPDFKit/react-native",
   "bugs": {
-    "url" : "https://github.com/PSPDFKit/react-native/issues",
-    "email" : "support@pspdfkit.com"
+    "url": "https://github.com/PSPDFKit/react-native/issues",
+    "email": "support@pspdfkit.com"
   },
-  "license" : "SEE LICENSE IN LICENSE",
+  "license": "SEE LICENSE IN LICENSE",
   "main": "js/index.js",
   "repository": {
     "type": "git",
@@ -18,7 +22,7 @@
     "start": "node node_modules/react-native/local-cli/cli.js start"
   },
   "dependencies": {
-    "react": ">=15.4.2",
-    "react-native": ">=0.41.2"
+    "react": "^16.0.0-alpha.12",
+    "react-native": "^0.45.1"
   }
 }
diff --git a/samples/Catalog/android/app/src/main/AndroidManifest.xml b/samples/Catalog/android/app/src/main/AndroidManifest.xml
@@ -1,3 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ AndroidManifest.xml
+  ~
+  ~   PSPDFKit
+  ~
+  ~   Copyright © 2017 PSPDFKit GmbH. All rights reserved.
+  ~
+  ~   THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
+  ~   AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE PSPDFKIT LICENSE AGREEMENT.
+  ~   UNAUTHORIZED REPRODUCTION OR DISTRIBUTION IS SUBJECT TO CIVIL AND CRIMINAL PENALTIES.
+  ~   This notice may not be removed from this file.
+  -->
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.pspdfkit.react.catalog"
     android:versionCode="1"
@@ -14,12 +28,12 @@
         android:name=".MainApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/PSPDFCatalog.Theme.Light">
+        android:label="@string/app_name">
         <activity
             android:name=".MainActivity"
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
-            android:label="@string/app_name">
+            android:label="@string/app_name"
+            android:theme="@style/PSPDFCatalog.Theme.Light">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/samples/Catalog/android/app/src/main/java/com/pspdfkit/react/catalog/MainActivity.java b/samples/Catalog/android/app/src/main/java/com/pspdfkit/react/catalog/MainActivity.java
@@ -1,3 +1,16 @@
+/*
+ * MainActivity.java
+ *
+ *   PSPDFKit
+ *
+ *   Copyright © 2017 PSPDFKit GmbH. All rights reserved.
+ *
+ *   THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
+ *   AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE PSPDFKIT LICENSE AGREEMENT.
+ *   UNAUTHORIZED REPRODUCTION OR DISTRIBUTION IS SUBJECT TO CIVIL AND CRIMINAL PENALTIES.
+ *   This notice may not be removed from this file.
+ */
+
 package com.pspdfkit.react.catalog;
 
 import com.facebook.react.ReactActivity;
diff --git a/samples/Catalog/android/app/src/main/java/com/pspdfkit/react/catalog/MainApplication.java b/samples/Catalog/android/app/src/main/java/com/pspdfkit/react/catalog/MainApplication.java
@@ -1,3 +1,16 @@
+/*
+ * MainApplication.java
+ *
+ *   PSPDFKit
+ *
+ *   Copyright © 2017 PSPDFKit GmbH. All rights reserved.
+ *
+ *   THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
+ *   AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE PSPDFKIT LICENSE AGREEMENT.
+ *   UNAUTHORIZED REPRODUCTION OR DISTRIBUTION IS SUBJECT TO CIVIL AND CRIMINAL PENALTIES.
+ *   This notice may not be removed from this file.
+ */
+
 package com.pspdfkit.react.catalog;
 
 import android.app.Application;
diff --git a/samples/Catalog/android/app/src/main/res/values/colors.xml b/samples/Catalog/android/app/src/main/res/values/colors.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~   colors.xml
+  ~ colors.xml
+  ~
   ~   PSPDFKit
   ~
-  ~   Copyright (c) 2014-2016 PSPDFKit GmbH. All rights reserved.
+  ~   Copyright © 2017 PSPDFKit GmbH. All rights reserved.
   ~
   ~   THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
   ~   AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE PSPDFKIT LICENSE AGREEMENT.
diff --git a/samples/Catalog/android/app/src/main/res/values/strings.xml b/samples/Catalog/android/app/src/main/res/values/strings.xml
@@ -1,3 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ strings.xml
+  ~
+  ~   PSPDFKit
+  ~
+  ~   Copyright © 2017 PSPDFKit GmbH. All rights reserved.
+  ~
+  ~   THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
+  ~   AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE PSPDFKIT LICENSE AGREEMENT.
+  ~   UNAUTHORIZED REPRODUCTION OR DISTRIBUTION IS SUBJECT TO CIVIL AND CRIMINAL PENALTIES.
+  ~   This notice may not be removed from this file.
+  -->
+
 <resources>
     <string name="app_name">Catalog</string>
 </resources>
diff --git a/samples/Catalog/android/app/src/main/res/values/styles.xml b/samples/Catalog/android/app/src/main/res/values/styles.xml
diff --git a/samples/Catalog/index.android.js b/samples/Catalog/index.android.js
diff --git a/samples/Catalog/package.json b/samples/Catalog/package.json
diff --git a/samples/Catalog/yarn.lock b/samples/Catalog/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`* Contains gradle configuration constants`
`3`	`3`	`*/`
`4`	`4`	`ext {`
`5`		`- PSPDFKIT_VERSION = '3.0.0'`
	`5`	`+ PSPDFKIT_VERSION = '3.2.0'`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`buildscript {`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,9 @@`
`1`	`1`	`/*`
`2`		`- * MainActivity.java`
	`2`	`+ * MainActivity.java`
	`3`	`+ *`
`3`	`4`	`* PSPDFKit`
`4`	`5`	`*`
`5`		`- * Copyright (c) 2014-2016 PSPDFKit GmbH. All rights reserved.`
	`6`	`+ * Copyright © 2017 PSPDFKit GmbH. All rights reserved.`
`6`	`7`	`*`
`7`	`8`	`* THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW`
`8`	`9`	`* AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE PSPDFKIT LICENSE AGREEMENT.`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,9 @@`
`1`	`1`	`/*`
`2`		`- * MainApplication.java`
	`2`	`+ * MainApplication.java`
	`3`	`+ *`
`3`	`4`	`* PSPDFKit`
`4`	`5`	`*`
`5`		`- * Copyright (c) 2014-2016 PSPDFKit GmbH. All rights reserved.`
	`6`	`+ * Copyright © 2017 PSPDFKit GmbH. All rights reserved.`
`6`	`7`	`*`
`7`	`8`	`* THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW`
`8`	`9`	`* AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE PSPDFKIT LICENSE AGREEMENT.`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,9 @@`
`1`	`1`	`/*`
`2`		`- * PSPDFKitModule.java`
	`2`	`+ * PSPDFKitModule.java`
	`3`	`+ *`
`3`	`4`	`* PSPDFKit`
`4`	`5`	`*`
`5`		`- * Copyright (c) 2014-2016 PSPDFKit GmbH. All rights reserved.`
	`6`	`+ * Copyright © 2017 PSPDFKit GmbH. All rights reserved.`
`6`	`7`	`*`
`7`	`8`	`* THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW`
`8`	`9`	`* AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE PSPDFKIT LICENSE AGREEMENT.`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,9 @@`
`1`	`1`	`/*`
`2`		`- * PSPDFKitPackage.java`
	`2`	`+ * PSPDFKitPackage.java`
	`3`	`+ *`
`3`	`4`	`* PSPDFKit`
`4`	`5`	`*`
`5`		`- * Copyright (c) 2014-2016 PSPDFKit GmbH. All rights reserved.`
	`6`	`+ * Copyright © 2017 PSPDFKit GmbH. All rights reserved.`
`6`	`7`	`*`
`7`	`8`	`* THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW`
`8`	`9`	`* AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE PSPDFKIT LICENSE AGREEMENT.`