max
/
tauri-plugins-workspace
mirror of https://github.com/tauri-apps/plugins-workspace
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sketch api, remove desktop

Browse Source
pull/830/head
Lucas Nogueira 2 years ago
parent 9a5521dfd2
commit cfc5fc699e
No known key found for this signature in database
GPG Key ID: 3AFF5CAD641DD470
11 changed files with 235 additions and 175 deletions
Show Stats Download Patch File Download Diff File

2
examples/api/src-tauri/Cargo.toml
Unescape View File

@ -25,7 +25,6 @@ tauri-plugin-clipboard-manager = { path = "../../../plugins/clipboard-manager",
tauri-plugin-dialog = { path = "../../../plugins/dialog", version = "2.0.0-alpha.2" } tauri-plugin-dialog = { path = "../../../plugins/dialog", version = "2.0.0-alpha.2" }
tauri-plugin-http = { path = "../../../plugins/http", features = [ "multipart" ], version = "2.0.0-alpha.3" } tauri-plugin-http = { path = "../../../plugins/http", features = [ "multipart" ], version = "2.0.0-alpha.3" }
tauri-plugin-notification = { path = "../../../plugins/notification", version = "2.0.0-alpha.3", features = [ "windows7-compat" ] } tauri-plugin-notification = { path = "../../../plugins/notification", version = "2.0.0-alpha.3", features = [ "windows7-compat" ] }
tauri-plugin-nfc = { path = "../../../plugins/nfc", version = "1.0.0" }
tauri-plugin-os = { path = "../../../plugins/os", version = "2.0.0-alpha.2" } tauri-plugin-os = { path = "../../../plugins/os", version = "2.0.0-alpha.2" }
tauri-plugin-process = { path = "../../../plugins/process", version = "2.0.0-alpha.2" } tauri-plugin-process = { path = "../../../plugins/process", version = "2.0.0-alpha.2" }
tauri-plugin-shell = { path = "../../../plugins/shell", version = "2.0.0-alpha.2" } tauri-plugin-shell = { path = "../../../plugins/shell", version = "2.0.0-alpha.2" }
@ -49,6 +48,7 @@ tauri-plugin-updater = { path = "../../../plugins/updater", version = "2.0.0-alp
[target."cfg(any(target_os = \"android\", target_os = \"ios\"))".dependencies] [target."cfg(any(target_os = \"android\", target_os = \"ios\"))".dependencies]
tauri-plugin-barcode-scanner = { path = "../../../plugins/barcode-scanner/", version = "2.0.0-alpha.0" } tauri-plugin-barcode-scanner = { path = "../../../plugins/barcode-scanner/", version = "2.0.0-alpha.0" }
tauri-plugin-nfc = { path = "../../../plugins/nfc", version = "1.0.0" }
[target."cfg(target_os = \"windows\")".dependencies] [target."cfg(target_os = \"windows\")".dependencies]
window-shadows = "0.2" window-shadows = "0.2"

154
examples/api/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/Contents.json
Unescape View File

@ -1,116 +1,116 @@
{ {
"images" : [ "images": [
{ {
"size" : "20x20", "size": "20x20",
"idiom" : "iphone", "idiom": "iphone",
"filename" : "AppIcon-20x20@2x.png", "filename": "AppIcon-20x20@2x.png",
"scale" : "2x" "scale": "2x"
}, },
{ {
"size" : "20x20", "size": "20x20",
"idiom" : "iphone", "idiom": "iphone",
"filename" : "AppIcon-20x20@3x.png", "filename": "AppIcon-20x20@3x.png",
"scale" : "3x" "scale": "3x"
}, },
{ {
"size" : "29x29", "size": "29x29",
"idiom" : "iphone", "idiom": "iphone",
"filename" : "AppIcon-29x29@2x-1.png", "filename": "AppIcon-29x29@2x-1.png",
"scale" : "2x" "scale": "2x"
}, },
{ {
"size" : "29x29", "size": "29x29",
"idiom" : "iphone", "idiom": "iphone",
"filename" : "AppIcon-29x29@3x.png", "filename": "AppIcon-29x29@3x.png",
"scale" : "3x" "scale": "3x"
}, },
{ {
"size" : "40x40", "size": "40x40",
"idiom" : "iphone", "idiom": "iphone",
"filename" : "AppIcon-40x40@2x.png", "filename": "AppIcon-40x40@2x.png",
"scale" : "2x" "scale": "2x"
}, },
{ {
"size" : "40x40", "size": "40x40",
"idiom" : "iphone", "idiom": "iphone",
"filename" : "AppIcon-40x40@3x.png", "filename": "AppIcon-40x40@3x.png",
"scale" : "3x" "scale": "3x"
}, },
{ {
"size" : "60x60", "size": "60x60",
"idiom" : "iphone", "idiom": "iphone",
"filename" : "AppIcon-60x60@2x.png", "filename": "AppIcon-60x60@2x.png",
"scale" : "2x" "scale": "2x"
}, },
{ {
"size" : "60x60", "size": "60x60",
"idiom" : "iphone", "idiom": "iphone",
"filename" : "AppIcon-60x60@3x.png", "filename": "AppIcon-60x60@3x.png",
"scale" : "3x" "scale": "3x"
}, },
{ {
"size" : "20x20", "size": "20x20",
"idiom" : "ipad", "idiom": "ipad",
"filename" : "AppIcon-20x20@1x.png", "filename": "AppIcon-20x20@1x.png",
"scale" : "1x" "scale": "1x"
}, },
{ {
"size" : "20x20", "size": "20x20",
"idiom" : "ipad", "idiom": "ipad",
"filename" : "AppIcon-20x20@2x-1.png", "filename": "AppIcon-20x20@2x-1.png",
"scale" : "2x" "scale": "2x"
}, },
{ {
"size" : "29x29", "size": "29x29",
"idiom" : "ipad", "idiom": "ipad",
"filename" : "AppIcon-29x29@1x.png", "filename": "AppIcon-29x29@1x.png",
"scale" : "1x" "scale": "1x"
}, },
{ {
"size" : "29x29", "size": "29x29",
"idiom" : "ipad", "idiom": "ipad",
"filename" : "AppIcon-29x29@2x.png", "filename": "AppIcon-29x29@2x.png",
"scale" : "2x" "scale": "2x"
}, },
{ {
"size" : "40x40", "size": "40x40",
"idiom" : "ipad", "idiom": "ipad",
"filename" : "AppIcon-40x40@1x.png", "filename": "AppIcon-40x40@1x.png",
"scale" : "1x" "scale": "1x"
}, },
{ {
"size" : "40x40", "size": "40x40",
"idiom" : "ipad", "idiom": "ipad",
"filename" : "AppIcon-40x40@2x-1.png", "filename": "AppIcon-40x40@2x-1.png",
"scale" : "2x" "scale": "2x"
}, },
{ {
"size" : "76x76", "size": "76x76",
"idiom" : "ipad", "idiom": "ipad",
"filename" : "AppIcon-76x76@1x.png", "filename": "AppIcon-76x76@1x.png",
"scale" : "1x" "scale": "1x"
}, },
{ {
"size" : "76x76", "size": "76x76",
"idiom" : "ipad", "idiom": "ipad",
"filename" : "AppIcon-76x76@2x.png", "filename": "AppIcon-76x76@2x.png",
"scale" : "2x" "scale": "2x"
}, },
{ {
"size" : "83.5x83.5", "size": "83.5x83.5",
"idiom" : "ipad", "idiom": "ipad",
"filename" : "AppIcon-83.5x83.5@2x.png", "filename": "AppIcon-83.5x83.5@2x.png",
"scale" : "2x" "scale": "2x"
}, },
{ {
"size" : "1024x1024", "size": "1024x1024",
"idiom" : "ios-marketing", "idiom": "ios-marketing",
"filename" : "AppIcon-512@2x.png", "filename": "AppIcon-512@2x.png",
"scale" : "1x" "scale": "1x"
} }
], ],
"info" : { "info": {
"version" : 1, "version": 1,
"author" : "xcode" "author": "xcode"
} }
} }

8
examples/api/src-tauri/gen/apple/Assets.xcassets/Contents.json
Unescape View File

@ -1,6 +1,6 @@
{ {
"info" : { "info": {
"version" : 1, "version": 1,
"author" : "xcode" "author": "xcode"
} }
} }

2
examples/api/src-tauri/src/lib.rs
Unescape View File

@ -36,7 +36,6 @@ pub fn run() {
.plugin(tauri_plugin_clipboard_manager::init()) .plugin(tauri_plugin_clipboard_manager::init())
.plugin(tauri_plugin_dialog::init()) .plugin(tauri_plugin_dialog::init())
.plugin(tauri_plugin_http::init()) .plugin(tauri_plugin_http::init())
.plugin(tauri_plugin_nfc::init())
.plugin(tauri_plugin_notification::init()) .plugin(tauri_plugin_notification::init())
.plugin(tauri_plugin_os::init()) .plugin(tauri_plugin_os::init())
.plugin(tauri_plugin_process::init()) .plugin(tauri_plugin_process::init())
@ -55,6 +54,7 @@ pub fn run() {
#[cfg(mobile)] #[cfg(mobile)]
{ {
app.handle().plugin(tauri_plugin_barcode_scanner::init())?; app.handle().plugin(tauri_plugin_barcode_scanner::init())?;
app.handle().plugin(tauri_plugin_nfc::init())?;
} }
let mut window_builder = WindowBuilder::new(app, "main", WindowUrl::default()); let mut window_builder = WindowBuilder::new(app, "main", WindowUrl::default());

48
plugins/nfc/guest-js/index.ts
Unescape View File

@ -2,6 +2,50 @@
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
export async function scanNdef() {} declare global {
interface Window {
__TAURI_INVOKE__: <T>(cmd: string, args?: unknown) => Promise<T>;
}
}
export async function scanTag() {} export enum ScanKind {
Ndef,
Tag,
}
export interface ScanOptions {
keepAlive?: boolean;
}
export interface TagRecord {
tnf: number;
kind: number[];
id: number[];
payload: number[];
}
export interface Tag {
id: string;
kind: string;
records: TagRecord[];
}
export interface Scan {
id: string;
kind: string;
tag: Tag;
}
export async function scan(
kind: ScanKind,
options?: ScanOptions,
): Promise<Scan> {
return await window.__TAURI_INVOKE__("plugin:nfc|scan", {
kind: kind === ScanKind.Ndef ? "ndef" : "tag",
...options,
});
}
export async function isAvailable(): Promise<boolean> {
return await window.__TAURI_INVOKE__("plugin:nfc|isAvailable");
}

27
plugins/nfc/ios/Sources/NfcPlugin.swift
Unescape View File

@ -45,7 +45,6 @@ class NfcPlugin: Plugin, NFCTagReaderSessionDelegate, NFCNDEFReaderSessionDelega
} }
func tagReaderSession(_ session: NFCTagReaderSession, didDetect tags: [NFCTag]) { func tagReaderSession(_ session: NFCTagReaderSession, didDetect tags: [NFCTag]) {
Logger.info("detected tags!")
let tag = tags.first! let tag = tags.first!
session.connect( session.connect(
@ -132,23 +131,23 @@ class NfcPlugin: Plugin, NFCTagReaderSessionDelegate, NFCNDEFReaderSessionDelega
switch tag { switch tag {
case .feliCa: case .feliCa:
metadata["type"] = "FeliCa" metadata["kind"] = "FeliCa"
metadata["id"] = nil metadata["id"] = nil
break break
case let .miFare(tag): case let .miFare(tag):
metadata["type"] = "MiFare" metadata["kind"] = "MiFare"
metadata["id"] = tag.identifier metadata["id"] = tag.identifier
break break
case let .iso15693(tag): case let .iso15693(tag):
metadata["type"] = "ISO15693" metadata["kind"] = "ISO15693"
metadata["id"] = tag.identifier metadata["id"] = tag.identifier
break break
case let .iso7816(tag): case let .iso7816(tag):
metadata["type"] = "ISO7816Compatible" metadata["kind"] = "ISO7816Compatible"
metadata["id"] = tag.identifier metadata["id"] = tag.identifier
break break
default: default:
metadata["type"] = "Unknown" metadata["kind"] = "Unknown"
metadata["id"] = nil metadata["id"] = nil
break break
} }
@ -260,8 +259,8 @@ class NfcPlugin: Plugin, NFCTagReaderSessionDelegate, NFCNDEFReaderSessionDelega
var records: [JsonObject] = [] var records: [JsonObject] = []
for record in message.records { for record in message.records {
var recordJson: JsonObject = [:] var recordJson: JsonObject = [:]
recordJson["tnf"] = record.typeNameFormat recordJson["tnf"] = record.typeNameFormat.rawValue
recordJson["type"] = record.type recordJson["kind"] = record.type
recordJson["id"] = record.identifier recordJson["id"] = record.identifier
recordJson["payload"] = record.payload recordJson["payload"] = record.payload
@ -273,16 +272,22 @@ class NfcPlugin: Plugin, NFCTagReaderSessionDelegate, NFCNDEFReaderSessionDelega
return tag return tag
} }
@objc func isAvailable(_ invoke: Invoke) {
invoke.resolve([
"available": NFCNDEFReaderSession.readingAvailable
])
}
@objc public func scan(_ invoke: Invoke) { @objc public func scan(_ invoke: Invoke) {
let kind: ScanKind let kind: ScanKind
switch invoke.getString("kind") { switch invoke.getString("kind") {
case "tag": case "tag":
kind = .tag kind = .tag
break break
case "ndef": case "ndef":
kind = .ndef kind = .ndef
break break
default: default:
invoke.reject("invalid `kind` argument, expected one of `tag`, `ndef`.") invoke.reject("invalid `kind` argument, expected one of `tag`, `ndef`.")
return return
} }

2
plugins/nfc/src/api-iife.js
Unescape View File

@ -1 +1 @@
if("__TAURI__"in window){var __TAURI_NFC__=function(_){"use strict";return _.scanNdef=async function(){},_.scanTag=async function(){},_}({});Object.defineProperty(window.__TAURI__,"nfc",{value:__TAURI_NFC__})} if("__TAURI__"in window){var __TAURI_NFC__=function(n){"use strict";var _;return n.ScanKind=void 0,(_=n.ScanKind||(n.ScanKind={}))[_.Ndef=0]="Ndef",_[_.Tag=1]="Tag",n.isAvailable=async function(){return await window.__TAURI_INVOKE__("plugin:nfc|isAvailable")},n.scan=async function(_,i){return await window.__TAURI_INVOKE__("plugin:nfc|scan",{kind:_===n.ScanKind.Ndef?"ndef":"tag",...i})},n}({});Object.defineProperty(window.__TAURI__,"nfc",{value:__TAURI_NFC__})}

26
plugins/nfc/src/desktop.rs
Unescape View File

@ -1,26 +0,0 @@
// Copyright 2019-2023 Tauri Programme within The Commons Conservancy
// SPDX-License-Identifier: Apache-2.0
// SPDX-License-Identifier: MIT
use serde::de::DeserializeOwned;
use tauri::{plugin::PluginApi, AppHandle, Runtime};
use crate::models::*;
pub fn init<R: Runtime, C: DeserializeOwned>(
app: &AppHandle<R>,
_api: PluginApi<R, C>,
) -> crate::Result<Nfc<R>> {
Ok(Nfc(app.clone()))
}
/// Access to the nfc APIs.
pub struct Nfc<R: Runtime>(AppHandle<R>);
impl<R: Runtime> Nfc<R> {
pub fn ping(&self, payload: PingRequest) -> crate::Result<PingResponse> {
Ok(PingResponse {
value: payload.value,
})
}
}

52
plugins/nfc/src/lib.rs
Unescape View File

@ -2,28 +2,50 @@
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
#![cfg(mobile)]
use serde::Deserialize;
use tauri::{ use tauri::{
plugin::{Builder, TauriPlugin}, plugin::{Builder, PluginHandle, TauriPlugin},
Manager, Runtime, Manager, Runtime,
}; };
pub use models::*; pub use models::*;
#[cfg(desktop)]
mod desktop;
#[cfg(mobile)]
mod mobile;
mod commands; mod commands;
mod error; mod error;
mod models; mod models;
pub use error::{Error, Result}; pub use error::{Error, Result};
#[cfg(desktop)] #[cfg(target_os = "android")]
use desktop::Nfc; const PLUGIN_IDENTIFIER: &str = "app.tauri.nfc";
#[cfg(mobile)]
use mobile::Nfc; #[cfg(target_os = "ios")]
tauri::ios_plugin_binding!(init_plugin_nfc);
/// Access to the nfc APIs.
pub struct Nfc<R: Runtime>(PluginHandle<R>);
#[derive(Deserialize)]
struct IsAvailableResponse {
available: bool,
}
impl<R: Runtime> Nfc<R> {
pub fn is_available(&self) -> crate::Result<bool> {
self.0
.run_mobile_plugin::<IsAvailableResponse>("isAvailable", ())
.map(|r| r.available)
.map_err(Into::into)
}
pub fn scan(&self, payload: ScanRequest) -> crate::Result<ScanResponse> {
self.0
.run_mobile_plugin("scan", payload)
.map_err(Into::into)
}
}
/// Extensions to [`tauri::App`], [`tauri::AppHandle`] and [`tauri::Window`] to access the nfc APIs. /// Extensions to [`tauri::App`], [`tauri::AppHandle`] and [`tauri::Window`] to access the nfc APIs.
pub trait NfcExt<R: Runtime> { pub trait NfcExt<R: Runtime> {
@ -42,11 +64,11 @@ pub fn init<R: Runtime>() -> TauriPlugin<R> {
.js_init_script(include_str!("api-iife.js").to_string()) .js_init_script(include_str!("api-iife.js").to_string())
.invoke_handler(tauri::generate_handler![commands::execute]) .invoke_handler(tauri::generate_handler![commands::execute])
.setup(|app, api| { .setup(|app, api| {
#[cfg(mobile)] #[cfg(target_os = "android")]
let nfc = mobile::init(app, api)?; let handle = api.register_android_plugin(PLUGIN_IDENTIFIER, "NfcPlugin")?;
#[cfg(desktop)] #[cfg(target_os = "ios")]
let nfc = desktop::init(app, api)?; let handle = api.register_ios_plugin(init_plugin_nfc)?;
app.manage(nfc); app.manage(Nfc(handle));
Ok(()) Ok(())
}) })
.build() .build()

29
plugins/nfc/src/mobile.rs
Unescape View File

@ -9,32 +9,3 @@ use tauri::{
}; };
use crate::models::*; use crate::models::*;
#[cfg(target_os = "android")]
const PLUGIN_IDENTIFIER: &str = "app.tauri.nfc";
#[cfg(target_os = "ios")]
tauri::ios_plugin_binding!(init_plugin_nfc);
// initializes the Kotlin or Swift plugin classes
pub fn init<R: Runtime, C: DeserializeOwned>(
_app: &AppHandle<R>,
api: PluginApi<R, C>,
) -> crate::Result<Nfc<R>> {
#[cfg(target_os = "android")]
let handle = api.register_android_plugin(PLUGIN_IDENTIFIER, "NfcPlugin")?;
#[cfg(target_os = "ios")]
let handle = api.register_ios_plugin(init_plugin_nfc)?;
Ok(Nfc(handle))
}
/// Access to the nfc APIs.
pub struct Nfc<R: Runtime>(PluginHandle<R>);
impl<R: Runtime> Nfc<R> {
pub fn ping(&self, payload: PingRequest) -> crate::Result<PingResponse> {
self.0
.run_mobile_plugin("ping", payload)
.map_err(Into::into)
}
}

60
plugins/nfc/src/models.rs
Unescape View File

@ -2,16 +2,60 @@
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize, Serializer};
use std::fmt::Display;
#[derive(Debug, Serialize)] #[derive(Serialize)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct PingRequest { pub struct ScanRequest {
pub value: Option<String>, pub kind: ScanKind,
pub keep_alive: bool,
} }
#[derive(Debug, Clone, Default, Deserialize)] #[derive(Deserialize)]
#[serde(rename_all = "camelCase")] pub struct NfcTagRecord {
pub struct PingResponse { pub tnf: u8,
pub value: Option<String>, pub kind: Vec<u8>,
pub id: Vec<u8>,
pub payload: Vec<u8>,
}
#[derive(Deserialize)]
pub struct NfcTag {
pub id: String,
pub kind: String,
pub records: Vec<NfcTagRecord>,
}
#[derive(Deserialize)]
pub struct ScanResponse {
pub tag: NfcTag,
}
#[derive(Debug)]
pub enum ScanKind {
Ndef,
Tag,
}
impl Display for ScanKind {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
write!(
f,
"{}",
match self {
Self::Ndef => "ndef",
Self::Tag => "tag",
}
)
}
}
impl Serialize for ScanKind {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: Serializer,
{
serializer.serialize_str(&self.to_string())
}
} }

Write Preview
Loading…
Cancel
Save