Merge pull request #65 from PSPDFKit/simone/issue/fix-android-project

Android module enhancements

Author: simoarpe

README.md

@@ -465,7 +465,7 @@ const CONFIGURATION = {
 
 Just like on iOS we also support integrating PSPDFKit directly into the react-native view hierarchy. There are a few thing you need to consider when using this approach:
 
-- Your activity hosting the react component needs to extend from `FragmentActivity`. The default `ReactActivity` doesn't so you will need to update your java code to either manually use a `FragmentActivity` our use our drop-in replacement the `ReactFragmentActivity`.
+- Your activity hosting the react component needs to extend from `ReactFragmentActivity`.
 - Because of [issues](https://github.com/facebook/react-native/issues/17968) in react-native our `PdfView` needs to call `layout` and `dispatchOnGlobalLayout` on every frame, this might negatively affect your apps performance or even cause it to misbehave.
 - `PSPDFKitView` doesn't yet support all the features (outline, bookmarks, thubmnail grid, view settings) using `PSPDFKit.present` provides.
 

android/src/main/java/com/facebook/react/ReactFragmentActivity.java

@@ -36,7 +36,7 @@ public boolean getUseDeveloperSupport() {
         protected List<ReactPackage> getPackages() {
             return Arrays.<ReactPackage>asList(
                     new MainReactPackage(),
-                    new PSPDFKitPackage(MainApplication.this)
+                    new PSPDFKitPackage()
             );
         }
     };

android/src/main/java/com/pspdfkit/react/MainApplication.java

@@ -42,10 +42,8 @@ public class PSPDFKitModule extends ReactContextBaseJavaModule implements Applic
     @Nullable
     private Runnable onPdfActivityOpenedTask;
 
-    public PSPDFKitModule(ReactApplicationContext reactContext, Application application) {
+    public PSPDFKitModule(ReactApplicationContext reactContext) {
         super(reactContext);
-        // We register an activity lifecycle callback so we can get notified of the current activity.
-        application.registerActivityLifecycleCallbacks(this);
     }
 
     @Override
@@ -56,6 +54,10 @@ public String getName() {
     @ReactMethod
     public void present(@NonNull String document, @NonNull ReadableMap configuration) {
         if (getCurrentActivity() != null) {
+            if (resumedActivity == null) {
+                // We register an activity lifecycle callback so we can get notified of the current activity.
+                getCurrentActivity().getApplication().registerActivityLifecycleCallbacks(this);
+            }
             ConfigurationAdapter configurationAdapter = new ConfigurationAdapter(getCurrentActivity(), configuration);
             // This is an edge case where file scheme is missing.
             if (Uri.parse(document).getScheme() == null) {

android/src/main/java/com/pspdfkit/react/PSPDFKitModule.java

@@ -27,17 +27,10 @@
 
 public class PSPDFKitPackage implements ReactPackage {
 
-    private final Application application;
-
-    public PSPDFKitPackage(Application application) {
-        super();
-        this.application = application;
-    }
-
     @Override
     public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
         List<NativeModule> modules = new ArrayList<>();
-        modules.add(new PSPDFKitModule(reactContext, application));
+        modules.add(new PSPDFKitModule(reactContext));
         return modules;
     }
 

android/src/main/java/com/pspdfkit/react/PSPDFKitPackage.java

@@ -1,4 +1,4 @@
-//   Copyright © 2017 PSPDFKit GmbH. All rights reserved.
+//   Copyright © 2018 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.
@@ -178,7 +178,7 @@ class PdfViewScreen extends Component<{}> {
     return {
       title: "PDF",
       headerRight: (
-        <Button onPress={params.enterAnnotationCreation} title="Annotations" />
+        <Button onPress={() => params.handleAnnotationButtonPress()} title="Annotations" />
       )
     };
   };
@@ -195,21 +195,19 @@ class PdfViewScreen extends Component<{}> {
 
   componentWillMount() {
     this.props.navigation.setParams({
-      enterAnnotationCreation: this._enterAnnotationCreation
+      handleAnnotationButtonPress: () => {
+        if (
+          this.state.annotationCreationActive ||
+          this.state.annotationEditingActive
+        ) {
+          this.refs.pdfView.exitCurrentlyActiveMode();
+        } else {
+          this.refs.pdfView.enterAnnotationCreationMode();
+        }
+      }
     });
   }
 
-  _enterAnnotationCreation = () => {
-    if (
-      this.state.annotationCreationActive ||
-      this.state.annotationEditingActive
-    ) {
-      this.refs.pdfView.exitCurrentlyActiveMode();
-    } else {
-      this.refs.pdfView.enterAnnotationCreationMode();
-    }
-  };
-
   render() {
     let buttonTitle = "";
     if (this.state.annotationCreationActive) {

samples/Catalog/Catalog.android.js

@@ -37,7 +37,7 @@ public boolean getUseDeveloperSupport() {
     protected List<ReactPackage> getPackages() {
       return Arrays.<ReactPackage>asList(
           new MainReactPackage(),
-          new PSPDFKitPackage(MainApplication.this)
+          new PSPDFKitPackage()
       );
     }
 

samples/Catalog/android/app/src/main/java/com/pspdfkit/react/catalog/MainApplication.java

@@ -18,3 +18,4 @@
 # org.gradle.parallel=true
 
 android.useDeprecatedNdk=true
+org.gradle.jvmargs=-Xmx2G -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8