react-native-scanbot-barcode-scanner-sdk 4.2.0 → 4.3.0-beta.2

package/Libraries.txt

@@ -1,4 +1,4 @@
-Open Source libraries used in the Scanbot Barcode SDK for React Native version 4.2.0
+Open Source libraries used in the Scanbot Barcode SDK for React Native version 4.3.0
 
 ```text
 Open Source libraries used in the Scanbot Barcode Scanner SDK for iOS version 4.2.2:
@@ -78,7 +78,7 @@ record keeping.)
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -133,21 +133,21 @@ record keeping.)
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -162,10 +162,10 @@ record keeping.)
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -177,7 +177,7 @@ record keeping.)
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -831,7 +831,7 @@ JSON for Modern C++
 Version v3.11.2
 (https://github.com/nlohmann/json)
 
-MIT License 
+MIT License
 
 Copyright (c) 2013-2022 Niels Lohmann
 
@@ -902,18 +902,18 @@ Copyright (C) 2007-2009 Antony Dovgal
 
 This software is provided 'as-is', without any express or implied warranty.
 
-In no event will the authors be held liable for any damages arising from the 
+In no event will the authors be held liable for any damages arising from the
 use of this software.
 
-Permission is granted to anyone to use this software for any purpose,including 
-commercial applications, and to alter it and redistribute it freely, subject 
+Permission is granted to anyone to use this software for any purpose,including
+commercial applications, and to alter it and redistribute it freely, subject
 to the following restrictions:
 
- 1. The origin of this software must not be misrepresented; you must not claim 
-    that you wrote the original software. If you use this software in a 
-    product, an acknowledgment in the product documentation would be 
+ 1. The origin of this software must not be misrepresented; you must not claim
+    that you wrote the original software. If you use this software in a
+    product, an acknowledgment in the product documentation would be
     appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be 
+ 2. Altered source versions must be plainly marked as such, and must not be
     misrepresented as being the original software.
  3. This notice may not be removed or altered from any source distribution.
 
@@ -1212,7 +1212,7 @@ Version 4.2.0
 Copyright (c) 1988-1997 Sam Leffler
 Copyright (c) 1991-1997 Silicon Graphics, Inc.
 
-Permission to use, copy, modify, distribute, and sell this software and 
+Permission to use, copy, modify, distribute, and sell this software and
 its documentation for any purpose is hereby granted without fee, provided
 that (i) the above copyright notices and this permission notice appear in
 all copies of the software and related documentation, and (ii) the names of
@@ -1220,15 +1220,15 @@ Sam Leffler and Silicon Graphics may not be used in any advertising or
 publicity relating to the software without the specific, prior written
 permission of Sam Leffler and Silicon Graphics.
 
-THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, 
-EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY 
-WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  
+THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
 
 IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
 ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
 OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF 
-LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
+WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
 OF THIS SOFTWARE.
 
 
@@ -1529,7 +1529,7 @@ Version 1.1.1t
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -1584,21 +1584,21 @@ Version 1.1.1t
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -1613,10 +1613,10 @@ Version 1.1.1t
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -1628,7 +1628,7 @@ Version 1.1.1t
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -1646,7 +1646,7 @@ Version v1.9.2
 
 The MIT License (MIT)
 
-Copyright (c) 2016 Gabi Melman.                                       
+Copyright (c) 2016 Gabi Melman.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -4882,4 +4882,4 @@ Version 1.1.0
    See the License for the specific language governing permissions and
    limitations under the License.
 
-```   
+```

package/RNScanbotBarcodeSDK.podspec

@@ -1,5 +1,3 @@
-# AUTOGENERATED: DO NOT MODIFY MANUALLY 
-
 require "json"
 
 package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
@@ -15,8 +13,7 @@ Pod::Spec.new do |s|
   s.license      = { :type => 'Commercial' }
   s.platforms    = { :ios => "13.0" }
 
-  
-  s.source = { :http => 'https://download.scanbot.io/barcode-scanner-sdk/react-native/react-native-scanbot-barcode-scanner-sdk-' + package['version'] + '.tgz' }    
+  s.source = { :http => 'https://download.scanbot.io/barcode-scanner-sdk/react-native/react-native-scanbot-barcode-scanner-sdk-' + package['version'] + '.tgz' }
   s.source_files = "ios/**/*.{h,m,mm,swift}"
   s.requires_arc = true
 

package/android/build.gradle

@@ -17,10 +17,9 @@ buildscript {
   repositories {
     google()
     gradlePluginPortal()
-    jcenter()
     mavenCentral()
   }
-  
+
   def kotlin_version = safeExtGet('ScanbotBarcodeScannerSdk_kotlinVersion', '1.7.20')
 
   dependencies {
@@ -47,9 +46,12 @@ android {
     sourceSets {
         main {
             if (isNewArchitectureEnabled()) {
-                java.srcDirs += ['src/new-architecture']
+                java.srcDirs += [
+                "src/newarch",
+                 "${project.buildDir}/generated/source/codegen/java"
+                ]
             } else {
-                java.srcDirs += ['src/old-architecture']
+                java.srcDirs += ["src/oldarch"]
             }
         }
     }
@@ -69,7 +71,6 @@ repositories {
     mavenLocal()
     mavenCentral()
     google()
-    jcenter()
 
     // Scanbot SDK Maven Repositories (NEXUS)
     maven {

package/android/src/main/java/io/scanbot/barcodesdk/plugin/reactnative/ScanbotBarcodeSdkPackage.kt

@@ -9,15 +9,17 @@ import com.facebook.react.ReactPackage
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.uimanager.ViewManager
+import io.scanbot.barcodesdk.plugin.reactnative.components.barcode_scanner_view.ScanbotBarcodeScannerViewManager
 
-import io.scanbot.barcodesdk.plugin.reactnative.components.barcodecameraview.ScanbotBarcodeCameraViewManager
 
 class ScanbotBarcodeSdkPackage : ReactPackage {
-    override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
-        return listOf<NativeModule>(ScanbotBarcodeSdkModule(reactContext))
-    }
+  override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
+    return listOf(ScanbotBarcodeSdkModule(reactContext))
+  }
 
-    override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
-        return listOf<ViewManager<*, *>>(ScanbotBarcodeCameraViewManager())
-    }
+  override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
+    val viewManagers: MutableList<ViewManager<*, *>> = ArrayList()
+    viewManagers.add(ScanbotBarcodeScannerViewManager())
+    return viewManagers
+  }
 }

package/android/src/main/java/io/scanbot/barcodesdk/plugin/reactnative/components/barcode_scanner_view/ScanbotBarcodeScannerView.kt

@@ -0,0 +1,114 @@
+package io.scanbot.barcodesdk.plugin.reactnative.components.barcode_scanner_view
+
+import android.Manifest
+import android.app.Activity
+import android.content.Context
+import android.content.pm.PackageManager
+import android.util.AttributeSet
+import android.view.View
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat
+import com.facebook.react.bridge.LifecycleEventListener
+import com.facebook.react.bridge.ReactContext
+import com.facebook.react.uimanager.UIManagerHelper
+import io.scanbot.sdk.barcode.ScanbotBarcodeDetector
+import io.scanbot.sdk.barcode.ui.BarcodeScannerView
+import io.scanbot.sdk.barcode.ui.IBarcodeScannerViewCallback
+import io.scanbot.sdk.barcode_scanner.ScanbotBarcodeScannerSDK
+import io.scanbot.sdk.camera.CaptureInfo
+import io.scanbot.sdk.camera.FrameHandlerResult
+import io.scanbot.sdk.ui.camera.CameraUiSettings
+
+class ScanbotBarcodeScannerView : FrameLayout {
+  constructor(context: Context) : super(context)
+  constructor(context: Context, attrs: AttributeSet?) : super(context, attrs)
+  constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(
+    context,
+    attrs,
+    defStyleAttr
+  )
+
+  var barcodeScanner: BarcodeScannerView
+  var barcodeDetector: ScanbotBarcodeDetector
+  var flashState: Boolean = false
+
+  init {
+    barcodeDetector = ScanbotBarcodeScannerSDK(context).createBarcodeDetector()
+    barcodeScanner = BarcodeScannerView(context).apply {
+      initCamera(CameraUiSettings(true))
+      initDetectionBehavior(barcodeDetector, {
+        if (it is FrameHandlerResult.Success) {
+          it.value?.let { result ->
+            sendEvent(BarcodeScannerResultEvent(result))
+          }
+        }
+        false
+      }, object : IBarcodeScannerViewCallback {
+        override fun onCameraOpen() {
+          viewController.useFlash(flashState)
+        }
+
+        override fun onPictureTaken(image: ByteArray, captureInfo: CaptureInfo) {
+        }
+
+      })
+      viewController.barcodeDetectionInterval = 0
+
+      (context as ReactContext).addLifecycleEventListener(object : LifecycleEventListener {
+        override fun onHostResume() {
+          checkPermission()
+          viewController.onResume()
+        }
+
+        override fun onHostPause() {
+          viewController.onPause()
+        }
+
+        override fun onHostDestroy() {
+
+        }
+      })
+    }
+
+    layoutParams = ViewGroup.LayoutParams(
+      ViewGroup.LayoutParams.MATCH_PARENT,
+      ViewGroup.LayoutParams.MATCH_PARENT,
+    )
+    addView(barcodeScanner)
+  }
+
+  override fun requestLayout() {
+    super.requestLayout()
+    post {
+      layoutView()
+    }
+  }
+
+  private fun View.layoutView() {
+    measure(
+      MeasureSpec.makeMeasureSpec(measuredWidth, MeasureSpec.EXACTLY),
+      MeasureSpec.makeMeasureSpec(measuredHeight, MeasureSpec.EXACTLY)
+    )
+    layout(left, top, right, bottom)
+  }
+
+  private fun sendEvent(event: BaseEvent) {
+    val surfaceId = UIManagerHelper.getSurfaceId(this)
+    val eventDispatcher =
+      UIManagerHelper.getEventDispatcherForReactTag((context as ReactContext), id)
+    eventDispatcher?.dispatchEvent(ComponentEvent(event, surfaceId, id))
+  }
+
+  private fun checkPermission() {
+    val activity: Activity = (context as ReactContext).currentActivity ?: return
+    if (ContextCompat.checkSelfPermission(
+        activity,
+        Manifest.permission.CAMERA
+      ) != PackageManager.PERMISSION_GRANTED
+    ) {
+      ActivityCompat.requestPermissions(activity, arrayOf(Manifest.permission.CAMERA), 3000)
+    }
+  }
+}

package/android/src/main/java/io/scanbot/barcodesdk/plugin/reactnative/components/barcode_scanner_view/ScanbotBarcodeScannerViewEvents.kt

@@ -0,0 +1,56 @@
+package io.scanbot.barcodesdk.plugin.reactnative.components.barcode_scanner_view
+
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.uimanager.events.Event
+import io.scanbot.barcodesdk.plugin.reactnative.extensions.toWritableMap
+import io.scanbot.sdk.barcode.entity.BarcodeScanningResult
+import io.scanbot.sdk_wrapper.SBWrapper
+import io.scanbot.sdk_wrapper.barcode.results.SBWrapperBarcodeScannerResult
+import org.json.JSONObject
+
+interface BaseEvent {
+  val eventName: String
+  fun parseData(): WritableMap
+}
+
+class ComponentEvent(
+  private val baseEvent: BaseEvent,
+  sID: Int,
+  vID: Int,
+) : Event<ComponentEvent>(sID, vID) {
+  override fun getEventData(): WritableMap {
+    return baseEvent.parseData()
+  }
+
+  override fun getEventName(): String {
+    return baseEvent.eventName
+  }
+
+  override fun canCoalesce(): Boolean {
+    return false
+  }
+}
+
+class BarcodeScannerResultEvent(
+  private val barcodeResult: BarcodeScanningResult,
+) : BaseEvent {
+
+  companion object {
+    const val NAME = "barcodeScannerResult"
+  }
+
+  override val eventName = NAME
+  override fun parseData(): WritableMap {
+    return Arguments.createMap().apply {
+      putMap(
+        "result", JSONObject(
+          SBWrapper.gson.toJson(
+            SBWrapperBarcodeScannerResult.fromNativeBarcodeResult(barcodeResult)
+          )
+        ).toWritableMap()
+      )
+    }
+
+  }
+}