refactor(geolocation): simplify API, defer permission checks (#1773)

tauri-apps · Sep 16, 2024 · 6076569 · 6076569
1 parent fd75401
commit 6076569
Show file tree

Hide file tree

Showing 28 changed files with 445 additions and 13,960 deletions.
diff --git a/.changes/geolocation-permission-refactor.md b/.changes/geolocation-permission-refactor.md
@@ -0,0 +1,5 @@
+---
+"geolocation": patch
+---
+
+No longer request permission automatically and leave to the user how to handle the `checkPermissions` and `requestPermissions` APIs.
diff --git a/.changes/update-geolocation-api.md b/.changes/update-geolocation-api.md
@@ -0,0 +1,5 @@
+---
+"geolocation-js": patch
+---
+
+Update API to match other plugins.
diff --git a/.gitignore b/.gitignore
@@ -26,9 +26,15 @@ target/
 # compiled plugins
 dist-js/
 
-# plugins .tauri director
+# plugins .tauri directory
 /plugins/*/.tauri
 
+# examples
+examples/*/dist
+plugins/*/examples/*/dist
+examples/*/src-tauri/gen/schemas
+plugins/*/examples/*/src-tauri/gen/schemas
+
 # logs
 logs
 *.log

diff --git a/.prettierignore b/.prettierignore
@@ -24,3 +24,4 @@ CHANGELOG.md
 # mobile build
 **/ios/.build
 **/.tauri
+plugins/*/android/build
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/examples/api/.gitignore b/examples/api/.gitignore
diff --git a/examples/api/dist/.gitkeep b/examples/api/dist/.gitkeep
diff --git a/examples/api/package.json b/examples/api/package.json
@@ -16,7 +16,9 @@
     "@tauri-apps/plugin-clipboard-manager": "2.0.0-rc.2",
     "@tauri-apps/plugin-dialog": "2.0.0-rc.1",
     "@tauri-apps/plugin-fs": "2.0.0-rc.2",
+    "@tauri-apps/plugin-geolocation": "2.0.0-rc.1",
     "@tauri-apps/plugin-global-shortcut": "2.0.0-rc.1",
+    "@tauri-apps/plugin-haptics": "2.0.0-rc.1",
     "@tauri-apps/plugin-http": "2.0.0-rc.2",
     "@tauri-apps/plugin-nfc": "2.0.0-rc.1",
     "@tauri-apps/plugin-notification": "2.0.0-rc.1",

diff --git a/examples/api/src-tauri/Cargo.toml b/examples/api/src-tauri/Cargo.toml
@@ -59,6 +59,8 @@ tauri-plugin-window-state = { path = "../../../plugins/window-state", version =
 tauri-plugin-barcode-scanner = { path = "../../../plugins/barcode-scanner/", version = "2.0.0-rc.4" }
 tauri-plugin-nfc = { path = "../../../plugins/nfc", version = "2.0.0-rc.3" }
 tauri-plugin-biometric = { path = "../../../plugins/biometric/", version = "2.0.0-rc.3" }
+tauri-plugin-geolocation = { path = "../../../plugins/geolocation/", version = "2.0.0-rc.3" }
+tauri-plugin-haptics = { path = "../../../plugins/haptics/", version = "2.0.0-rc.3" }
 
 [features]
 prod = ["tauri/custom-protocol"]
diff --git a/examples/api/src-tauri/capabilities/mobile.json b/examples/api/src-tauri/capabilities/mobile.json
@@ -11,6 +11,10 @@
     "barcode-scanner:allow-scan",
     "barcode-scanner:allow-cancel",
     "barcode-scanner:allow-request-permissions",
-    "barcode-scanner:allow-check-permissions"
+    "barcode-scanner:allow-check-permissions",
+    "geolocation:allow-check-permissions",
+    "geolocation:allow-request-permissions",
+    "geolocation:allow-watch-position",
+    "geolocation:allow-get-current-position"
   ]
 }
diff --git a/examples/api/src-tauri/gen/android/.idea/misc.xml b/examples/api/src-tauri/gen/android/.idea/misc.xml
diff --git a/examples/api/src-tauri/gen/schemas/desktop-schema.json b/examples/api/src-tauri/gen/schemas/desktop-schema.json
diff --git a/examples/api/src-tauri/gen/schemas/mobile-schema.json b/examples/api/src-tauri/gen/schemas/mobile-schema.json
diff --git a/examples/api/src-tauri/src/lib.rs b/examples/api/src-tauri/src/lib.rs
@@ -55,6 +55,8 @@ pub fn run() {
                 app.handle().plugin(tauri_plugin_barcode_scanner::init())?;
                 app.handle().plugin(tauri_plugin_nfc::init())?;
                 app.handle().plugin(tauri_plugin_biometric::init())?;
+                app.handle().plugin(tauri_plugin_geolocation::init())?;
+                app.handle().plugin(tauri_plugin_haptics::init())?;
             }
 
             let mut webview_window_builder =