react-native-scanbot-barcode-scanner-sdk 3.3.0 → 3.3.1-beta.3

package/android/src/main/java/io/scanbot/barcodesdk/plugin/reactnative/components/barcodecameraview/ScanbotBarcodeCameraViewManager.java

@@ -0,0 +1,114 @@
+package io.scanbot.barcodesdk.plugin.reactnative.components.barcodecameraview;
+
+import android.widget.FrameLayout;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.uimanager.ViewGroupManager;
+import com.facebook.react.uimanager.annotations.ReactProp;
+
+import java.util.Map;
+
+import io.scanbot.barcodesdk.plugin.reactnative.components.base.communication.ScanbotEventEmitter;
+import io.scanbot.barcodesdk.plugin.reactnative.components.base.communication.ScanbotEventEmitter.NativeEvent;
+import io.scanbot.barcodesdk.plugin.reactnative.components.base.communication.ScanbotEventReceiver;
+import io.scanbot.barcodesdk.plugin.reactnative.components.base.communication.ScanbotEventReceiver.CommonEvents;
+
+public class ScanbotBarcodeCameraViewManager extends ViewGroupManager<ScanbotBarcodeCameraView> implements ScanbotEventReceiver.IEventHandler {
+    private static final String TAG = "ScanbotBarcodeCameraView";
+    @NonNull @Override public String getName() { return TAG; }
+
+    private ScanbotBarcodeCameraView barcodeCameraView;
+    private final ScanbotEventReceiver eventReceiver;
+    private boolean shouldRefreshConfig = false;
+
+    public ScanbotBarcodeCameraViewManager() {
+        super();
+        this.eventReceiver = new ScanbotEventReceiver(this, new ScanbotEventReceiver.JavaScriptEvent[] {});
+    }
+
+    @SuppressWarnings("unused")
+    @ReactProp(name = "configuration")
+    public void setConfiguration(FrameLayout frameLayout, ReadableMap configuration) {
+        if (barcodeCameraView == null) { return; }
+        barcodeCameraView.applyConfiguration(configuration);
+    }
+
+    @NonNull
+    @Override
+    protected ScanbotBarcodeCameraView createViewInstance(@NonNull ThemedReactContext context) {
+        this.barcodeCameraView = new ScanbotBarcodeCameraView(context);
+        return this.barcodeCameraView;
+    }
+
+    /*-----------------------*
+    *   Component Lifecycle
+    *------------------------*/
+    protected void componentDidUpdate() {
+        if (shouldRefreshConfig) {
+            this.barcodeCameraView.refreshConfiguration();
+            shouldRefreshConfig = false;
+        }
+    }
+
+    protected void orientationChanged() {
+        shouldRefreshConfig = true;
+    }
+
+    protected void componentDidMount() {}
+    protected void componentWillUnmount() {}
+
+    /*-----------------------*
+    *     Events Handling
+    *------------------------*/
+    @Override
+    public void receiveCommand(@NonNull ScanbotBarcodeCameraView root, String commandId, @Nullable ReadableArray args) {
+        super.receiveCommand(root, commandId, args);
+        eventReceiver.receiveCommand(commandId, args);
+    }
+
+    @Nullable
+    @Override
+    public Map<String, Object> getExportedCustomDirectEventTypeConstants() {
+        final NativeEvent[] commonEvents = ScanbotEventEmitter.CommonEvents.values();
+        final NativeEvent[] customEvents = ScanbotBarcodeCameraView.getNativeEvents();
+        final NativeEvent[] allEvents = ScanbotEventEmitter.concatEvents(commonEvents, customEvents);
+        return ScanbotEventEmitter.getMapForNativeEvents(allEvents);
+    }
+
+    @Override
+    public void eventHandler_eventReceived(ScanbotEventReceiver.JavaScriptEvent event, @Nullable ReadableArray args) {
+        CommonEvents commonEvent = eventReceiver.getCommonEventFromName(event.getName());
+        if (commonEvent == null) {
+            return;
+        }
+        this.handleCommonEvent(commonEvent, args);
+    }
+
+    private void handleCommonEvent(CommonEvents commonEvent, @Nullable ReadableArray args) {
+        switch (commonEvent) {
+            case COMPONENT_DID_UPDATE:
+                componentDidUpdate();
+                break;
+            case COMPONENT_DID_MOUNT:
+                componentDidMount();
+                break;
+            case COMPONENT_WILL_UNMOUNT:
+                componentWillUnmount();
+                break;
+            case ORIENTATION_CHANGED:
+                orientationChanged();
+                break;
+        }
+    }
+
+    @Nullable
+    @Override
+    public Map<String, Integer> getCommandsMap() {
+        return eventReceiver.getCommandsMap();
+    }
+}

package/android/src/main/java/io/scanbot/barcodesdk/plugin/reactnative/components/base/communication/{RNScanbotEventEmitter.java → ScanbotEventEmitter.java}

@@ -9,13 +9,13 @@ import com.facebook.react.uimanager.events.RCTEventEmitter;
 
 import java.util.Map;
 
-public class RNScanbotEventEmitter {
+public class ScanbotEventEmitter {
 
     public interface NativeEvent {
         String getName();
     }
 
-    public enum CommonEvents implements RNScanbotEventEmitter.NativeEvent {
+    public enum CommonEvents implements NativeEvent {
         REQUEST_COMPONENT_RELOAD("requestComponentReload");
 
         private final String name;
@@ -32,7 +32,7 @@ public class RNScanbotEventEmitter {
     private final ReactContext reactContext;
     private final ViewGroup rootViewGroup;
 
-    public RNScanbotEventEmitter(final ReactContext reactContext, final ViewGroup rootViewGroup) {
+    public ScanbotEventEmitter(final ReactContext reactContext, final ViewGroup rootViewGroup) {
         this.reactContext = reactContext;
         this.jsEventEmitter = reactContext.getJSModule(RCTEventEmitter.class);
         this.rootViewGroup = rootViewGroup;
@@ -56,15 +56,15 @@ public class RNScanbotEventEmitter {
         return builder.build();
     }
 
-    public static RNScanbotEventEmitter.NativeEvent[] concatEvents(
-            RNScanbotEventEmitter.NativeEvent[] arr1,
-            RNScanbotEventEmitter.NativeEvent[] arr2
+    public static NativeEvent[] concatEvents(
+            NativeEvent[] arr1,
+            NativeEvent[] arr2
     ) {
         final int len1 = arr1.length;
         final int len2 = arr2.length;
         final int min = Math.min(len1, len2);
         final int max = Math.max(len1, len2);
-        final RNScanbotEventEmitter.NativeEvent[] out = new RNScanbotEventEmitter.NativeEvent[len1 + len2];
+        final NativeEvent[] out = new NativeEvent[len1 + len2];
 
         for (int i = 0; i<max; ++i) {
             out[i] = len2 > len1 ? arr2[i] : arr1[i];

package/android/src/main/java/io/scanbot/barcodesdk/plugin/reactnative/components/base/communication/{RNScanbotEventReceiver.java → ScanbotEventReceiver.java}

@@ -8,13 +8,13 @@ import com.facebook.react.bridge.ReadableArray;
 import java.util.HashMap;
 import java.util.Map;
 
-public class RNScanbotEventReceiver {
+public class ScanbotEventReceiver {
 
     public interface JavaScriptEvent {
         String getName();
     }
 
-    public enum CommonEvents implements RNScanbotEventReceiver.JavaScriptEvent {
+    public enum CommonEvents implements JavaScriptEvent {
         COMPONENT_DID_UPDATE("componentDidUpdate"),
         COMPONENT_DID_MOUNT("componentDidMount"),
         COMPONENT_WILL_UNMOUNT("componentWillUnmount"),
@@ -38,7 +38,7 @@ public class RNScanbotEventReceiver {
     private final JavaScriptEvent[] events;
     private final HashMap<Integer, String> eventsMap = new HashMap<>();
 
-    public RNScanbotEventReceiver(@NonNull final IEventHandler handler, @NonNull final JavaScriptEvent[] events) {
+    public ScanbotEventReceiver(@NonNull final IEventHandler handler, @NonNull final JavaScriptEvent[] events) {
         this.handler = handler;
         this.events = concatEvents(CommonEvents.values(), events);
         prepare();
@@ -88,15 +88,15 @@ public class RNScanbotEventReceiver {
         return (CommonEvents) event;
     }
 
-    public static RNScanbotEventReceiver.JavaScriptEvent[] concatEvents(
-            RNScanbotEventReceiver.JavaScriptEvent[] arr1,
-            RNScanbotEventReceiver.JavaScriptEvent[] arr2
+    public static JavaScriptEvent[] concatEvents(
+            JavaScriptEvent[] arr1,
+            JavaScriptEvent[] arr2
     ) {
         final int len1 = arr1.length;
         final int len2 = arr2.length;
         final int min = Math.min(len1, len2);
         final int max = Math.max(len1, len2);
-        final RNScanbotEventReceiver.JavaScriptEvent[] out = new RNScanbotEventReceiver.JavaScriptEvent[len1 + len2];
+        final JavaScriptEvent[] out = new JavaScriptEvent[len1 + len2];
 
         for (int i = 0; i<max; ++i) {
             out[i] = len2 > len1 ? arr2[i] : arr1[i];

package/android/src/main/java/io/scanbot/barcodesdk/plugin/reactnative/components/base/models/ScanbotFinderInset.java

@@ -0,0 +1,8 @@
+package io.scanbot.barcodesdk.plugin.reactnative.components.base.models;
+
+public class ScanbotFinderInset {
+    public int left = 0;
+    public int top = 0;
+    public int right = 0;
+    public int bottom = 0;
+}

package/android/src/main/java/io/scanbot/barcodesdk/plugin/reactnative/components/base/ui/ScanbotViewWrapper.java

@@ -0,0 +1,26 @@
+package io.scanbot.barcodesdk.plugin.reactnative.components.base.ui;
+
+import android.content.Context;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.facebook.react.views.view.ReactViewGroup;
+
+import io.scanbot.barcodesdk.plugin.reactnative.utils.ScanbotViewUtils;
+
+public class ScanbotViewWrapper extends ReactViewGroup {
+    public ScanbotViewWrapper(Context context) {
+        super(context);
+    }
+
+    public static ScanbotViewWrapper wrap(final View view) {
+        final ScanbotViewWrapper wrapper = new ScanbotViewWrapper(view.getContext());
+        if (view instanceof ViewGroup) {
+            ScanbotViewUtils.installHierarchyFitter((ViewGroup) view);
+        }
+        wrapper.addView(view);
+        wrapper.requestLayout();
+        view.requestLayout();
+        return wrapper;
+    }
+}

package/android/src/main/java/io/scanbot/barcodesdk/plugin/reactnative/utils/ScanbotViewUtils.java

@@ -0,0 +1,52 @@
+package io.scanbot.barcodesdk.plugin.reactnative.utils;
+
+import android.graphics.Color;
+import android.util.Log;
+import android.view.Choreographer;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.ColorInt;
+
+public class ScanbotViewUtils {
+    public static void installHierarchyFitter(final ViewGroup viewGroup) {
+        viewGroup.setOnHierarchyChangeListener(new ViewGroup.OnHierarchyChangeListener() {
+            @Override
+            public void onChildViewAdded(View parent, View child) {
+                if (parent == null) { return; }
+                parent.measure(
+                    View.MeasureSpec.makeMeasureSpec(viewGroup.getMeasuredWidth(), View.MeasureSpec.EXACTLY),
+                    View.MeasureSpec.makeMeasureSpec(viewGroup.getMeasuredHeight(), View.MeasureSpec.EXACTLY)
+                );
+                parent.layout(0, 0, parent.getMeasuredWidth(), parent.getMeasuredHeight());
+            }
+
+            @Override
+            public void onChildViewRemoved(View parent, View child) {}
+        });
+    }
+
+    public static void remeasureChildren(final ViewGroup view) {
+        Choreographer.getInstance().postFrameCallback(frameTimeNanos -> {
+            for (int i = 0; i < view.getChildCount(); i++) {
+                View child = view.getChildAt(i);
+                if (child instanceof ViewGroup) {
+                    child.measure(View.MeasureSpec.makeMeasureSpec(view.getMeasuredWidth(), View.MeasureSpec.EXACTLY),
+                            View.MeasureSpec.makeMeasureSpec(view.getMeasuredHeight(), View.MeasureSpec.EXACTLY));
+                    child.layout(0, 0, child.getMeasuredWidth(), child.getMeasuredHeight());
+                }
+            }
+            view.getViewTreeObserver().dispatchOnGlobalLayout();
+        });
+    }
+
+    @ColorInt
+    public static int colorWithAlpha(@ColorInt int color, float factor) {
+        int alpha = Math.round(Color.alpha(color) * factor);
+        int red = Color.red(color);
+        int green = Color.green(color);
+        int blue = Color.blue(color);
+        return Color.argb(alpha, red, green, blue);
+    }
+
+}

package/ios/Components/BarcodeCameraView/RNScanbotBarcodeCameraView.m

@@ -86,7 +86,7 @@
         cameraViewConfiguration.codeDensity = extractBarcodeDensity(config);
         cameraViewConfiguration.finderInset = [self populateFinderInset:config];
         
-        self.shouldUseFinderView = [config objectForKey:@"shouldUseFinderView"];
+        self.shouldUseFinderView = [[config objectForKey:@"shouldUseFinderView"] boolValue];
         
     } @catch (NSException *exception) {
         NSLog(@"%@", [exception reason]);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-scanbot-barcode-scanner-sdk",
   "title": "Scanbot Barcode Scanner SDK for React Native",
-  "version": "3.3.0",
+  "version": "3.3.1-beta.3",
   "description": "Scanbot Barcode Scanner SDK React Native Plugin for Android and iOS",
   "main": "index.js",
   "files": [

package/src/components/barcode-camera-view/scanbot-barcode-camera-view.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import {findNodeHandle, NativeMethods, Platform, UIManager} from 'react-native';
+import {EmitterSubscription, findNodeHandle, NativeMethods, Platform, UIManager} from 'react-native';
 import {Dimensions} from 'react-native';
 import {ScanbotBarcodeCameraViewProperties} from './scanbot-barcode-camera-view-types';
 import ScanbotNativeBarcodeCameraView from './scanbot-native-barcode-camera-view';
@@ -28,6 +28,9 @@ export class ScanbotBarcodeCameraView extends React.Component<Properties, {}> {
   // String length of auto-generated component key
   static UNIQUE_VIEW_KEY_LENGTH = 6;
 
+  // Listener for orientation changes
+  dimensionsChangeSubscription: EmitterSubscription | null = null;
+
   // This attribute allows us to retrieve a key for the component depending on the current state.
   // If the component has been invalidated, it returns a new key and the view gets recreated,
   // otherwise it uses the last generated one
@@ -119,7 +122,7 @@ export class ScanbotBarcodeCameraView extends React.Component<Properties, {}> {
   }
 
   componentDidMount() {
-    Dimensions.addEventListener('change', this.orientationChangeHandler);
+    this.registerDimensionsListener();
     this.previousChildrenIds = this.childrenIds;
     this.sendCommandToCameraView("componentDidMount");
   }
@@ -129,7 +132,7 @@ export class ScanbotBarcodeCameraView extends React.Component<Properties, {}> {
   }
 
   componentWillUnmount() {
-    Dimensions.removeEventListener('change', this.orientationChangeHandler); 
+    this.unregisterDimensionsListener();
     this.previousChildrenIds = [];
     this.sendCommandToCameraView("componentWillUnmount");
   }
@@ -180,6 +183,30 @@ export class ScanbotBarcodeCameraView extends React.Component<Properties, {}> {
     this.cameraViewReference = React.createRef();
   };
 
+  registerDimensionsListener() {
+    if (this.usesEmitterSubscription()) {
+      this.dimensionsChangeSubscription = Dimensions.addEventListener('change', this.orientationChangeHandler) as unknown as EmitterSubscription;
+    } else {
+      Dimensions.addEventListener('change', this.orientationChangeHandler);
+    }
+  }
+
+  unregisterDimensionsListener() {
+    if (this.usesEmitterSubscription()) {
+      if (this.dimensionsChangeSubscription) {
+        this.dimensionsChangeSubscription.remove();
+      }
+    } else {
+      (Dimensions as any).removeEventListener('change', this.orientationChangeHandler);
+    }
+  }
+
+  // Since React Native 0.70 the method removeEventListener has been removed in favour of EmitterSubscription (returned by addEventListener)
+  // .remove() method; here we check if removeEventListener still exists in Dimensions to check if React Native < 0.70 is used
+  usesEmitterSubscription(): boolean {
+    return (Dimensions as any).removeEventListener == null || (Dimensions as any).removeEventListener == undefined;
+  }
+
   sendCommandToCameraView = (command: string, args: any = []) => {
     const viewId = findNodeHandle(this.cameraViewReference.current);
     if (!viewId) {

package/android/build/.transforms/8cdb68f56773f65afa4976aa86d988f7.bin

@@ -1 +0,0 @@
-o/classes

package/android/build/.transforms/991094845a707011dcf91007d9838bb7.bin

@@ -1 +0,0 @@
-o/classes

package/android/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/mayankpatil/Mayank/Projects/SBReactNative/scanbot-barcode-sdk-react-native/android/src/main/jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/mayankpatil/Mayank/Projects/SBReactNative/scanbot-barcode-sdk-react-native/android/src/debug/jniLibs"/></dataSet></merger>

package/android/build/intermediates/incremental/mergeDebugShaders/merger.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/mayankpatil/Mayank/Projects/SBReactNative/scanbot-barcode-sdk-react-native/android/src/main/shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/mayankpatil/Mayank/Projects/SBReactNative/scanbot-barcode-sdk-react-native/android/src/debug/shaders"/></dataSet></merger>

package/android/build/intermediates/incremental/packageDebugAssets/merger.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/mayankpatil/Mayank/Projects/SBReactNative/scanbot-barcode-sdk-react-native/android/src/main/assets"/><source path="/Users/mayankpatil/Mayank/Projects/SBReactNative/scanbot-barcode-sdk-react-native/android/build/intermediates/shader_assets/debug/compileDebugShaders/out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/mayankpatil/Mayank/Projects/SBReactNative/scanbot-barcode-sdk-react-native/android/src/debug/assets"/></dataSet></merger>

package/android/build/intermediates/packaged_res/debug/drawable/ic_baseline_arrow_back_24.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
-</vector>