diff --git a/Libraries.txt b/Libraries.txt index fb12507..82bcd5c 100644 --- a/Libraries.txt +++ b/Libraries.txt @@ -1,4 +1,4 @@ -Open Source libraries used in the Scanbot Barcode Scanner SDK for Android version 5.1.0 +Open Source libraries used in the Scanbot Barcode Scanner SDK for Android version 5.2.0 CWAC-Camera Version 0.6.42 @@ -425,6 +425,191 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + +gs1-syntax-dictionary + +Version 2023-12-11 +(https://github.com/gs1/gs1-syntax-dictionary) + + 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 + + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ icu4c diff --git a/example_app/build.gradle b/example_app/build.gradle index 1b01ceb..be7b7c6 100644 --- a/example_app/build.gradle +++ b/example_app/build.gradle @@ -45,7 +45,7 @@ dependencies { implementation("androidx.recyclerview:recyclerview:1.3.2") implementation("androidx.constraintlayout:constraintlayout:2.1.4") - def sdkVersion = "5.1.0" + def sdkVersion = "5.2.0" implementation("io.scanbot:scanbot-barcode-scanner-sdk:$sdkVersion") implementation("io.scanbot:rtu-ui-v2-barcode:$sdkVersion") implementation("io.scanbot:barcode-sdk-pdfium:$sdkVersion") diff --git a/example_app/src/main/java/io/scanbot/example/sdk/barcode/doc_code_snippet/BarcodeAdditionalConfigSnippet.kt b/example_app/src/main/java/io/scanbot/example/sdk/barcode/doc_code_snippet/BarcodeAdditionalConfigSnippet.kt new file mode 100644 index 0000000..0a4e299 --- /dev/null +++ b/example_app/src/main/java/io/scanbot/example/sdk/barcode/doc_code_snippet/BarcodeAdditionalConfigSnippet.kt @@ -0,0 +1,63 @@ +package io.scanbot.example.sdk.barcode.doc_code_snippet + +/* + NOTE: this snippet of code is to be used only as a part of the website documentation. + This code is not intended for any use outside of the support of documentation by Scanbot SDK GmbH employees. +*/ + +// NOTE for maintainers: whenever changing this code, +// ensure that links using it are still pointing to valid lines! +// Pay attention to imports adding/removal/sorting! +// Page URLs using this code: +// TODO: add URLs here + +import android.content.Context +import io.scanbot.sdk.barcode.entity.AustraliaPostCustomerFormat +import io.scanbot.sdk.barcode.entity.BarcodeScannerAdditionalConfig +import io.scanbot.sdk.barcode.entity.BarcodeScannerConfig +import io.scanbot.sdk.barcode.entity.Gs1Handling +import io.scanbot.sdk.barcode.entity.MSIPlesseyChecksumAlgorithm +import io.scanbot.sdk.barcode_scanner.ScanbotBarcodeScannerSDK +import java.util.EnumSet + +fun barcodeScannerWithAdditionalConfigSnippet(context: Context) { + // Create the default configuration object. + val barcodeDetector = ScanbotBarcodeScannerSDK(context).createBarcodeDetector() + val additionalConfig = BarcodeScannerAdditionalConfig( + minimumTextLength = 0, + maximumTextLength = 0, + minimum1DQuietZoneSize = 10, + gs1Handling = Gs1Handling.PARSE, + msiPlesseyChecksumAlgorithms = EnumSet.of(MSIPlesseyChecksumAlgorithm.Mod10), + stripCheckDigits = false, + lowPowerMode = false, + useIata2Of5Checksum = true, + useCode11Checksum = true, + australiaPostCustomerFormat = AustraliaPostCustomerFormat.ALPHA_NUMERIC + ) + val config = BarcodeScannerConfig( + additionalConfig = additionalConfig, + // modify other parameters + ) + barcodeDetector.setConfig(config) +} + +fun barcodeScannerWithModifyAdditionalConfigSnippet(context: Context) { + // Create the default configuration object. + val barcodeDetector = ScanbotBarcodeScannerSDK(context).createBarcodeDetector() + barcodeDetector.modifyConfig { + modifyAdditionalConfig { + setMinimumTextLength(0) + setMaximumTextLength(0) + setMinimum1DQuietZoneSize(10) + setGs1HandlingMode(Gs1Handling.PARSE) + setMsiPlesseyChecksumAlgorithms(EnumSet.of(MSIPlesseyChecksumAlgorithm.Mod10)) + setStripCheckDigits(false) + setLowPowerMode(false) + setUseIata2Of5Checksum(true) + setUseCode11Checksum(true) + setAustraliaPostCustomerFormat(AustraliaPostCustomerFormat.ALPHA_NUMERIC) + } + // modify other parameters + } +} diff --git a/example_app/src/main/java/io/scanbot/example/sdk/barcode/doc_code_snippet/FindAndPickUseCaseSnippet.kt b/example_app/src/main/java/io/scanbot/example/sdk/barcode/doc_code_snippet/FindAndPickUseCaseSnippet.kt index ce2c7dc..31dc4b5 100644 --- a/example_app/src/main/java/io/scanbot/example/sdk/barcode/doc_code_snippet/FindAndPickUseCaseSnippet.kt +++ b/example_app/src/main/java/io/scanbot/example/sdk/barcode/doc_code_snippet/FindAndPickUseCaseSnippet.kt @@ -56,13 +56,13 @@ fun findAndPickModeUseCaseSnippet() { ExpectedBarcode( barcodeValue = "123456", title = " numeric barcode", - image = "https://www.google.com/images/branding/googlelogo/1x/googlelogo_color_272x92dp.png", + image = "https://avatars.githubusercontent.com/u/1454920", count = 4 ), ExpectedBarcode( barcodeValue = "SCANBOT", title = "value barcode", - image = "https://www.google.com/images/branding/googlelogo/1x/googlelogo_color_272x92dp.png", + image = "https://avatars.githubusercontent.com/u/1454920", count = 3 ) ) diff --git a/example_app/src/main/java/io/scanbot/example/sdk/barcode/doc_code_snippet/LegacyStartRtuUiActivitySnippet.kt b/example_app/src/main/java/io/scanbot/example/sdk/barcode/doc_code_snippet/LegacyStartRtuUiActivitySnippet.kt index 69b8ba1..202f555 100644 --- a/example_app/src/main/java/io/scanbot/example/sdk/barcode/doc_code_snippet/LegacyStartRtuUiActivitySnippet.kt +++ b/example_app/src/main/java/io/scanbot/example/sdk/barcode/doc_code_snippet/LegacyStartRtuUiActivitySnippet.kt @@ -45,8 +45,6 @@ class LegacyStartRtuUiActivitySnippet : AppCompatActivity() { when (resultCode) { RESULT_OK -> { val resultEntity = BarcodeScannerActivity.extractResult(resultCode, data) - val imagePath = resultEntity.barcodeImagePath - val previewPath = resultEntity.barcodePreviewFramePath // TODO: present barcode result as needed } diff --git a/example_app/src/main/java/io/scanbot/example/sdk/barcode/doc_code_snippet/ManualBarcodeDataParsingSnippet.kt b/example_app/src/main/java/io/scanbot/example/sdk/barcode/doc_code_snippet/ManualBarcodeDataParsingSnippet.kt new file mode 100644 index 0000000..124d439 --- /dev/null +++ b/example_app/src/main/java/io/scanbot/example/sdk/barcode/doc_code_snippet/ManualBarcodeDataParsingSnippet.kt @@ -0,0 +1,21 @@ +package io.scanbot.example.sdk.barcode.doc_code_snippet + +/* + NOTE: this snippet of code is to be used only as a part of the website documentation. + This code is not intended for any use outside of the support of documentation by Scanbot SDK GmbH employees. +*/ + +// NOTE for maintainers: whenever changing this code, +// ensure that links using it are still pointing to valid lines! +// Pay attention to imports adding/removal/sorting! +// Page URLs using this code: +// TODO: add URLs here + +import android.content.Context +import io.scanbot.sdk.barcode_scanner.ScanbotBarcodeScannerSDK + +fun manualBarcodeDataParsing(context: Context, barcodeString: String) { + val scanbotSDK = ScanbotBarcodeScannerSDK(context); + scanbotSDK.createBarcodeDocumentParser().parseDocument(barcodeString) +} + diff --git a/example_app/src/main/java/io/scanbot/example/sdk/barcode/doc_code_snippet/StartRtuUiActivitySnippet.kt b/example_app/src/main/java/io/scanbot/example/sdk/barcode/doc_code_snippet/StartRtuUiActivitySnippet.kt index e47d28f..6415a0b 100644 --- a/example_app/src/main/java/io/scanbot/example/sdk/barcode/doc_code_snippet/StartRtuUiActivitySnippet.kt +++ b/example_app/src/main/java/io/scanbot/example/sdk/barcode/doc_code_snippet/StartRtuUiActivitySnippet.kt @@ -24,8 +24,6 @@ class StartRtuUiActivitySnippetActivity : AppCompatActivity() { private val barcodeResultLauncher: ActivityResultLauncher = registerForActivityResultOk(BarcodeScannerActivity.ResultContract()) { resultEntity -> - val imagePath = resultEntity.barcodeImagePath - val previewPath = resultEntity.barcodePreviewFramePath // TODO: present barcode result as needed } diff --git a/example_app/src/main/java/io/scanbot/example/sdk/barcode/ui/MainActivity.kt b/example_app/src/main/java/io/scanbot/example/sdk/barcode/ui/MainActivity.kt index 8fc2dea..83a8872 100644 --- a/example_app/src/main/java/io/scanbot/example/sdk/barcode/ui/MainActivity.kt +++ b/example_app/src/main/java/io/scanbot/example/sdk/barcode/ui/MainActivity.kt @@ -81,7 +81,7 @@ class MainActivity : AppCompatActivity() { val barcodeCameraConfiguration = BarcodeScannerConfiguration().apply { this.recognizerConfiguration.apply { this.barcodeFormats = BarcodeTypeRepository.selectedTypes.map { it.toV2() } - this.gs1Handling = io.scanbot.sdk.ui_v2.barcode.configuration.Gs1Handling.DECODE + this.gs1Handling = io.scanbot.sdk.ui_v2.barcode.configuration.Gs1Handling.DECODE_FULL } this.useCase = SingleScanningMode().apply { // this.confirmationSheetEnabled = false @@ -236,11 +236,9 @@ class MainActivity : AppCompatActivity() { private val barcodeResultLauncher: ActivityResultLauncher = registerForActivityResultOk(BarcodeScannerActivity.ResultContract()) { resultEntity -> - val imagePath = resultEntity.barcodeImagePath - val previewPath = resultEntity.barcodePreviewFramePath BarcodeResultRepository.barcodeResultBundle = - BarcodeResultBundle(resultEntity.result!!, imagePath, previewPath) + BarcodeResultBundle(resultEntity.result!!) val intent = Intent(this, BarcodeResultActivity::class.java) startActivity(intent)