diff --git a/classic-components-example/adjustable-filters/build.gradle b/classic-components-example/adjustable-filters/build.gradle index d76fef57..2a342282 100644 --- a/classic-components-example/adjustable-filters/build.gradle +++ b/classic-components-example/adjustable-filters/build.gradle @@ -37,8 +37,6 @@ dependencies { implementation("androidx.appcompat:appcompat:${project.ext.androidxAppcompatVersion}") implementation("androidx.constraintlayout:constraintlayout:${project.ext.constraintLayoutVersion}") implementation("io.scanbot:sdk-package-1:${project.ext.scanbotSdkVersion}") - implementation("io.scanbot:sdk-package-ui:${project.ext.scanbotSdkVersion}") - implementation("io.scanbot:sdk-ml-imageprocessor-assets:${project.ext.scanbotSdkVersion}") implementation("com.squareup.picasso:picasso:${project.ext.picassoVersion}") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:${project.ext.coroutinesCoreVersion}") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:${project.ext.coroutinesAndroidVersion}") diff --git a/classic-components-example/adjustable-filters/src/main/java/io/scanbot/example/ExampleApplication.kt b/classic-components-example/adjustable-filters/src/main/java/io/scanbot/example/ExampleApplication.kt index d6f608f1..cc53c9fd 100755 --- a/classic-components-example/adjustable-filters/src/main/java/io/scanbot/example/ExampleApplication.kt +++ b/classic-components-example/adjustable-filters/src/main/java/io/scanbot/example/ExampleApplication.kt @@ -2,9 +2,9 @@ package io.scanbot.example import android.app.Application import io.scanbot.example.common.Const -import io.scanbot.sap.SdkFeature import io.scanbot.sdk.ScanbotSDK import io.scanbot.sdk.ScanbotSDKInitializer +import io.scanbot.sdk.licensing.Feature import io.scanbot.sdk.util.log.LoggerProvider import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers @@ -37,11 +37,9 @@ class ExampleApplication : Application(), CoroutineScope { .withLogging(true) // TODO 2/2: Enable the Scanbot SDK license key //.license(this, licenseKey) - .licenceErrorHandler { status, feature, statusMessage -> + .licenseErrorHandler { status, feature, statusMessage -> logger.d(Const.LOG_TAG, "+++> License status: ${status.name}. Status message: $statusMessage") - if (feature != SdkFeature.NoSdkFeature) { - logger.d(Const.LOG_TAG, "+++> Feature not available: ${feature.name}") - } + logger.d(Const.LOG_TAG, "+++> Feature not available: ${feature.name}") } //.sdkFilesDirectory(this, getExternalFilesDir(null)!!) .initialize(this) @@ -51,7 +49,7 @@ class ExampleApplication : Application(), CoroutineScope { val licenseInfo = ScanbotSDK(this).licenseInfo logger.d(Const.LOG_TAG, "License status: ${licenseInfo.status}") logger.d(Const.LOG_TAG, "License isValid: ${licenseInfo.isValid}") - logger.d(Const.LOG_TAG, "License expirationDate: ${licenseInfo.expirationDate}") + logger.d(Const.LOG_TAG, "License expirationDate: ${licenseInfo.expirationDateString}") launch { // Clear all previously created documents in storage diff --git a/classic-components-example/adjustable-filters/src/main/java/io/scanbot/example/FilterActivity.kt b/classic-components-example/adjustable-filters/src/main/java/io/scanbot/example/FilterActivity.kt index dcda679d..f0423758 100644 --- a/classic-components-example/adjustable-filters/src/main/java/io/scanbot/example/FilterActivity.kt +++ b/classic-components-example/adjustable-filters/src/main/java/io/scanbot/example/FilterActivity.kt @@ -12,18 +12,25 @@ import androidx.lifecycle.lifecycleScope import com.squareup.picasso.Callback import com.squareup.picasso.MemoryPolicy import com.squareup.picasso.Picasso +import io.scanbot.common.onFailure 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 import io.scanbot.example.fragment.FiltersBottomSheetMenuFragment -import io.scanbot.sdk.imagefilters.ParametricFilter import io.scanbot.sdk.ScanbotSDK import io.scanbot.sdk.docprocessing.Document import io.scanbot.sdk.docprocessing.Page +import io.scanbot.sdk.imageprocessing.ParametricFilter import kotlinx.coroutines.* +/** +Ths example uses new sdk APIs presented in Scanbot SDK v.8.x.x +Please, check the official documentation for more details: +Result API https://docs.scanbot.io/android/document-scanner-sdk/detailed-setup-guide/result-api/ +ImageRef API https://docs.scanbot.io/android/document-scanner-sdk/detailed-setup-guide/image-ref-api/ + */ class FilterActivity : AppCompatActivity(), FiltersListener { companion object { @@ -89,7 +96,12 @@ class FilterActivity : AppCompatActivity(), FiltersListener { } private suspend fun loadDocument(docId: String) { - val doc = withContext(Dispatchers.IO) { scanbotSdk.documentApi.loadDocument(docId) } + val doc = withContext(Dispatchers.IO) { + scanbotSdk.documentApi.loadDocument(docId) + .onFailure { + Log.e(Const.LOG_TAG, "Document with ID $docId loading failed: ${it.message}") + }.getOrNull() + } withContext(Dispatchers.Main) { if (doc == null) { showToast("Document with given ID was not found!") diff --git a/classic-components-example/adjustable-filters/src/main/java/io/scanbot/example/FiltersListener.kt b/classic-components-example/adjustable-filters/src/main/java/io/scanbot/example/FiltersListener.kt index 7b4f1d8f..b59c3f7b 100644 --- a/classic-components-example/adjustable-filters/src/main/java/io/scanbot/example/FiltersListener.kt +++ b/classic-components-example/adjustable-filters/src/main/java/io/scanbot/example/FiltersListener.kt @@ -1,6 +1,6 @@ package io.scanbot.example -import io.scanbot.sdk.imagefilters.ParametricFilter +import io.scanbot.sdk.imageprocessing.ParametricFilter interface FiltersListener { diff --git a/classic-components-example/adjustable-filters/src/main/java/io/scanbot/example/MainActivity.kt b/classic-components-example/adjustable-filters/src/main/java/io/scanbot/example/MainActivity.kt index 3e13e2ce..8604397d 100755 --- a/classic-components-example/adjustable-filters/src/main/java/io/scanbot/example/MainActivity.kt +++ b/classic-components-example/adjustable-filters/src/main/java/io/scanbot/example/MainActivity.kt @@ -1,6 +1,5 @@ package io.scanbot.example -import android.graphics.BitmapFactory import android.net.Uri import android.os.Bundle import android.util.Log @@ -9,45 +8,61 @@ import androidx.activity.result.PickVisualMediaRequest import androidx.activity.result.contract.ActivityResultContracts import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.lifecycleScope +import io.scanbot.common.mapSuccess +import io.scanbot.common.onSuccess + 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.documentscanner.DocumentDetectionStatus +import io.scanbot.sdk.image.ImageRef import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext - +/** + Ths example uses new sdk APIs presented in Scanbot SDK v.8.x.x + Please, check the official documentation for more details: + Result API https://docs.scanbot.io/android/document-scanner-sdk/detailed-setup-guide/result-api/ + ImageRef API https://docs.scanbot.io/android/document-scanner-sdk/detailed-setup-guide/image-ref-api/ + */ class MainActivity : AppCompatActivity() { private val binding by lazy { ActivityMainBinding.inflate(layoutInflater) } private val scanbotSdk: ScanbotSDK by lazy { ScanbotSDK(this) } - private val selectGalleryImageResultLauncher = registerForActivityResult(ActivityResultContracts.PickVisualMedia()) { uri -> - if (!scanbotSdk.licenseInfo.isValid) { - this@MainActivity.showToast("1-minute trial license has expired!") - Log.e(Const.LOG_TAG, "1-minute trial license has expired!") - return@registerForActivityResult - } - - if (uri == null) { - showToast("Error obtaining selected image!") - Log.e(Const.LOG_TAG, "Error obtaining selected image!") - return@registerForActivityResult - } + private val selectGalleryImageResultLauncher = + registerForActivityResult(ActivityResultContracts.PickVisualMedia()) { uri -> + if (!scanbotSdk.licenseInfo.isValid) { + this@MainActivity.showToast("1-minute trial license has expired!") + Log.e(Const.LOG_TAG, "1-minute trial license has expired!") + return@registerForActivityResult + } - lifecycleScope.launch { - val documentId = createAndScanDocumentPage(uri) + if (uri == null) { + showToast("Error obtaining selected image!") + Log.e(Const.LOG_TAG, "Error obtaining selected image!") + return@registerForActivityResult + } - if (documentId != null) { - filterActivityResultLauncher.launch(FilterActivity.newIntent(this@MainActivity, documentId)) - } else { - Log.e(Const.LOG_TAG, "Error creating document with page!") - showToast("Error creating document with page!") + lifecycleScope.launch { + val documentId = createAndScanDocumentPage(uri) + + if (documentId != null) { + filterActivityResultLauncher.launch( + FilterActivity.newIntent( + this@MainActivity, + documentId + ) + ) + } else { + Log.e(Const.LOG_TAG, "Error creating document with page!") + showToast("Error creating document with page!") + } } } - } private val filterActivityResultLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result -> @@ -61,7 +76,9 @@ class MainActivity : AppCompatActivity() { return@registerForActivityResult } - val page = ScanbotSDK(this).documentApi.loadDocument(documentId)?.pages?.firstOrNull() + val page = + ScanbotSDK(this).documentApi.loadDocument(documentId) + .getOrNull()?.pages?.firstOrNull() if (page == null) { Log.e(Const.LOG_TAG, "Error loading document with page!") showToast("Error loading document with page!") @@ -87,15 +104,10 @@ class MainActivity : AppCompatActivity() { } private suspend fun createAndScanDocumentPage(imageUri: Uri): String? { - val bitmap = withContext(Dispatchers.IO) { + val imageRef = withContext(Dispatchers.IO) { val inputStream = contentResolver.openInputStream(imageUri) - BitmapFactory.decodeStream(inputStream) - } - - if (bitmap == null) { - Log.e(Const.LOG_TAG, "Error loading image (bitmap is `null`)!") - showToast("Error loading image!") - return null + ?: throw Exception("Cannot open input stream from URI") + ImageRef.fromInputStream(inputStream) } val sdk = ScanbotSDK(this) @@ -107,31 +119,38 @@ class MainActivity : AppCompatActivity() { binding.progressBar.visibility = View.VISIBLE val resultDocument = withContext(Dispatchers.Default) { - val result = sdk.createDocumentScanner().scanFromBitmap(bitmap) + sdk.createDocumentScanner().mapSuccess { documentScanner -> + + val result = documentScanner?.scan(imageRef) + ?.getOrReturn() // it is also possible to check specific error by che + val detectionResult = result?.detectionResult + Log.d(Const.LOG_TAG, "Doc found: ${result}") + + val status = + detectionResult?.status ?: DocumentDetectionStatus.ERROR_NOTHING_DETECTED + + /** 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 isScanOk = status?.name?.startsWith("OK", true) ?: false + if (isScanOk.not()) { + Log.e( + Const.LOG_TAG, + "Bad document photo - scanning status was ${status.name}!" + ) + showToast("Bad document photo - status ${status.name}!") + throw Exception("Bad document photo - scanning status was ${status.name}!") + } - 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 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 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 + sdk.documentApi.createDocument().onSuccess { document -> + val page = document.addPage(imageRef).getOrReturn() //can be handled with .getOrNull() if needed + Log.d(Const.LOG_TAG, "Page added: ${page.uuid}") + page.apply(newPolygon = detectionResult?.pointsNormalized) + document + }.getOrReturn() } - - val document = sdk.documentApi.createDocument() - val page = document.addPage(bitmap) - Log.d(Const.LOG_TAG, "Page added: ${page.uuid}") - page.apply(newPolygon = result.pointsNormalized) - document - } + }.getOrNull() binding.progressBar.visibility = View.GONE Log.d(Const.LOG_TAG, "Document created: ${resultDocument?.uuid}") diff --git a/classic-components-example/adjustable-filters/src/main/java/io/scanbot/example/Utils.kt b/classic-components-example/adjustable-filters/src/main/java/io/scanbot/example/Utils.kt index 7b3d4c2c..2b9c15f2 100644 --- a/classic-components-example/adjustable-filters/src/main/java/io/scanbot/example/Utils.kt +++ b/classic-components-example/adjustable-filters/src/main/java/io/scanbot/example/Utils.kt @@ -1,6 +1,7 @@ package io.scanbot.example -import io.scanbot.sdk.imagefilters.ParametricFilter +import io.scanbot.sdk.imageprocessing.ParametricFilter + fun ParametricFilter?.getFilterName(): String { return this?.javaClass?.simpleName ?: "None" diff --git a/classic-components-example/adjustable-filters/src/main/java/io/scanbot/example/fragment/FiltersBottomSheetMenuFragment.kt b/classic-components-example/adjustable-filters/src/main/java/io/scanbot/example/fragment/FiltersBottomSheetMenuFragment.kt index 60914e60..a537fff5 100644 --- a/classic-components-example/adjustable-filters/src/main/java/io/scanbot/example/fragment/FiltersBottomSheetMenuFragment.kt +++ b/classic-components-example/adjustable-filters/src/main/java/io/scanbot/example/fragment/FiltersBottomSheetMenuFragment.kt @@ -8,14 +8,14 @@ import android.widget.Button import com.google.android.material.bottomsheet.BottomSheetDialogFragment import io.scanbot.example.FiltersListener import io.scanbot.example.R -import io.scanbot.sdk.imagefilters.BrightnessFilter -import io.scanbot.sdk.imagefilters.ColorDocumentFilter -import io.scanbot.sdk.imagefilters.ContrastFilter -import io.scanbot.sdk.imagefilters.CustomBinarizationFilter -import io.scanbot.sdk.imagefilters.GrayscaleFilter -import io.scanbot.sdk.imagefilters.ParametricFilter -import io.scanbot.sdk.imagefilters.ScanbotBinarizationFilter -import io.scanbot.sdk.imagefilters.WhiteBlackPointFilter +import io.scanbot.sdk.imageprocessing.BrightnessFilter +import io.scanbot.sdk.imageprocessing.ColorDocumentFilter +import io.scanbot.sdk.imageprocessing.ContrastFilter +import io.scanbot.sdk.imageprocessing.CustomBinarizationFilter +import io.scanbot.sdk.imageprocessing.GrayscaleFilter +import io.scanbot.sdk.imageprocessing.ParametricFilter +import io.scanbot.sdk.imageprocessing.ScanbotBinarizationFilter +import io.scanbot.sdk.imageprocessing.WhiteBlackPointFilter /** Represents bottom menu sheet for page filters screen. */ class FiltersBottomSheetMenuFragment : BottomSheetDialogFragment() { diff --git a/classic-components-example/adjustable-filters/src/main/res/layout/activity_filters_tunes.xml b/classic-components-example/adjustable-filters/src/main/res/layout/activity_filters_tunes.xml index de2b6a16..3cd30322 100644 --- a/classic-components-example/adjustable-filters/src/main/res/layout/activity_filters_tunes.xml +++ b/classic-components-example/adjustable-filters/src/main/res/layout/activity_filters_tunes.xml @@ -18,7 +18,6 @@