Merge pull request #2 from gre/master

Merge from gre/react-native-view-shot

android/src/main/java/fr/greweb/reactnativeviewshot/ViewShot.java

@@ -33,18 +33,18 @@ public class ViewShot implements UIBlock {
 
     static final String ERROR_UNABLE_TO_SNAPSHOT = "E_UNABLE_TO_SNAPSHOT";
 
-    private int tag;
-    private String extension;
-    private Bitmap.CompressFormat format;
-    private double quality;
-    private Integer width;
-    private Integer height;
-    private File output;
-    private String result;
-    private Promise promise;
-    private Boolean snapshotContentContainer;
-    private  ReactApplicationContext reactContext;
-    private Activity currentActivity;
+    private final int tag;
+    private final String extension;
+    private final Bitmap.CompressFormat format;
+    private final double quality;
+    private final Integer width;
+    private final Integer height;
+    private final File output;
+    private final String result;
+    private final Promise promise;
+    private final Boolean snapshotContentContainer;
+    private final ReactApplicationContext reactContext;
+    private final Activity currentActivity;
 
     public ViewShot(
             int tag,
@@ -75,8 +75,7 @@ public class ViewShot implements UIBlock {
 
     @Override
     public void execute(NativeViewHierarchyManager nativeViewHierarchyManager) {
-        OutputStream os = null;
-        View view = null;
+        final View view;
 
         if (tag == -1) {
             view = currentActivity.getWindow().getDecorView().findViewById(android.R.id.content);
@@ -90,22 +89,19 @@ public class ViewShot implements UIBlock {
         }
         try {
             if ("tmpfile".equals(result)) {
-                os = new FileOutputStream(output);
-                captureView(view, os);
-                String uri = Uri.fromFile(output).toString();
+                captureView(view, new FileOutputStream(output));
+                final String uri = Uri.fromFile(output).toString();
                 promise.resolve(uri);
-            }
-            else if ("base64".equals(result)) {
-                os = new ByteArrayOutputStream();
+            } else if ("base64".equals(result)) {
+                final ByteArrayOutputStream os = new ByteArrayOutputStream();
                 captureView(view, os);
-                byte[] bytes = ((ByteArrayOutputStream) os).toByteArray();
-                String data = Base64.encodeToString(bytes, Base64.NO_WRAP);
+                final byte[] bytes = os.toByteArray();
+                final String data = Base64.encodeToString(bytes, Base64.NO_WRAP);
                 promise.resolve(data);
-            }
-            else if ("data-uri".equals(result)) {
-                os = new ByteArrayOutputStream();
+            } else if ("data-uri".equals(result)) {
+                final ByteArrayOutputStream os = new ByteArrayOutputStream();
                 captureView(view, os);
-                byte[] bytes = ((ByteArrayOutputStream) os).toByteArray();
+                final byte[] bytes = os.toByteArray();
                 String data = Base64.encodeToString(bytes, Base64.NO_WRAP);
                 // correct the extension if JPG
                 if ("jpg".equals(extension)) {
@@ -114,20 +110,10 @@ public class ViewShot implements UIBlock {
                 data = "data:image/"+extension+";base64," + data;
                 promise.resolve(data);
             }
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             e.printStackTrace();
             promise.reject(ERROR_UNABLE_TO_SNAPSHOT, "Failed to capture view snapshot");
         }
-        finally {
-            if (os != null) {
-                try {
-                    os.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
     }
 
     private List<View> getAllChildren(View v) {
@@ -156,7 +142,15 @@ public class ViewShot implements UIBlock {
      * @param view the view to capture
      * @return the screenshot or null if it failed.
      */
-    private void captureView (View view, OutputStream os) {
+    private void captureView(View view, OutputStream os) throws IOException {
+        try {
+            captureViewImpl(view, os);
+        } finally {
+            os.close();
+        }
+    }
+
+    private void captureViewImpl(View view, OutputStream os) {
         int w = view.getWidth();
         int h = view.getHeight();
 
@@ -184,18 +178,20 @@ public class ViewShot implements UIBlock {
             if(child instanceof TextureView) {
                 ((TextureView) child).setOpaque(false);
                 childBitmapBuffer = ((TextureView) child).getBitmap(child.getWidth(), child.getHeight());
-                int left = child.getLeft();
-                int top = child.getTop();
-                View parentElem = (View)child.getParent();
-                while (parentElem != null) {
-                    if (parentElem == view) {
-                        break;
+                if (childBitmapBuffer != null) {
+                    int left = child.getLeft();
+                    int top = child.getTop();
+                    View parentElem = (View)child.getParent();
+                    while (parentElem != null) {
+                        if (parentElem == view) {
+                            break;
+                        }
+                        left += parentElem.getLeft();
+                        top += parentElem.getTop();
+                        parentElem = (View)parentElem.getParent();
                     }
-                    left += parentElem.getLeft();
-                    top += parentElem.getTop();
-                    parentElem = (View)parentElem.getParent();
+                    c.drawBitmap(childBitmapBuffer, left + child.getPaddingLeft(), top + child.getPaddingTop(), null);
                 }
-                c.drawBitmap(childBitmapBuffer, left + child.getPaddingLeft(),  top + child.getPaddingTop(), null);
             }
         }
 

src/index.d.ts

@@ -10,6 +10,7 @@
 
 declare module 'react-native-view-shot' {
     import { Component, ReactInstance } from 'react'
+    import { StyleObj } from 'react-native/Libraries/StyleSheet/StyleSheetTypes'
 
     export interface CaptureOptions {
         /**
@@ -66,6 +67,10 @@ declare module 'react-native-view-shot' {
          * @param {Error} error
          */
         onCaptureFailure?(error: Error): void;
+        /**
+         * style prop as StyleObj
+         */
+        style?: StyleObj;
     }
 
     export default class ViewShot extends Component<ViewShotProperties> {