Merge pull request #58 from doo/dd/EPIC-1506-update-to-SDKv3.0.8

Update to SDK v3.0.8

Author: ildar-scanbot

Libraries.txt

@@ -1,8 +1,8 @@
-Open Source libraries used in the Scanbot Barcode Scanner SDK for Android version 3.0.7
+Open Source libraries used in the Scanbot Barcode Scanner SDK for Android version 3.0.8
 
 CWAC-Camera
 
-Version 0.6.41
+Version 0.6.42
 (https://github.com/doo/cwac-camera)
 (https://github.com/commonsguy/cwac-camera/)
 

build.gradle

@@ -1,35 +1,31 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
     ext.compileVersion = 30
     ext.targetVersion = 30
     ext.minVersion = 21
-    ext.kotlin_version = '1.4.20' // use the same version as SDK does
-    ext.sdkVersion = '3.0.7'
+    ext.kotlin_version = "1.4.20" // use the same version as SDK does
+    ext.sdkVersion = "3.0.8"
+
     repositories {
         google()
-        jcenter()
         mavenCentral()
 
-        maven { url 'https://nexus.scanbot.io/nexus/content/repositories/releases/' }
-        maven { url 'https://nexus.scanbot.io/nexus/content/repositories/snapshots/' }
+        maven { url "https://nexus.scanbot.io/nexus/content/repositories/releases/" }
+        maven { url "https://nexus.scanbot.io/nexus/content/repositories/snapshots/" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
+        classpath('com.android.tools.build:gradle:7.0.4')
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
     }
 }
 
 allprojects {
     repositories {
         google()
-        jcenter()
         mavenCentral()
 
-        maven { url 'https://nexus.scanbot.io/nexus/content/repositories/releases/' }
-        maven { url 'https://nexus.scanbot.io/nexus/content/repositories/snapshots/' }
+        maven { url "https://nexus.scanbot.io/nexus/content/repositories/releases/" }
+        maven { url "https://nexus.scanbot.io/nexus/content/repositories/snapshots/" }
     }
 }
 

example_app/build.gradle

@@ -1,9 +1,10 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
+
+apply plugin: "com.android.application"
+apply plugin: "kotlin-android"
+apply plugin: "kotlin-android-extensions"
+
 android {
     compileSdkVersion compileVersion
-    buildToolsVersion buildToolsVersion
 
     defaultConfig {
         applicationId "io.scanbot.example.sdk.barcode.android"
@@ -20,15 +21,11 @@ android {
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
         }
     }
-    compileOptions {
-        sourceCompatibility 1.8
-        targetCompatibility 1.8
-    }
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8
+        jvmTarget = JavaVersion.VERSION_11
     }
 
     dexOptions {
@@ -38,15 +35,15 @@ android {
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.3.0'
-    implementation 'com.squareup.picasso:picasso:2.71828'
+    implementation(fileTree(dir: "libs", include: ["*.jar"]))
+    implementation("androidx.appcompat:appcompat:1.3.0")
+    implementation("com.squareup.picasso:picasso:2.71828")
 
-    implementation 'androidx.recyclerview:recyclerview:1.2.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation("androidx.recyclerview:recyclerview:1.2.1")
+    implementation("androidx.constraintlayout:constraintlayout:2.0.4")
 
-    implementation "io.scanbot:scanbot-barcode-scanner-sdk:$sdkVersion"
-    implementation "io.scanbot:scanbot-barcode-scanner-sdk-ui:$sdkVersion"
+    implementation("io.scanbot:scanbot-barcode-scanner-sdk:$sdkVersion")
+    implementation("io.scanbot:scanbot-barcode-scanner-sdk-ui:$sdkVersion")
 
-    implementation 'com.google.android.material:material:1.4.0'
+    implementation("com.google.android.material:material:1.4.0")
 }

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

@@ -27,13 +27,11 @@ class BarcodeTypesActivity : AppCompatActivity() {
         val layoutManager = LinearLayoutManager(this)
         typesList.layoutManager = layoutManager
 
-
             val adapter = BarcodeTypesAdapter()
             typesList.adapter = adapter
 
             findViewById<View>(R.id.apply).setOnClickListener { v ->
                 finish()
             }
         }
-
     }

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

@@ -6,6 +6,8 @@ import android.graphics.Bitmap
 import android.os.Bundle
 import android.provider.MediaStore
 import android.view.View
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
@@ -17,22 +19,19 @@ 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
 import io.scanbot.sdk.ui.barcode_scanner.view.barcode.BarcodeScannerActivity
 import io.scanbot.sdk.ui.barcode_scanner.view.barcode.batch.BatchBarcodeScannerActivity
+import io.scanbot.sdk.ui.registerForActivityResultOk
 import io.scanbot.sdk.ui.view.barcode.batch.configuration.BatchBarcodeScannerConfiguration
 import io.scanbot.sdk.ui.view.barcode.configuration.BarcodeImageGenerationType
 import io.scanbot.sdk.ui.view.barcode.configuration.BarcodeScannerConfiguration
 import io.scanbot.sdk.ui.view.base.configuration.CameraOrientationMode
 import kotlinx.android.synthetic.main.activity_main.*
+import kotlinx.android.synthetic.main.activity_qr_camera_view.*
 import java.io.IOException
 
 class MainActivity : AppCompatActivity() {
-    companion object {
-        private const val BARCODE_DEFAULT_UI_REQUEST_CODE = 910
-        private const val IMPORT_IMAGE_REQUEST_CODE = 911
-    }
 
     private lateinit var barcodeDetector: ScanbotBarcodeDetector
 
@@ -62,9 +61,9 @@ class MainActivity : AppCompatActivity() {
                 )
             })
             barcodeCameraConfiguration.setBarcodeImageGenerationType(BarcodeImageGenerationType.NONE)
-            val intent = BarcodeScannerActivity.newIntent(this@MainActivity, barcodeCameraConfiguration)
-            startActivityForResult(intent, BARCODE_DEFAULT_UI_REQUEST_CODE)
+            barcodeResultLauncher.launch(barcodeCameraConfiguration)
         }
+
         findViewById<View>(R.id.rtu_ui_image).setOnClickListener {
             val barcodeCameraConfiguration = BarcodeScannerConfiguration()
             barcodeCameraConfiguration.setBarcodeFormatsFilter(arrayListOf<BarcodeFormat>().also {
@@ -73,9 +72,7 @@ class MainActivity : AppCompatActivity() {
                 )
             })
             barcodeCameraConfiguration.setBarcodeImageGenerationType(BarcodeImageGenerationType.VIDEO_FRAME)
-            val intent =
-                BarcodeScannerActivity.newIntent(this@MainActivity, barcodeCameraConfiguration)
-            startActivityForResult(intent, BARCODE_DEFAULT_UI_REQUEST_CODE)
+            barcodeResultLauncher.launch(barcodeCameraConfiguration)
         }
 
         findViewById<View>(R.id.rtu_ui_import).setOnClickListener {
@@ -85,15 +82,10 @@ class MainActivity : AppCompatActivity() {
             imageIntent.action = Intent.ACTION_GET_CONTENT
             imageIntent.putExtra(Intent.EXTRA_LOCAL_ONLY, false)
             imageIntent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, false)
-            startActivityForResult(
-                Intent.createChooser(
-                    imageIntent,
-                    getString(R.string.share_title)
-                ), IMPORT_IMAGE_REQUEST_CODE
-            )
+            val wrappedIntent = Intent.createChooser(imageIntent, getString(R.string.share_title))
+            importImageResultLauncher.launch(wrappedIntent)
         }
 
-
         findViewById<View>(R.id.rtu_ui_batch_mode).setOnClickListener {
             val barcodeCameraConfiguration = BatchBarcodeScannerConfiguration()
 
@@ -107,9 +99,16 @@ class MainActivity : AppCompatActivity() {
             barcodeCameraConfiguration.setDetailsPrimaryColor(ContextCompat.getColor(this, android.R.color.white))
             barcodeCameraConfiguration.setBarcodesCountTextColor(ContextCompat.getColor(this, android.R.color.white))
             barcodeCameraConfiguration.setOrientationLockMode(CameraOrientationMode.PORTRAIT)
+            barcodeCameraConfiguration.setBarcodeFormatsFilter(arrayListOf<BarcodeFormat>().also {
+                it.addAll(
+                    BarcodeTypeRepository.selectedTypes
+                )
+            })
 
-            val intent = BatchBarcodeScannerActivity.newIntent(this@MainActivity, barcodeCameraConfiguration)
-            startActivityForResult(intent, BARCODE_DEFAULT_UI_REQUEST_CODE)
+            val rtuInput = BatchBarcodeScannerActivity.InputParams(
+                barcodeCameraConfiguration
+            )
+            batchBarcodeResultLauncher.launch(rtuInput)
         }
 
         findViewById<View>(R.id.settings).setOnClickListener {
@@ -118,40 +117,46 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        super.onActivityResult(requestCode, resultCode, data)
-        if (requestCode == BARCODE_DEFAULT_UI_REQUEST_CODE && resultCode == Activity.RESULT_OK) {
-            data?.getParcelableExtra<BarcodeScanningResult>(BarcodeScannerActivity.SCANNED_BARCODE_EXTRA)
-                ?.let {
-                    val imagePath =
-                        data.getStringExtra(BarcodeScannerActivity.SCANNED_BARCODE_IMAGE_PATH_EXTRA)
-                    val previewPath =
-                        data.getStringExtra(BarcodeScannerActivity.SCANNED_BARCODE_PREVIEW_FRAME_PATH_EXTRA)
-
-                    BarcodeResultRepository.barcodeResultBundle =
-                        BarcodeResultBundle(it, imagePath, previewPath)
-
-                    val intent = Intent(this, BarcodeResultActivity::class.java)
-                    startActivity(intent)
-                }
-        } else if (requestCode == IMPORT_IMAGE_REQUEST_CODE && resultCode == Activity.RESULT_OK) {
-            val sdk = ScanbotBarcodeScannerSDK(this)
-            if (!sdk.licenseInfo.isValid) {
-                showLicenseDialog()
-            } else {
-                processGalleryResult(data!!)?.let { bitmap ->
-                    barcodeDetector.modifyConfig { setBarcodeFormats(BarcodeTypeRepository.selectedTypes.toList()) }
-                    val result = barcodeDetector.detectFromBitmap(bitmap, 0)
-
-                    BarcodeResultRepository.barcodeResultBundle =
-                        result?.let { BarcodeResultBundle(it, null, null) }
-
-                    startActivity(Intent(this, BarcodeResultActivity::class.java))
+    private val barcodeResultLauncher: ActivityResultLauncher<BarcodeScannerConfiguration> =
+        registerForActivityResultOk(BarcodeScannerActivity.ResultContract()) { resultEntity ->
+            val imagePath = resultEntity.barcodeImagePath
+            val previewPath = resultEntity.barcodePreviewFramePath
+
+            BarcodeResultRepository.barcodeResultBundle =
+                BarcodeResultBundle(resultEntity.result!!, imagePath, previewPath)
+
+            val intent = Intent(this, BarcodeResultActivity::class.java)
+            startActivity(intent)
+        }
+
+    private val batchBarcodeResultLauncher: ActivityResultLauncher<BatchBarcodeScannerActivity.InputParams> =
+        registerForActivityResultOk(BatchBarcodeScannerActivity.ResultContract()) { resultEntity ->
+            BarcodeResultRepository.barcodeResultBundle =
+                BarcodeResultBundle(resultEntity.result!!)
+
+            val intent = Intent(this, BarcodeResultActivity::class.java)
+            startActivity(intent)
+        }
+
+    private val importImageResultLauncher: ActivityResultLauncher<Intent> =
+        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { activityResult ->
+            if (activityResult.resultCode == Activity.RESULT_OK) {
+                val sdk = ScanbotBarcodeScannerSDK(this)
+                if (!sdk.licenseInfo.isValid) {
+                    showLicenseDialog()
+                } else {
+                    processGalleryResult(activityResult.data!!)?.let { bitmap ->
+                        barcodeDetector.modifyConfig { setBarcodeFormats(BarcodeTypeRepository.selectedTypes.toList()) }
+                        val result = barcodeDetector.detectFromBitmap(bitmap, 0)
+
+                        BarcodeResultRepository.barcodeResultBundle =
+                            result?.let { BarcodeResultBundle(it, null, null) }
+
+                        startActivity(Intent(this, BarcodeResultActivity::class.java))
+                    }
                 }
             }
         }
-    }
-
 
     private fun showLicenseDialog() {
         if (supportFragmentManager.findFragmentByTag(ErrorFragment.NAME) == null) {
@@ -171,5 +176,4 @@ class MainActivity : AppCompatActivity() {
         }
         return bitmap
     }
-
 }

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

@@ -15,7 +15,6 @@ class BarcodeTypesAdapter() :
     RecyclerView.Adapter<BarcodeTypesViewHolder>() {
     val values = BarcodeFormat.ALL_CODES
 
-
     class BarcodeTypesViewHolder(barcodeTypeView: View) : RecyclerView.ViewHolder(barcodeTypeView) {
         var barcodeTypeName: TextView
         var barcodeTypeChecker: CheckBox

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip