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/base/RNScanbotNativeComponentUi.java

@@ -1,131 +0,0 @@
-package io.scanbot.barcodesdk.plugin.reactnative.components.base;
-
-import android.view.View;
-
-import androidx.annotation.NonNull;
-
-import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.bridge.WritableNativeMap;
-
-import io.scanbot.barcodesdk.plugin.reactnative.components.base.communication.RNScanbotEventEmitter;
-import io.scanbot.barcodesdk.plugin.reactnative.components.base.views.RNScanbotNativeComponentRootView;
-
-/**
- * This is the UI component of your custom React Native components.
- * It expects you to return a ScanbotComponentRootView in createRootView.
- * It takes care of attaching listeners and handling layout changes re-measurements.
- */
-public abstract class RNScanbotNativeComponentUi {
-    // The rootView created through createRootView()
-    protected RNScanbotNativeComponentRootView rootView;
-
-    // The React Context
-    protected ReactContext reactContext;
-
-    // Listener to handle the re-layout when children change... they grow up so fast
-    private RNScanbotNativeComponentRootView.IOnChildRemovedListener childRemovedListener;
-    private View.OnAttachStateChangeListener onAttachStateChangeListener;
-    private Runnable onViewRecreated;
-
-    public RNScanbotNativeComponentUi(@NonNull final ReactContext reactContext) { this.reactContext = reactContext; }
-
-    /*
-     * Disposes the component
-     */
-    public void dispose() {
-        if (childRemovedListener != null) {
-            rootView.removeOneShotChildRemovedListener(childRemovedListener);
-        }
-        if (onAttachStateChangeListener != null) {
-            rootView.removeOnAttachStateChangeListener(onAttachStateChangeListener);
-        }
-
-        childRemovedListener = null;
-        onAttachStateChangeListener = null;
-
-        this.rootView = null;
-        this.reactContext = null;
-    }
-
-    /*
-     * Returns the rootView created by createRootView, after performing some UI post operations
-     */
-    public RNScanbotNativeComponentRootView getRootView() {
-        if (this.rootView == null) {
-            this.rootView = createAndSetupRootView();
-            this.notifyViewRecreated();
-        }
-        return this.rootView;
-    }
-
-    public void _setOnViewRecreatedListener(final Runnable runnable) {
-        this.onViewRecreated = runnable;
-    }
-
-    public void removeOnViewRecreatedListener() {
-        this.onViewRecreated = null;
-    }
-
-    private void notifyViewRecreated() {
-        if (this.onViewRecreated == null) {
-            return;
-        }
-        this.onViewRecreated.run();
-    }
-
-    /*
-     * You must construct your view inside this method, and then return it.
-     */
-    protected abstract RNScanbotNativeComponentRootView createRootView(@NonNull final ReactContext reactContext);
-
-    /*
-     * Calls the inheriting class's Root View custom creator, and performs some additional setup to
-     * it, before returning it.
-     */
-    private RNScanbotNativeComponentRootView createAndSetupRootView() {
-        final RNScanbotNativeComponentRootView rootView = createRootView(this.reactContext);
-        onAttachStateChangeListener = new View.OnAttachStateChangeListener() {
-            @Override
-            public void onViewAttachedToWindow(View v) {
-                remeasureViews(rootView, reactContext);
-            }
-
-            @Override
-            public void onViewDetachedFromWindow(View v) {}
-        };
-        rootView.addOnAttachStateChangeListener(onAttachStateChangeListener);
-        return rootView;
-    }
-
-    /*
-     * UI Thread: Remeasures and layouts the views
-     */
-    public void remeasureViews(
-            @NonNull final RNScanbotNativeComponentRootView rootView,
-            @NonNull final ReactContext reactContext
-    ) {
-        reactContext.runOnUiQueueThread(() -> {
-            // The view is remeasured as soon as it is attached to the window
-            rootView.post(rootView.measureAndLayout);
-
-            // Runs custom logic that has to be performed after the remeasuring of the views
-            rootView.post(this::onViewsRemeasured);
-
-            // Take care of your children
-            if (childRemovedListener != null) {
-                rootView.removeOneShotChildRemovedListener(childRemovedListener);
-            }
-            childRemovedListener = child -> new RNScanbotEventEmitter(reactContext, rootView)
-                    .emitEvent(
-                            RNScanbotEventEmitter.CommonEvents.REQUEST_COMPONENT_RELOAD,
-                            new WritableNativeMap());
-            rootView.addOneShotChildRemovedListener(childRemovedListener);
-        });
-    }
-
-    /**
-     *  Called after the remeasuring of the views has been completed. Override this if you want
-     *  to apply some custom UI logic in that point of the lifecycle.
-     */
-    protected void onViewsRemeasured() {}
-}

package/android/src/main/java/io/scanbot/barcodesdk/plugin/reactnative/components/base/views/RNScanbotNativeComponentFrameLayout.java

@@ -1,53 +0,0 @@
-package io.scanbot.barcodesdk.plugin.reactnative.components.base.views;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.widget.FrameLayout;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class RNScanbotNativeComponentFrameLayout extends FrameLayout {
-
-    interface ILayoutChangeListener {
-        void onFrameLayoutChanged(int width, int height, int left, int top, int right, int bottom);
-    }
-
-    public RNScanbotNativeComponentFrameLayout(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public RNScanbotNativeComponentFrameLayout(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-    }
-
-    public final Runnable measureAndLayout =
-            new Runnable() {
-                @Override
-                public void run() {
-                    measure(
-                            MeasureSpec.makeMeasureSpec(getWidth(), MeasureSpec.EXACTLY),
-                            MeasureSpec.makeMeasureSpec(getHeight(), MeasureSpec.EXACTLY));
-                    layout(getLeft(), getTop(), getRight(), getBottom());
-                    notifyListeners(getWidth(), getHeight(), getLeft(), getTop(), getRight(), getBottom());
-                }
-            };
-
-    private final List<ILayoutChangeListener> layoutChangeListeners = new ArrayList<>();
-
-    @Override
-    public void requestLayout() {
-        super.requestLayout();
-        post(measureAndLayout);
-    }
-
-    public void addLayoutChangeListener(ILayoutChangeListener listener) {
-        layoutChangeListeners.add(listener);
-    }
-
-    private void notifyListeners(int width, int height, int left, int top, int right, int bottom) {
-        for(ILayoutChangeListener listener : layoutChangeListeners) {
-            listener.onFrameLayoutChanged(width, height, left, top, right, bottom);
-        }
-    }
-}

package/android/src/main/java/io/scanbot/barcodesdk/plugin/reactnative/components/base/views/RNScanbotNativeComponentRootView.java

@@ -1,154 +0,0 @@
-package io.scanbot.barcodesdk.plugin.reactnative.components.base.views;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.Choreographer;
-import android.view.MotionEvent;
-import android.view.View;
-import android.widget.FrameLayout;
-
-import com.facebook.react.ReactRootView;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.List;
-
-public class RNScanbotNativeComponentRootView extends ReactRootView {
-
-    public interface ILayoutChangeListener {
-        void onFrameLayoutChanged(int width, int height, int left, int top, int right, int bottom);
-    }
-
-    public interface IOnChildRemovedListener {
-        void onChildRemoved(final View child);
-    }
-
-    public final Runnable measureAndLayout = () -> {
-        measure(
-                MeasureSpec.makeMeasureSpec(getWidth(), MeasureSpec.EXACTLY),
-                MeasureSpec.makeMeasureSpec(getHeight(), MeasureSpec.EXACTLY));
-        layout(getLeft(), getTop(), getRight(), getBottom());
-        notifyLayoutChangeListeners(getWidth(), getHeight(), getLeft(), getTop(), getRight(), getBottom());
-    };
-
-    private final List<ILayoutChangeListener> layoutChangeListeners = new ArrayList<>();
-    private final List<IOnChildRemovedListener> childRemovedListeners = new ArrayList<>();
-    private boolean shouldNotifyWhenChildIsRemoved = false;
-
-    public RNScanbotNativeComponentRootView(Context context) {
-        super(context);
-        instantiate();
-    }
-
-    public RNScanbotNativeComponentRootView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        instantiate();
-    }
-
-    public RNScanbotNativeComponentRootView(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-        instantiate();
-    }
-
-    private void instantiate() {}
-
-    @Override
-    protected void onAttachedToWindow() {
-        super.onAttachedToWindow();
-        applyChildrenMeasureWorkaround();
-    }
-
-    public void applyChildrenMeasureWorkaround() {
-        Choreographer.getInstance().postFrameCallback(frameTimeNanos -> {
-            for (int i = 0; i < getChildCount(); i++) {
-                View child = getChildAt(i);
-                if (child instanceof FrameLayout) {
-                    child.measure(MeasureSpec.makeMeasureSpec(getMeasuredWidth(), MeasureSpec.EXACTLY),
-                            MeasureSpec.makeMeasureSpec(getMeasuredHeight(), MeasureSpec.EXACTLY));
-                    child.layout(0, 0, child.getMeasuredWidth(), child.getMeasuredHeight());
-                }
-            }
-            getViewTreeObserver().dispatchOnGlobalLayout();
-            shouldNotifyWhenChildIsRemoved = true;
-        });
-    }
-
-    @Override
-    public boolean onInterceptTouchEvent(MotionEvent ev) {
-        return super.onInterceptTouchEvent(ev);
-    }
-
-    @Override
-    public void requestLayout() {
-        super.requestLayout();
-        post(measureAndLayout);
-    }
-
-    public void addLayoutChangeListener(ILayoutChangeListener listener) {
-        layoutChangeListeners.add(listener);
-    }
-
-    public void addOneShotChildRemovedListener(IOnChildRemovedListener listener) {
-        if (!childRemovedListeners.contains(listener)) {
-            childRemovedListeners.add(listener);
-        }
-    }
-
-    public void removeOneShotChildRemovedListener(IOnChildRemovedListener listener) {
-        childRemovedListeners.remove(listener);
-    }
-
-    private void notifyLayoutChangeListeners(int width, int height, int left, int top, int right, int bottom) {
-        for(ILayoutChangeListener listener : layoutChangeListeners) {
-            listener.onFrameLayoutChanged(width, height, left, top, right, bottom);
-        }
-    }
-
-    private void notifyChildRemovedListeners(final View childView) {
-//        if (!shouldNotifyWhenChildIsRemoved) {
-//            return;
-//        }
-//      -> Might be useful one day
-//        for (IOnChildRemovedListener listener : childRemovedListeners) {
-//            if (!lastNotifiedChildViews.contains(childView)) {
-//                listener.onChildRemoved(childView);
-//                lastNotifiedChildViews.add(childView);
-//            } else {
-//                lastNotifiedChildViews.clear();
-//            }
-//        }
-//
-//        childRemovedListeners.clear();
-    }
-
-    @Override
-    public void onViewAdded(View child) {
-        super.onViewAdded(child);
-        child.bringToFront();
-        child.setZ(2.0f);
-    }
-
-    /**
-     * Called when a child view is removed from this ViewGroup. Overrides should always
-     * call super.onViewRemoved.
-     *
-     * @param child the removed child view
-     */
-    @Override
-    public void onViewRemoved(View child) {
-        super.onViewRemoved(child);
-        notifyChildRemovedListeners(child);
-    }
-
-    @Override
-    public void onAttachedToReactInstance() {
-        super.onAttachedToReactInstance();
-        shouldNotifyWhenChildIsRemoved = false;
-    }
-
-    @Override
-    protected void onDetachedFromWindow() {
-        super.onDetachedFromWindow();
-        shouldNotifyWhenChildIsRemoved = false;
-    }
-}

package/android/src/main/res/layout/component_barcode_camera_view.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<io.scanbot.barcodesdk.plugin.reactnative.components.base.views.RNScanbotNativeComponentRootView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:descendantFocusability="afterDescendants"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    <io.scanbot.barcodesdk.plugin.reactnative.components.base.views.RNScanbotNativeComponentFrameLayout
-        android:id="@+id/barcode_camera_layout"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <io.scanbot.sdk.ui.camera.ScanbotCameraXView
-            android:id="@+id/barcode_camera"
-            android:orientation="vertical"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@android:color/black"
-            app:finder_view_id="@id/barcode_finder_overlay"/>
-
-        <io.scanbot.sdk.ui.camera.FinderOverlayView
-            android:id="@+id/barcode_finder_overlay"
-            app:min_padding="64dp"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
-    </io.scanbot.barcodesdk.plugin.reactnative.components.base.views.RNScanbotNativeComponentFrameLayout>
-</io.scanbot.barcodesdk.plugin.reactnative.components.base.views.RNScanbotNativeComponentRootView>

package/android/src/main/res/layout/fragment_barcode_scanner.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<io.scanbot.barcodesdk.plugin.reactnative.components.common.ScanbotComponentFrameLayout
-    android:id="@+id/barcode_camera_layout"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <io.scanbot.sdk.camera.ScanbotCameraView
-        android:id="@+id/barcode_camera"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@android:color/black"
-        app:finder_view_id="@id/barcode_finder_overlay"/>
-
-    <io.scanbot.sdk.ui.camera.FinderOverlayView
-        android:id="@+id/barcode_finder_overlay"
-        app:min_padding="64dp"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-</io.scanbot.barcodesdk.plugin.reactnative.components.common.ScanbotComponentFrameLayout>

package/ios/ScanbotBarcodeSdk.xcodeproj/xcuserdata/mayankpatil.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>SchemeUserState</key>
-	<dict>
-		<key>ScanbotBarcodeSdk.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>0</integer>
-		</dict>
-	</dict>
-</dict>
-</plist>