Merge pull request #43 from doo/ii/update_3_0_2

Update to Barcode SDK 3.0.2

Author: ildar-scanbot

Libraries.txt

@@ -1,4 +1,4 @@
-Open Source libraries used in the Scanbot Barcode Scanner SDK for Android version 3.0.1
+Open Source libraries used in the Scanbot Barcode Scanner SDK for Android version 3.0.2
 
 CWAC-Camera
 
@@ -237,7 +237,7 @@ limitations under the License.
 
 TensorFlow
 
-Version based on GitHub commit 3ae4ccf
+Version based on GitHub commit a4dfb8d1a71
 (https://github.com/tensorflow/tensorflow)
 
 Copyright 2017 The TensorFlow Authors. All Rights Reserved.
@@ -616,3 +616,42 @@ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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.
+
+
+
+XNNPACK
+
+Version based on GitHub commit fb8d1f1b2
+(https://github.com/google/XNNPACK)
+
+BSD License
+
+For XNNPACK software
+
+Copyright (c) Facebook, Inc. and its affiliates. All rights reserved.
+Copyright 2019 Google LLC
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+ * Neither the name Facebook nor the names of its contributors may be used to
+   endorse or promote products derived from this software without specific
+   prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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.

build.gradle

@@ -5,7 +5,7 @@ buildscript {
     ext.targetVersion = 29
     ext.minVersion = 21
     ext.kotlin_version = '1.4.20' // use the same version as SDK does
-    ext.sdkVersion = '3.0.1'
+    ext.sdkVersion = '3.0.2'
     repositories {
         google()
         jcenter()

example_app/src/main/java/io/scanbot/example/sdk/barcode/ui/MainActivity.kt

@@ -16,6 +16,7 @@ import io.scanbot.example.sdk.barcode.model.BarcodeResultRepository
 import io.scanbot.example.sdk.barcode.model.BarcodeTypeRepository
 import io.scanbot.example.sdk.barcode.ui.dialog.ErrorFragment
 import io.scanbot.sap.Status
+import io.scanbot.sdk.barcode.ScanbotBarcodeDetector
 import io.scanbot.sdk.barcode.entity.BarcodeFormat
 import io.scanbot.sdk.barcode.entity.BarcodeScanningResult
 import io.scanbot.sdk.barcode_scanner.ScanbotBarcodeScannerSDK
@@ -34,10 +35,14 @@ class MainActivity : AppCompatActivity() {
         private const val IMPORT_IMAGE_REQUEST_CODE = 911
     }
 
+    private lateinit var barcodeDetector: ScanbotBarcodeDetector
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
+        barcodeDetector = ScanbotBarcodeScannerSDK(this).createBarcodeDetector()
+
         warning_view.isVisible = ScanbotBarcodeScannerSDK(this).licenseInfo.status == Status.StatusTrial
 
         findViewById<View>(R.id.qr_demo).setOnClickListener {
@@ -75,9 +80,7 @@ class MainActivity : AppCompatActivity() {
             imageIntent.type = "image/*"
             imageIntent.action = Intent.ACTION_GET_CONTENT
             imageIntent.putExtra(Intent.EXTRA_LOCAL_ONLY, false)
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
-                imageIntent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, false)
-            }
+            imageIntent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, false)
             startActivityForResult(
                 Intent.createChooser(
                     imageIntent,
@@ -133,7 +136,6 @@ class MainActivity : AppCompatActivity() {
                 showLicenseDialog()
             } else {
                 processGalleryResult(data!!)?.let { bitmap ->
-                    val barcodeDetector = sdk.barcodeDetector()
                     barcodeDetector.modifyConfig { setBarcodeFormats(BarcodeTypeRepository.selectedTypes.toList()) }
                     val result = barcodeDetector.detectFromBitmap(bitmap, 0)
 

example_app/src/main/java/io/scanbot/example/sdk/barcode/ui/QRScanCameraViewActivity.kt

@@ -21,10 +21,7 @@ import io.scanbot.sdk.barcode.BarcodeAutoSnappingController
 import io.scanbot.sdk.barcode.BarcodeDetectorFrameHandler
 import io.scanbot.sdk.barcode.entity.BarcodeScanningResult
 import io.scanbot.sdk.barcode_scanner.ScanbotBarcodeScannerSDK
-import io.scanbot.sdk.camera.CameraOpenCallback
-import io.scanbot.sdk.camera.FrameHandlerResult
-import io.scanbot.sdk.camera.PictureCallback
-import io.scanbot.sdk.camera.ScanbotCameraView
+import io.scanbot.sdk.camera.*
 
 class QRScanCameraViewActivity : AppCompatActivity(), BarcodeDetectorFrameHandler.ResultHandler {
 
@@ -44,16 +41,14 @@ class QRScanCameraViewActivity : AppCompatActivity(), BarcodeDetectorFrameHandle
         cameraView = findViewById(R.id.camera)
         resultView = findViewById(R.id.result)
 
-        cameraView!!.setCameraOpenCallback(object : CameraOpenCallback {
-            override fun onCameraOpened() {
-                cameraView!!.postDelayed({
-                    cameraView!!.useFlash(flashEnabled)
-                    cameraView!!.continuousFocus()
-                }, 300)
-            }
-        })
+        cameraView!!.setCameraOpenCallback {
+            cameraView!!.postDelayed({
+                cameraView!!.useFlash(flashEnabled)
+                cameraView!!.continuousFocus()
+            }, 300)
+        }
 
-        val barcodeDetector = ScanbotBarcodeScannerSDK(this).barcodeDetector()
+        val barcodeDetector = ScanbotBarcodeScannerSDK(this).createBarcodeDetector()
 
         barcodeDetectorFrameHandler = BarcodeDetectorFrameHandler.attach(
             cameraView!!,
@@ -72,8 +67,8 @@ class QRScanCameraViewActivity : AppCompatActivity(), BarcodeDetectorFrameHandle
             BarcodeAutoSnappingController.attach(cameraView!!, barcodeDetectorFrameHandler!!)
         barcodeAutoSnappingController.setSensitivity(1f)
         cameraView?.addPictureCallback(object : PictureCallback() {
-            override fun onPictureTaken(image: ByteArray, imageOrientation: Int) {
-                this@QRScanCameraViewActivity.processPictureTaken(image, imageOrientation)
+            override fun onPictureTaken(image: ByteArray, captureInfo: CaptureInfo) {
+                processPictureTaken(image, captureInfo.imageOrientation)
             }
         })
     }