diff --git a/Libraries.txt b/Libraries.txt index 6451d7a8..4b938969 100644 --- a/Libraries.txt +++ b/Libraries.txt @@ -1,4 +1,4 @@ -Open Source libraries used in the Scanbot SDK for Android version 7.1.2 +Open Source libraries used in the Scanbot SDK for Android version 8.0.0 CWAC-Camera @@ -84,7 +84,7 @@ limitations under the License. Kotlin Standard Library -Version 1.9.25 +Version 2.1.21 (https://github.com/JetBrains/kotlin) Copyright 2010-2018 JetBrains s.r.o. @@ -154,7 +154,7 @@ limitations under the License. Dagger -Version 2.50 +Version 2.56.2 (https://github.com/google/dagger) Copyright 2012 The Dagger Authors @@ -484,7 +484,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. expected -Version 1.1 +Version 1.1.0 (https://github.com/TartanLlama/expected) Creative Commons Legal Code @@ -615,7 +615,7 @@ express Statement of Purpose. flatbuffers Version 2.0.6 -(https://github.com/google/flatbuffers/tree/master) +(https://github.com/google/flatbuffers) Apache License @@ -1549,7 +1549,7 @@ This work is licensed under a [Creative Commons Attribution-ShareAlike 4.0 Inter JSON for Modern C++ -Version v3.11.3 +Version 3.11.3 (https://github.com/nlohmann/json) MIT License @@ -1959,7 +1959,7 @@ OF THIS SOFTWARE. libzueci -Version 1.0.0 +Version 1.0.1 (https://sourceforge.net/projects/libzueci/) A simple, standalone, BSD-3-Clause C library for converting UTF-8 to/from Extended Channel Interpretations, as @@ -2372,11 +2372,221 @@ Version 1.1.0h ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + +snowflake-arctic-embed-xs + +Version eadfba3b +(https://huggingface.co/Snowflake/snowflake-arctic-embed-xs/tree/main) + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ spdlog -Version v1.15.2 +Version 1.15.2 (https://github.com/gabime/spdlog) The MIT License (MIT) @@ -2959,7 +3169,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. xtensor -Version 0.26.0-scanbot +Version 0.26.0 (https://github.com/doo/xtensor) Copyright (c) 2016, Johan Mabille, Sylvain Corlay and Wolf Vollprecht diff --git a/classic-components-example/adjustable-filters/build.gradle b/classic-components-example/adjustable-filters/build.gradle index d76fef57..9b457015 100644 --- a/classic-components-example/adjustable-filters/build.gradle +++ b/classic-components-example/adjustable-filters/build.gradle @@ -37,9 +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}") implementation("com.google.android.material:material:${project.ext.materialVersion}") 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..3e901caa 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,11 +49,11 @@ 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 - ScanbotSDK(this@ExampleApplication).getSdkComponent()!!.provideDocumentStorage().deleteAll() + ScanbotSDK(this@ExampleApplication).documentApi.deleteAllDocuments() } } } 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..facb3372 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 @@ -9,21 +9,27 @@ import android.view.View import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.widget.Toolbar 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.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.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.imagemanipulation.ScanbotSdkImageManipulator +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 +95,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!") @@ -124,12 +135,19 @@ class FilterActivity : AppCompatActivity(), FiltersListener { } private fun updatePagePreview() { - Picasso.get() - .load(page.documentPreviewFileUri) - .memoryPolicy(MemoryPolicy.NO_CACHE) - .resizeDimen(R.dimen.move_preview_size, R.dimen.move_preview_size) - .centerInside() - .into(binding.image, ImageCallback()) + page.documentPreviewImageRef?.let { image -> + ScanbotSdkImageManipulator.create().resize(image, 400).onSuccess { resizedImage -> + lifecycleScope.launch(Dispatchers.Default) { + resizedImage?.toBitmap()?.onSuccess { bitmap -> + lifecycleScope.launch(Dispatchers.Main) { + binding.image.setImageBitmap(bitmap) + binding.progress.visibility = View.GONE + } + } + } + + } + } } override fun onResume() { @@ -193,16 +211,6 @@ class FilterActivity : AppCompatActivity(), FiltersListener { } } } - - inner class ImageCallback : Callback { - override fun onSuccess() { - binding.progress.visibility = View.GONE - } - - override fun onError(e: java.lang.Exception?) { - binding.progress.visibility = View.GONE - } - } } private enum class FilteringState { 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 @@