Update Android integration steps

Author: irgendeinich

README.md

@@ -305,10 +305,9 @@ For a more detailed description of toolbar customizations, refer to our Customiz
 - Android SDK
 - Android Build Tools 23.0.1 (React Native)
 - Android Build Tools 28.0.3 (PSPDFKit module)
-- Android Gradle plugin >= 3.2.1
-- PSPDFKit >= 5.0.1
-- react-native for example app >= 0.59.2
-- react-native for Catalog app >= 0.57.8
+- Android Gradle plugin >= 3.4.1
+- PSPDFKit >= 5.4.2
+- react-native >= 0.60.4
 
 #### Getting Started
 
@@ -319,15 +318,12 @@ Let's create a simple app that integrates PSPDFKit and uses the react-native-psp
 3. Step into your newly created app folder: `cd YourApp`.
 4. Add `react-native-pspdfkit` module from GitHub: `yarn add github:PSPDFKit/react-native`.
 5. Install all the dependencies for the project: `yarn install`. (Because of a [bug](https://github.com/yarnpkg/yarn/issues/2165) you may need to clean `yarn`'s cache with `yarn cache clean` before.)
-6. Link module `react-native-pspdfkit`: `react-native link react-native-pspdfkit`.
-7. <a id="step-7"></a>Add PSPDFKit repository to `YourApp/android/build.gradle` so PSPDFKit library can be downloaded:
+6. <a id="step-7"></a>Add PSPDFKit repository to `YourApp/android/build.gradle` so PSPDFKit library can be downloaded:
 
 ```diff
  allprojects {
      repositories {
          mavenLocal()
-         google()
-         jcenter()
 +        maven {
 +            url 'https://customers.pspdfkit.com/maven/'
 +            credentials {
@@ -339,11 +335,18 @@ Let's create a simple app that integrates PSPDFKit and uses the react-native-psp
              // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
              url "$rootDir/../node_modules/react-native/android"
          }
+         maven {
+            // Android JSC is installed from npm
+            url("$rootDir/../node_modules/jsc-android/dist")
+         }
+
+         google()
+         jcenter()
      }
  }
 ```
 
-8. PSPDFKit targets modern platforms, so you'll have to set the `minSdkVersion` to 19. In `YourApp/android/build.gradle`:
+7. PSPDFKit targets modern platforms, so you'll have to set the `minSdkVersion` to 19. In `YourApp/android/build.gradle`:
 
 ```diff
 ...
@@ -358,7 +361,7 @@ Let's create a simple app that integrates PSPDFKit and uses the react-native-psp
 ...
 ```
 
-9. We will also need to enable MultiDex support. In `YourApp/android/app/build.gradle`:
+8. We will also need to enable MultiDex support. In `YourApp/android/app/build.gradle`:
 
 ```diff
 ...
@@ -373,7 +376,7 @@ Let's create a simple app that integrates PSPDFKit and uses the react-native-psp
 ...
 ```
 
-10. <a id="step-10"></a>Enter your PSPDFKit license key into `YourApp/android/app/src/main/AndroidManifest.xml` file:
+9. <a id="step-10"></a>Enter your PSPDFKit license key into `YourApp/android/app/src/main/AndroidManifest.xml` file:
 
 ```diff
    <application>
@@ -386,7 +389,7 @@ Let's create a simple app that integrates PSPDFKit and uses the react-native-psp
    </application>
 ```
 
-11. Set primary color. In `YourApp/android/app/src/main/res/values/styles.xml` replace
+10. Set primary color. In `YourApp/android/app/src/main/res/values/styles.xml` replace
 
 ```xml
 <!-- Customize your theme here. -->
@@ -398,16 +401,15 @@ with
 <item name="colorPrimary">#3C97C9</item>
 ```
 
-12. <a id="step-12"></a>Replace the default component from `YourApp/App.js` with a simple touch area to present a PDF document from the local device filesystem:
+11. <a id="step-12"></a>Replace the default component from `YourApp/App.js` with a simple touch area to present a PDF document from the local device filesystem:
 
 ```javascript
 import React, { Component } from "react";
 import {
-  AppRegistry,
   StyleSheet,
   NativeModules,
   Text,
-  TouchableHighlight,
+  TouchableOpacity,
   View,
   PermissionsAndroid
 } from "react-native";
@@ -431,9 +433,9 @@ export default class YourApp extends Component<{}> {
     return (
       <View style={styles.container}>
         <Text>{PSPDFKit.versionString}</Text>
-        <TouchableHighlight onPress={this._onPressButton}>
+        <TouchableOpacity onPress={this._onPressButton}>
           <Text style={styles.text}>Tap to Open Document</Text>
-        </TouchableHighlight>
+        </TouchableOpacity>
       </View>
     );
   }
@@ -470,13 +472,13 @@ const styles = StyleSheet.create({
 });
 ```
 
-13. Before launching the app you need to copy a PDF document onto your development device or emulator.
+12. Before launching the app you need to copy a PDF document onto your development device or emulator.
 
     ```bash
     adb push /path/to/your/document.pdf /sdcard/document.pdf
     ```
 
-14. Your app is now ready to launch. From `YourApp` directory run `react-native run-android`.
+13. Your app is now ready to launch. From `YourApp` directory run `react-native run-android`.
 
     ```bash
     react-native run-android

index.js

@@ -85,7 +85,7 @@ class PSPDFKitView extends React.Component {
   _onDataReturned = event => {
     let { requestId, result, error } = event.nativeEvent;
     let promise = this._requestMap[requestId];
-    if (result) {
+    if (result != undefined) {
       promise.resolve(result);
     } else {
       promise.reject(error);

samples/Catalog/Catalog.android.js

@@ -20,17 +20,12 @@ import {
   PermissionsAndroid,
   Dimensions
 } from "react-native";
-import { StackNavigator, NavigationEvents, createStackNavigator, createAppContainer } from "react-navigation";
+import { createStackNavigator, createAppContainer } from "react-navigation";
 
 import QRCodeScanner from "react-native-qrcode-scanner";
 
 import PSPDFKitView from "react-native-pspdfkit";
 
-// React Native bug that hopefully will be fixed soon:
-// https://github.com/facebook/react-native/issues/18868
-import { YellowBox } from "react-native";
-YellowBox.ignoreWarnings(["Warning: isMounted(...) is deprecated"]);
-
 const PSPDFKit = NativeModules.PSPDFKit;
 const RNFS = require("react-native-fs");
 
@@ -617,7 +612,7 @@ class PdfViewInstantJsonScreen extends Component<{}> {
                     createdAt: "2018-07-03T13:53:03Z",
                     isDrawnNaturally: false,
                     lineWidth: 5,
-                    name: 'my annotation',
+                    name: "my annotation",
                     lines: {
                       intensities: [[0.5, 0.5, 0.5], [0.5, 0.5, 0.5]],
                       points: [
@@ -803,34 +798,36 @@ class InstantExampleScreen extends Component<{}> {
   }
 }
 
-export default createAppContainer(createStackNavigator(
-  {
-    Catalog: {
-      screen: CatalogScreen
-    },
-    PdfView: {
-      screen: PdfViewScreen
-    },
-    PdfViewSplitScreen: {
-      screen: PdfViewSplitScreen
-    },
-    PdfViewListenersScreen: {
-      screen: PdfViewListenersScreen
-    },
-    PdfViewInstantJsonScreen: {
-      screen: PdfViewInstantJsonScreen
-    },
-    PdfViewFormFillingScreen: {
-      screen: PdfViewFormFillingScreen
+export default createAppContainer(
+  createStackNavigator(
+    {
+      Catalog: {
+        screen: CatalogScreen
+      },
+      PdfView: {
+        screen: PdfViewScreen
+      },
+      PdfViewSplitScreen: {
+        screen: PdfViewSplitScreen
+      },
+      PdfViewListenersScreen: {
+        screen: PdfViewListenersScreen
+      },
+      PdfViewInstantJsonScreen: {
+        screen: PdfViewInstantJsonScreen
+      },
+      PdfViewFormFillingScreen: {
+        screen: PdfViewFormFillingScreen
+      },
+      InstantExampleScreen: {
+        screen: InstantExampleScreen
+      }
     },
-    InstantExampleScreen: {
-      screen: InstantExampleScreen
+    {
+      initialRouteName: "Catalog"
     }
-  },
-  {
-    initialRouteName: "Catalog"
-  }
-));
+  )
+);
 
 var styles = StyleSheet.create({
   separator: {
@@ -883,4 +880,4 @@ var styles = StyleSheet.create({
     fontWeight: "500",
     color: "#000"
   }
-});
+});