[EPIC-5458] Android ds 7.0.0

.gitignore

@@ -31,7 +31,8 @@ proguard/
 *.iml
 *.ipr
 *.iws
-.idea/
+*/.idea/*
+!*/.idea/codeStyles/
 .DS_Store
 
 .gradle/

Libraries.txt

@@ -1,4 +1,4 @@
-Open Source libraries used in the Scanbot SDK for Android version 6.2.1
+Open Source libraries used in the Scanbot SDK for Android version 7.0.0
 
 CWAC-Camera
 

classic-components-example/adjustable-filters/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
+<uses-permission android:name="android.permission.POST_NOTIFICATIONS"   />
     <application
         android:name=".ExampleApplication"
         android:allowBackup="true"

classic-components-example/adjustable-filters/src/main/java/io/scanbot/example/FilterActivity.kt

@@ -13,6 +13,7 @@ import com.squareup.picasso.Callback
 import com.squareup.picasso.MemoryPolicy
 import com.squareup.picasso.Picasso
 import io.scanbot.example.common.Const
+import io.scanbot.example.common.applyEdgeToEdge
 import io.scanbot.example.common.showToast
 import io.scanbot.example.databinding.ActivityFiltersTunesBinding
 import io.scanbot.example.fragment.ErrorFragment
@@ -53,6 +54,7 @@ class FilterActivity : AppCompatActivity(), FiltersListener {
         super.onCreate(savedInstanceState)
         setContentView(binding.root)
         initActionBar()
+        applyEdgeToEdge(findViewById(R.id.root_view))
 
         scanbotSdk = ScanbotSDK(application)
 

classic-components-example/adjustable-filters/src/main/java/io/scanbot/example/MainActivity.kt

@@ -10,10 +10,10 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
 import io.scanbot.example.common.Const
+import io.scanbot.example.common.applyEdgeToEdge
 import io.scanbot.example.common.showToast
 import io.scanbot.example.databinding.ActivityMainBinding
 import io.scanbot.sdk.ScanbotSDK
-import io.scanbot.sdk.core.contourdetector.DocumentDetectionStatus
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -38,7 +38,7 @@ class MainActivity : AppCompatActivity() {
         }
 
         lifecycleScope.launch {
-            val documentId = createAndDetectDocumentPage(uri)
+            val documentId = createAndScanDocumentPage(uri)
 
             if (documentId != null) {
                 filterActivityResultLauncher.launch(FilterActivity.newIntent(this@MainActivity, documentId))
@@ -77,13 +77,16 @@ class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(binding.root)
+        supportActionBar?.hide()
+
+        applyEdgeToEdge(findViewById(R.id.root_view))
 
         binding.importFromLibBtn.setOnClickListener {
             selectGalleryImageResultLauncher.launch(PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly))
         }
     }
 
-    private suspend fun createAndDetectDocumentPage(imageUri: Uri): String? {
+    private suspend fun createAndScanDocumentPage(imageUri: Uri): String? {
         val bitmap = withContext(Dispatchers.IO) {
             val inputStream = contentResolver.openInputStream(imageUri)
             BitmapFactory.decodeStream(inputStream)
@@ -104,29 +107,29 @@ class MainActivity : AppCompatActivity() {
 
         binding.progressBar.visibility = View.VISIBLE
         val resultDocument = withContext(Dispatchers.Default) {
-            val contourResult = sdk.createContourDetector().detect(bitmap)
+            val result = sdk.createDocumentScanner().scanFromBitmap(bitmap)
 
-            if (contourResult == null) {
-                Log.e(Const.LOG_TAG, "Error detecting document (result is `null`)!")
-                showToast("Error detecting document!")
+            if (result == null) {
+                Log.e(Const.LOG_TAG, "Error finding document (result is `null`)!")
+                showToast("Error finding document!")
                 return@withContext null
             }
-            Log.d(Const.LOG_TAG, "Doc detected: ${contourResult.status}")
+            Log.d(Const.LOG_TAG, "Doc found: ${result.status}")
 
             /** We allow all `OK_*` [statuses][DocumentDetectionStatus] just for purpose of this example.
              * Otherwise it is a good practice to differentiate between statuses and handle them accordingly.
              */
-            val isDetectionOk = contourResult.status.name.startsWith("OK", true)
-            if (isDetectionOk.not()) {
-                Log.e(Const.LOG_TAG, "Bad document photo - detection status was ${contourResult.status.name}!")
-                showToast("Bad document photo - status ${contourResult.status.name}!")
+            val isScanOk = result.status.name.startsWith("OK", true)
+            if (isScanOk.not()) {
+                Log.e(Const.LOG_TAG, "Bad document photo - scanning status was ${result.status.name}!")
+                showToast("Bad document photo - status ${result.status.name}!")
                 return@withContext null
             }
 
             val document = sdk.documentApi.createDocument()
             val page = document.addPage(bitmap)
             Log.d(Const.LOG_TAG, "Page added: ${page.uuid}")
-            page.apply(newPolygon = contourResult.polygonF)
+            page.apply(newPolygon = result.pointsNormalized)
             document
         }
 

classic-components-example/adjustable-filters/src/main/res/layout/activity_filters_tunes.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/relativeLayout"
+    android:id="@+id/root_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">

classic-components-example/adjustable-filters/src/main/res/layout/activity_main.xml

@@ -1,5 +1,6 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/root_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:padding="10dp"

classic-components-example/barcode-scanner/src/main/AndroidManifest.xml

@@ -5,6 +5,7 @@
 
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <uses-feature android:name="android.hardware.camera" />
 

classic-components-example/barcode-scanner/src/main/java/io/scanbot/example/model/BarcodeResultBundle.kt

@@ -1,9 +1,9 @@
 package io.scanbot.example.model
 
-import io.scanbot.sdk.barcode.entity.BarcodeScanningResult
+import io.scanbot.sdk.barcode.BarcodeScannerResult
 
 data class BarcodeResultBundle(
-    val barcodeScanningResult: BarcodeScanningResult,
+    val barcodeScanningResult: BarcodeScannerResult,
     val imagePath: String? = null,
     val previewPath: String? = null
 )

classic-components-example/barcode-scanner/src/main/java/io/scanbot/example/repository/BarcodeResultRepository.kt

@@ -1,7 +1,7 @@
 package io.scanbot.example.repository
 
 import io.scanbot.example.model.BarcodeResultBundle
-import io.scanbot.sdk.barcode.entity.BarcodeItem
+import io.scanbot.sdk.barcode.BarcodeItem
 
 object BarcodeResultRepository {
     var barcodeResultBundle: BarcodeResultBundle? = null

classic-components-example/barcode-scanner/src/main/java/io/scanbot/example/repository/BarcodeTypeRepository.kt

@@ -1,10 +1,12 @@
 package io.scanbot.example.repository
 
-import io.scanbot.sdk.barcode.entity.BarcodeFormat
+import io.scanbot.sdk.barcode.BarcodeFormat
+import io.scanbot.sdk.barcode.BarcodeFormats
+
 
 object BarcodeTypeRepository {
     val selectedTypes = mutableSetOf<BarcodeFormat>().also {
-        it.addAll(BarcodeFormat.COMMON_CODES)
+        it.addAll(BarcodeFormats.common)
     }
 
     fun selectType(type: BarcodeFormat) {

classic-components-example/barcode-scanner/src/main/java/io/scanbot/example/ui/BarcodeResultActivity.kt

@@ -3,13 +3,20 @@ package io.scanbot.example.ui
 import android.content.Intent
 import android.os.Bundle
 import android.view.View
+import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updateLayoutParams
 import com.squareup.picasso.Picasso
+import io.scanbot.example.R
+import io.scanbot.example.common.applyEdgeToEdge
 import io.scanbot.example.databinding.ActivityBarcodeResultBinding
 import io.scanbot.example.databinding.BarcodeItemBinding
 import io.scanbot.example.databinding.SnapImageItemBinding
 import io.scanbot.example.repository.BarcodeResultRepository
-import io.scanbot.sdk.barcode.entity.BarcodeScanningResult
+import io.scanbot.sdk.barcode.BarcodeScannerResult
+import io.scanbot.sdk.barcode.textWithExtension
 import java.io.File
 
 class BarcodeResultActivity : AppCompatActivity() {
@@ -21,6 +28,8 @@ class BarcodeResultActivity : AppCompatActivity() {
         setContentView(binding.root)
         setSupportActionBar(binding.toolbar)
 
+        applyEdgeToEdge(findViewById(R.id.root_view))
+
         showSnapImageIfExists(
             BarcodeResultRepository.barcodeResultBundle?.previewPath
                 ?: BarcodeResultRepository.barcodeResultBundle?.imagePath
@@ -31,10 +40,10 @@ class BarcodeResultActivity : AppCompatActivity() {
 
     private fun showSnapImageIfExists(imagePath: String?) {
         imagePath?.let { path ->
-            binding.recognisedItems.addView(
+            binding.scannedItems.addView(
                 SnapImageItemBinding.inflate(
                     layoutInflater,
-                    binding.recognisedItems,
+                    binding.scannedItems,
                     false
                 ).also {
                     Picasso.get().load(File(path)).into(it.snapImage)
@@ -43,20 +52,20 @@ class BarcodeResultActivity : AppCompatActivity() {
         }
     }
 
-    private fun showLatestBarcodeResult(detectedBarcodes: BarcodeScanningResult?) {
-        detectedBarcodes?.let {
-            detectedBarcodes.barcodeItems.asSequence().map { item ->
-                BarcodeItemBinding.inflate(layoutInflater, binding.recognisedItems, false)
+    private fun showLatestBarcodeResult(scannedBarcodes: BarcodeScannerResult?) {
+        scannedBarcodes?.let {
+            scannedBarcodes.barcodes.asSequence().map { item ->
+                BarcodeItemBinding.inflate(layoutInflater, binding.scannedItems, false)
                     .also {
-                        item.image?.let { bitmap ->
-                            it.image.setImageBitmap(bitmap)
+                        item.sourceImage?.let { image ->
+                            it.image.setImageBitmap(image.toBitmap())
                         }
-                        it.barcodeFormat.text = item.barcodeFormat.name
-                        it.docFormat.text = item.formattedResult?.let {
+                        it.barcodeFormat.text = item.format.name
+                        it.docFormat.text = item.extractedDocument?.let {
                             it::class.java.simpleName
                         } ?: "Unknown document"
                         it.docFormat.visibility =
-                            if (item.formattedResult != null) View.VISIBLE else View.GONE
+                            if (item.extractedDocument != null) View.VISIBLE else View.GONE
                         it.docText.text = item.textWithExtension
                         it.root.setOnClickListener {
                             val intent = Intent(this, DetailedItemDataActivity::class.java)
@@ -65,7 +74,7 @@ class BarcodeResultActivity : AppCompatActivity() {
                         }
                     }
             }.forEach {
-                binding.recognisedItems.addView(it.root)
+                binding.scannedItems.addView(it.root)
             }
         }
     }

classic-components-example/barcode-scanner/src/main/java/io/scanbot/example/ui/BarcodeScanAndCountViewActivity.kt

@@ -7,18 +7,25 @@ import android.graphics.RectF
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
 import android.widget.Button
 import android.widget.ImageView
 import android.widget.TextView
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
+import androidx.core.view.ViewCompat
 import androidx.core.view.WindowCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updateLayoutParams
 import io.scanbot.example.R
+import io.scanbot.example.common.applyEdgeToEdge
 import io.scanbot.example.repository.BarcodeTypeRepository
 import io.scanbot.sdk.ScanbotSDK
-import io.scanbot.sdk.barcode.entity.BarcodeItem
+import io.scanbot.sdk.barcode.BarcodeItem
+import io.scanbot.sdk.barcode.setBarcodeFormats
+import io.scanbot.sdk.barcode.textWithExtension
 import io.scanbot.sdk.barcode.ui.BarcodePolygonsStaticView
 import io.scanbot.sdk.barcode.ui.BarcodeScanAndCountView
 import io.scanbot.sdk.barcode.ui.IBarcodeScanCountViewCallback
@@ -36,16 +43,17 @@ class BarcodeScanAndCountViewActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_barcode_count_view)
 
+        applyEdgeToEdge(findViewById(R.id.root_view))
+
         scanCountView = findViewById(R.id.barcode_scanner_view)
         scanButton = findViewById(R.id.snapButton)
         nextButton = findViewById(R.id.nextButton)
         snapResult = findViewById(R.id.snapped_message)
 
-        val barcodeDetector = ScanbotSDK(this).createBarcodeDetector()
-        barcodeDetector.modifyConfig {
-            setBarcodeFormats(BarcodeTypeRepository.selectedTypes.toList())
-            setSaveCameraPreviewFrame(false)
-        }
+        val scanner = ScanbotSDK(this).createBarcodeScanner()
+        scanner.setConfiguration(scanner.copyCurrentConfiguration().copy().apply {
+            setBarcodeFormats(barcodeFormats = BarcodeTypeRepository.selectedTypes.toList())
+        } )
         scanButton.setOnClickListener {
             scanCountView.viewController.scanAndCount() // call this to run the scan and count
         }
@@ -60,8 +68,8 @@ class BarcodeScanAndCountViewActivity : AppCompatActivity() {
 
         scanCountView.apply {
             initCamera()
-            initDetectionBehavior(
-                barcodeDetector,
+            initScanningBehavior(
+                scanner,
                 callback = object : IBarcodeScanCountViewCallback {
                     override fun onCameraOpen() {
                         scanCountView.viewController.useFlash(flashEnabled)
@@ -98,8 +106,7 @@ class BarcodeScanAndCountViewActivity : AppCompatActivity() {
                 defaultStyle: BarcodePolygonsStaticView.BarcodePolygonStyle,
                 barcodeItem: BarcodeItem
             ): BarcodePolygonsStaticView.BarcodePolygonStyle {
-                // you can customize the style of the barcode polygon here
-                return defaultStyle
+               return defaultStyle
             }
         })
         scanCountView.counterOverlayController.setBarcodeItemViewFactory(object :
@@ -111,7 +118,11 @@ class BarcodeScanAndCountViewActivity : AppCompatActivity() {
         })
         scanCountView.counterOverlayController.setBarcodeItemViewBinder(object :
             BarcodePolygonsStaticView.BarcodeItemViewBinder {
-            override fun bindView(view: View, barcodeItem: BarcodeItem, isBarcodeAccepted: Boolean) {
+            override fun bindView(
+                view: View,
+                barcodeItem: BarcodeItem,
+                isBarcodeAccepted: Boolean
+            ) {
                 val valueTextView = view.findViewById<TextView>(R.id.custom_ar_view_value)
                 val imageView = view.findViewById<ImageView>(R.id.custom_ar_view)
 //                valueTextView.isVisible = false //uncomment to show barcode value