diff --git a/plugins/barcode-scanner/android/src/main/AndroidManifest.xml b/plugins/barcode-scanner/android/src/main/AndroidManifest.xml index 750a724b81..08184b130c 100644 --- a/plugins/barcode-scanner/android/src/main/AndroidManifest.xml +++ b/plugins/barcode-scanner/android/src/main/AndroidManifest.xml @@ -4,6 +4,10 @@ + + diff --git a/plugins/barcode-scanner/android/src/main/java/BarcodeScannerPlugin.kt b/plugins/barcode-scanner/android/src/main/java/BarcodeScannerPlugin.kt index 957240d508..59727113bf 100644 --- a/plugins/barcode-scanner/android/src/main/java/BarcodeScannerPlugin.kt +++ b/plugins/barcode-scanner/android/src/main/java/BarcodeScannerPlugin.kt @@ -62,6 +62,12 @@ class ScanOptions { var cameraDirection: String? = null } +@InvokeArg +class TorchArgs { + var enabled: Boolean = false +} + + @TauriPlugin( permissions = [ Permission(strings = [Manifest.permission.CAMERA], alias = "camera") @@ -353,6 +359,21 @@ class BarcodeScannerPlugin(private val activity: Activity) : Plugin(activity), } } + + @Command + fun setTorch(invoke: Invoke) { + val args = invoke.parseArgs(TorchArgs::class.java) + + activity.runOnUiThread { + try { + camera?.cameraControl?.enableTorch(args.enabled) + invoke.resolve() + } catch (e: Exception) { + invoke.reject("TORCH_ERROR", e.message) + } + } + } + @SuppressLint("ObsoleteSdkInt") @PermissionCallback fun cameraPermissionCallback(invoke: Invoke) { diff --git a/plugins/barcode-scanner/api-iife.js b/plugins/barcode-scanner/api-iife.js index be48fae9e0..be0dde6b5f 100644 --- a/plugins/barcode-scanner/api-iife.js +++ b/plugins/barcode-scanner/api-iife.js @@ -1 +1,52 @@ -if("__TAURI__"in window){var __TAURI_PLUGIN_BARCODE_SCANNER__=function(n){"use strict";async function a(n,a={},e){return window.__TAURI_INTERNALS__.invoke(n,a,e)}var e;return"function"==typeof SuppressedError&&SuppressedError,n.Format=void 0,(e=n.Format||(n.Format={})).QRCode="QR_CODE",e.UPC_A="UPC_A",e.UPC_E="UPC_E",e.EAN8="EAN_8",e.EAN13="EAN_13",e.Code39="CODE_39",e.Code93="CODE_93",e.Code128="CODE_128",e.Codabar="CODABAR",e.ITF="ITF",e.Aztec="AZTEC",e.DataMatrix="DATA_MATRIX",e.PDF417="PDF_417",e.GS1DataBar="GS1_DATA_BAR",e.GS1DataBarLimited="GS1_DATA_BAR_LIMITED",e.GS1DataBarExpanded="GS1_DATA_BAR_EXPANDED",n.cancel=async function(){await a("plugin:barcode-scanner|cancel")},n.checkPermissions=async function(){return await async function(n){return a(`plugin:${n}|check_permissions`)}("barcode-scanner").then((n=>n.camera))},n.openAppSettings=async function(){await a("plugin:barcode-scanner|open_app_settings")},n.requestPermissions=async function(){return await async function(n){return a(`plugin:${n}|request_permissions`)}("barcode-scanner").then((n=>n.camera))},n.scan=async function(n){return await a("plugin:barcode-scanner|scan",{...n})},n}({});Object.defineProperty(window.__TAURI__,"barcodeScanner",{value:__TAURI_PLUGIN_BARCODE_SCANNER__})} +if ("__TAURI__" in window) { + var __TAURI_PLUGIN_BARCODE_SCANNER__ = function(n) { + "use strict"; + async function a(n, a = {}, e) { + return window.__TAURI_INTERNALS__.invoke(n, a, e) + } + var e; + return "function" == typeof SuppressedError && SuppressedError, + n.Format = void 0, + (e = n.Format || (n.Format = {})).QRCode = "QR_CODE", + e.UPC_A = "UPC_A", e.UPC_E = "UPC_E", + e.EAN8 = "EAN_8", e.EAN13 = "EAN_13", + e.Code39 = "CODE_39", + e.Code93 = "CODE_93", + e.Code128 = "CODE_128", + e.Codabar = "CODABAR", + e.ITF = "ITF", + e.Aztec = "AZTEC", + e.DataMatrix = "DATA_MATRIX", + e.PDF417 = "PDF_417", + e.GS1DataBar = "GS1_DATA_BAR", + e.GS1DataBarLimited = "GS1_DATA_BAR_LIMITED", + e.GS1DataBarExpanded = "GS1_DATA_BAR_EXPANDED", + n.cancel = async function() { + await a("plugin:barcode-scanner|cancel") + }, + n.checkPermissions = async function() { + return await async function(n) { + return a(`plugin:${n}|check_permissions`) + }("barcode-scanner").then((n => n.camera)) + }, + n.openAppSettings = async function() { + await a("plugin:barcode-scanner|open_app_settings") + }, + n.requestPermissions = async function() { + return await async function(n) { + return a(`plugin:${n}|request_permissions`) + }("barcode-scanner").then((n => n.camera)) + }, + n.scan = async function(n) { + return await a("plugin:barcode-scanner|scan", + { ...n }) + }, + n.setTorch = async function(args) { + return await a("plugin:barcode-scanner|set_torch", { ...args }) + }, + n + }({}); Object.defineProperty(window.__TAURI__, + "barcodeScanner", + { value: __TAURI_PLUGIN_BARCODE_SCANNER__ }) +} + diff --git a/plugins/barcode-scanner/build.rs b/plugins/barcode-scanner/build.rs index 25896b5706..ddd2f343e5 100644 --- a/plugins/barcode-scanner/build.rs +++ b/plugins/barcode-scanner/build.rs @@ -8,6 +8,7 @@ const COMMANDS: &[&str] = &[ "request_permissions", "check_permissions", "open_app_settings", + "set_torch", "vibrate", ]; diff --git a/plugins/barcode-scanner/guest-js/index.ts b/plugins/barcode-scanner/guest-js/index.ts index 9781b4bae6..e3076a4bbb 100644 --- a/plugins/barcode-scanner/guest-js/index.ts +++ b/plugins/barcode-scanner/guest-js/index.ts @@ -56,6 +56,10 @@ export interface Scanned { bounds: unknown } +export interface TorchOptions { + enabled: boolean +} + /** * Start scanning. * @param options @@ -95,3 +99,13 @@ export async function requestPermissions(): Promise { export async function openAppSettings(): Promise { await invoke('plugin:barcode-scanner|open_app_settings') } + + +/** + * Turn flashlight on/off. + * @param options.enabled true = on, false = off + */ +export async function setTorch(options: TorchOptions): Promise { + await invoke('plugin:barcode-scanner|set_torch', { ...options }) +} + diff --git a/plugins/barcode-scanner/permissions/autogenerated/commands/set_torch.toml b/plugins/barcode-scanner/permissions/autogenerated/commands/set_torch.toml new file mode 100644 index 0000000000..fcb081ce73 --- /dev/null +++ b/plugins/barcode-scanner/permissions/autogenerated/commands/set_torch.toml @@ -0,0 +1,13 @@ +# Automatically generated - DO NOT EDIT! + +"$schema" = "../../schemas/schema.json" + +[[permission]] +identifier = "allow-set-torch" +description = "Enables the set_torch command without any pre-configured scope." +commands.allow = ["set_torch"] + +[[permission]] +identifier = "deny-set-torch" +description = "Denies the set_torch command without any pre-configured scope." +commands.deny = ["set_torch"] diff --git a/plugins/barcode-scanner/permissions/default.toml b/plugins/barcode-scanner/permissions/default.toml index 3b5a2dfdaf..4b3648e0d3 100644 --- a/plugins/barcode-scanner/permissions/default.toml +++ b/plugins/barcode-scanner/permissions/default.toml @@ -16,5 +16,6 @@ permissions = [ "allow-open-app-settings", "allow-request-permissions", "allow-scan", + "allow-set-torch", "allow-vibrate", ] diff --git a/plugins/barcode-scanner/permissions/schemas/schema.json b/plugins/barcode-scanner/permissions/schemas/schema.json index 69fb0d5dab..f74c6c4d10 100644 --- a/plugins/barcode-scanner/permissions/schemas/schema.json +++ b/plugins/barcode-scanner/permissions/schemas/schema.json @@ -354,6 +354,18 @@ "const": "deny-scan", "markdownDescription": "Denies the scan command without any pre-configured scope." }, + { + "description": "Enables the set_torch command without any pre-configured scope.", + "type": "string", + "const": "allow-set-torch", + "markdownDescription": "Enables the set_torch command without any pre-configured scope." + }, + { + "description": "Denies the set_torch command without any pre-configured scope.", + "type": "string", + "const": "deny-set-torch", + "markdownDescription": "Denies the set_torch command without any pre-configured scope." + }, { "description": "Enables the vibrate command without any pre-configured scope.", "type": "string", @@ -375,4 +387,4 @@ ] } } -} \ No newline at end of file +}