Skip to content

feat: support multiple barcode format hints #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DotHyphon wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: support multiple barcode format hints #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions src/main/kotlin/com/outsystems/plugins/barcode/controller/helper/OSBARCMLKitHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@ import org.jetbrains.annotations.VisibleForTesting
* to scan an image using the ML Kit library.
* It encapsulates all the code related with the ML Kit library.
*/
class OSBARCMLKitHelper(private val hint: OSBARCScannerHint?): OSBARCMLKitHelperInterface {
class OSBARCMLKitHelper(private val hints: List<OSBARCScannerHint>): OSBARCMLKitHelperInterface {

constructor(hint: OSBARCScannerHint?) : this(listOfNotNull(hint))

companion object {
private const val LOG_TAG = "OSBARCMLKitHelper"

Expand Down Expand Up @@ -44,10 +47,10 @@ class OSBARCMLKitHelper(private val hint: OSBARCScannerHint?): OSBARCMLKitHelper
}

private val scanner by lazy {
val formats = hints.mapNotNull { it.toMLKitBarcodeFormat() }
val options = BarcodeScannerOptions.Builder().apply {
val format = hint.toMLKitBarcodeFormat()
if (format != null) {
setBarcodeFormats(format)
if (formats.isNotEmpty()) {
setBarcodeFormats(formats.first(), *formats.drop(1).toIntArray())
} else {
enableAllPotentialBarcodes()
}
Expand Down
10 changes: 6 additions & 4 deletions src/main/kotlin/com/outsystems/plugins/barcode/controller/helper/OSBARCZXingHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,20 @@ import com.outsystems.plugins.barcode.model.OSBARCScannerHint
* to scan an image using the ZXing library.
* It encapsulates all the code related with the ZXing library.
*/
class OSBARCZXingHelper(private val hint: OSBARCScannerHint?): OSBARCZXingHelperInterface {
class OSBARCZXingHelper(private val hints: List<OSBARCScannerHint>): OSBARCZXingHelperInterface {

constructor(hint: OSBARCScannerHint?) : this(listOfNotNull(hint))

companion object {
private const val LOG_TAG = "OSBARCZXingHelper"
}

private val reader: MultiFormatReader by lazy {
val format = hint.toZXingBarcodeFormat()
val formats = hints.mapNotNull { it.toZXingBarcodeFormat() }.toSet()
MultiFormatReader().apply {
if (format != null) {
if (formats.isNotEmpty()) {
setHints(
mapOf(DecodeHintType.POSSIBLE_FORMATS to setOf(format))
mapOf(DecodeHintType.POSSIBLE_FORMATS to formats)
)
}
}
Expand Down
3 changes: 2 additions & 1 deletion src/main/kotlin/com/outsystems/plugins/barcode/model/OSBARCScanParameters.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,6 @@ data class OSBARCScanParameters(
@SerializedName("scanButton") val scanButton: Boolean,
@SerializedName("scanText") val scanText: String,
@SerializedName("hint") val hint: OSBARCScannerHint?,
@SerializedName("androidScanningLibrary") val androidScanningLibrary: String?
@SerializedName("androidScanningLibrary") val androidScanningLibrary: String?,
@SerializedName("hints") val hints: List<OSBARCScannerHint>? = null
) : Serializable
9 changes: 7 additions & 2 deletions src/main/kotlin/com/outsystems/plugins/barcode/view/OSBARCScannerActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ import com.outsystems.plugins.barcode.controller.helper.OSBARCZXingHelper
import com.outsystems.plugins.barcode.model.OSBARCError
import com.outsystems.plugins.barcode.model.OSBARCScanParameters
import com.outsystems.plugins.barcode.model.OSBARCScanResult
import com.outsystems.plugins.barcode.model.OSBARCScannerHint
import com.outsystems.plugins.barcode.view.ui.theme.ActionButtonsDistance
import com.outsystems.plugins.barcode.view.ui.theme.BarcodeScannerTheme
import com.outsystems.plugins.barcode.view.ui.theme.ButtonsBackgroundGray
Expand Down Expand Up @@ -182,11 +183,15 @@ class OSBARCScannerActivity : ComponentActivity() {
.requireLensFacing(if (parameters.cameraDirection == CAM_DIRECTION_FRONT) CameraSelector.LENS_FACING_FRONT else CameraSelector.LENS_FACING_BACK)
.build()

val rawHints = parameters.hints?.takeIf { it.isNotEmpty() } ?: listOfNotNull(parameters.hint)
// UNKNOWN is the JS-side ALL sentinel; its presence forces scan-all (empty list).
val hints = if (rawHints.any { it == OSBARCScannerHint.UNKNOWN }) emptyList() else rawHints

barcodeAnalyzer = OSBARCBarcodeAnalyzer(
OSBARCScanLibraryFactory.createScanLibraryWrapper(
parameters.androidScanningLibrary ?: "",
OSBARCZXingHelper(parameters.hint),
OSBARCMLKitHelper(parameters.hint)
OSBARCZXingHelper(hints),
OSBARCMLKitHelper(hints)
),
OSBARCImageHelper(),
{ result ->
Expand Down