fix(ios): fully working mobile versions
fix fix fix testing testing fix
This commit is contained in:
@ -24,7 +24,7 @@
|
|||||||
"@tauri-apps/plugin-http": "2.4.3",
|
"@tauri-apps/plugin-http": "2.4.3",
|
||||||
"@tauri-apps/plugin-log": "~2",
|
"@tauri-apps/plugin-log": "~2",
|
||||||
"@tauri-apps/plugin-opener": "^2",
|
"@tauri-apps/plugin-opener": "^2",
|
||||||
"@tauri-apps/plugin-os": "~2",
|
"@tauri-apps/plugin-os": "2.2.1",
|
||||||
"clsx": "^2.1.1",
|
"clsx": "^2.1.1",
|
||||||
"fuse.js": "^7.1.0",
|
"fuse.js": "^7.1.0",
|
||||||
"jwt-decode": "^4.0.0",
|
"jwt-decode": "^4.0.0",
|
||||||
|
@ -29,7 +29,7 @@ log = "0.4"
|
|||||||
tauri-plugin-http = "2.4.3"
|
tauri-plugin-http = "2.4.3"
|
||||||
tauri-plugin-log = "2"
|
tauri-plugin-log = "2"
|
||||||
tauri-plugin-fs = "2"
|
tauri-plugin-fs = "2"
|
||||||
tauri-plugin-os = "2"
|
tauri-plugin-os = "2.2.1"
|
||||||
tauri-plugin-store = "2"
|
tauri-plugin-store = "2"
|
||||||
|
|
||||||
[target."cfg(target_os = \"macos\")".dependencies]
|
[target."cfg(target_os = \"macos\")".dependencies]
|
||||||
|
@ -9,6 +9,7 @@ permissions = [
|
|||||||
"core:window:allow-show",
|
"core:window:allow-show",
|
||||||
"core:window:allow-set-focus",
|
"core:window:allow-set-focus",
|
||||||
"fs:default",
|
"fs:default",
|
||||||
|
"os:default",
|
||||||
{ identifier = "http:default", allow = [
|
{ identifier = "http:default", allow = [
|
||||||
{ url = "https://haystack.johncosta.tech" },
|
{ url = "https://haystack.johncosta.tech" },
|
||||||
{ url = "http://localhost:3040" },
|
{ url = "http://localhost:3040" },
|
||||||
|
@ -7,6 +7,7 @@ permissions = [
|
|||||||
"core:default",
|
"core:default",
|
||||||
"fs:default",
|
"fs:default",
|
||||||
"http:default",
|
"http:default",
|
||||||
|
"os:default",
|
||||||
{ identifier = "http:default", allow = [
|
{ identifier = "http:default", allow = [
|
||||||
{ url = "https://haystack.johncosta.tech" },
|
{ url = "https://haystack.johncosta.tech" },
|
||||||
{ url = "http://localhost:3040" },
|
{ url = "http://localhost:3040" },
|
||||||
|
@ -1,6 +1,3 @@
|
|||||||
#[cfg(any(target_os = "linux", target_os = "macos", target_os = "windows"))]
|
|
||||||
mod window;
|
|
||||||
|
|
||||||
#[cfg(any(target_os = "linux", target_os = "macos", target_os = "windows"))]
|
#[cfg(any(target_os = "linux", target_os = "macos", target_os = "windows"))]
|
||||||
mod screenshot;
|
mod screenshot;
|
||||||
|
|
||||||
@ -9,16 +6,14 @@ mod commands;
|
|||||||
|
|
||||||
#[cfg(any(target_os = "linux", target_os = "macos", target_os = "windows"))]
|
#[cfg(any(target_os = "linux", target_os = "macos", target_os = "windows"))]
|
||||||
mod shortcut;
|
mod shortcut;
|
||||||
#[cfg(any(target_os = "linux", target_os = "macos", target_os = "windows"))]
|
|
||||||
mod state;
|
|
||||||
|
|
||||||
#[cfg(any(target_os = "linux", target_os = "macos", target_os = "windows"))]
|
#[cfg(any(target_os = "linux", target_os = "macos", target_os = "windows"))]
|
||||||
mod utils;
|
mod utils;
|
||||||
|
|
||||||
#[cfg(any(target_os = "linux", target_os = "macos", target_os = "windows"))]
|
mod state;
|
||||||
use state::new_shared_watcher_state;
|
mod window;
|
||||||
|
|
||||||
#[cfg(any(target_os = "linux", target_os = "macos", target_os = "windows"))]
|
use state::new_shared_watcher_state;
|
||||||
use window::setup_window;
|
use window::setup_window;
|
||||||
|
|
||||||
#[cfg(any(target_os = "linux", target_os = "macos", target_os = "windows"))]
|
#[cfg(any(target_os = "linux", target_os = "macos", target_os = "windows"))]
|
||||||
@ -58,12 +53,14 @@ pub fn desktop() {
|
|||||||
#[cfg(any(target_os = "ios", target_os = "android"))]
|
#[cfg(any(target_os = "ios", target_os = "android"))]
|
||||||
pub fn android() {
|
pub fn android() {
|
||||||
tauri::Builder::default()
|
tauri::Builder::default()
|
||||||
//.plugin(tauri_plugin_fs::init())
|
.plugin(tauri_plugin_os::init())
|
||||||
//.plugin(tauri_plugin_store::Builder::new().build())
|
.plugin(tauri_plugin_fs::init())
|
||||||
//.plugin(tauri_plugin_http::init())
|
.plugin(tauri_plugin_store::Builder::new().build())
|
||||||
|
.plugin(tauri_plugin_http::init())
|
||||||
//.plugin(tauri_plugin_sharetarget::init())
|
//.plugin(tauri_plugin_sharetarget::init())
|
||||||
.setup(|app| {
|
.setup(|app| {
|
||||||
// setup_window(app)?;
|
log::info!("running things!");
|
||||||
|
setup_window(app)?;
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
})
|
})
|
||||||
|
Reference in New Issue
Block a user