feat: Dioxus 0.6 support (#57)

* feat: Dioxus 0.6 support

* bump dioxus-signals

* chore: clean up

* update: alpha 5

* Fix Unnescessary Warning Messages (#62)

* fix: allow window resize signal writes

* progress: interval

* fix: interval warnings, geolocation

* remove: warnings dep

* revision: change to 1 second

* 0.6.0-rc.0

* update: dioxus 0.6 & final touches

* fix: ci

* fix: clippy & issues

---------

Co-authored-by: Miles Murgaw <[email protected]>

.github/workflows/rust.yml

@@ -2,9 +2,19 @@ name: Rust
 
 on:
   push:
-    branches: [ "master" ]
+    branches:
+      - main
+    paths:
+      - sdk/**
+      - examples/**
+
   pull_request:
-    branches: [ "master" ]
+    types: [opened, synchronize, reopened, ready_for_review]
+    branches:
+      - main
+    paths:
+      - sdk/**
+      - examples/**
 
 env:
   CARGO_TERM_COLOR: always

.github/workflows/testing.yml

@@ -3,9 +3,19 @@ name: Testing
 
 on:
   push:
-    branches: [ "master" ]
+    branches:
+      - main
+    paths:
+      - sdk/**
+      - examples/**
+
   pull_request:
-    branches: [ "master" ]
+    types: [opened, synchronize, reopened, ready_for_review]
+    branches:
+      - main
+    paths:
+      - sdk/**
+      - examples/**
 
 env:
   CARGO_TERM_COLOR: always

.vscode/settings.json

@@ -1,6 +1,4 @@
 {
-    "rust-analyzer.cargo.features": [
-        "wasm-testing"
-    ],
-    "rust-analyzer.cargo.target": "wasm32-unknown-unknown",
+    "rust-analyzer.cargo.features": "all",
+    "rust-analyzer.check.features": "all",
 }

Cargo.toml

@@ -2,8 +2,8 @@
 resolver = "2"
 members = ["sdk", "examples/*"]
 
-
 [workspace.dependencies]
 dioxus-sdk = { path = "./sdk" }
-dioxus = { version = "0.5" }
-dioxus-desktop = { version = "0.5" }
+dioxus = { version = "0.6.0" }
+dioxus-desktop = { version = "0.6.0" }
+dioxus-signals = { version = "0.6.0" }

README.md

@@ -34,7 +34,6 @@
 - [x] Clipboard - (Desktop)
 - [x] Notifications - (Desktop)
 - [x] Color Scheme - (Web)
-- [x] i18n
 - [x] Utility Hooks 
   - [x] use_channel
   - [x] use_window_size
@@ -82,7 +81,7 @@ sudo apt-get install xorg-dev
 You can add `dioxus-sdk` to your application by adding it to your dependencies.
 ```toml
 [dependencies]
-dioxus-sdk = { version = "0.5", features = [] }
+dioxus-sdk = { version = "0.6", features = [] }
 ```
 
 ## License

examples/README.md

@@ -6,9 +6,6 @@ Learn how to use `use_system_theme`.
 ### [`geolocation`](./geolocation/)
 Learn how to use the `geolocation` abstraction.
 
-### [`i18n`](./i18n/)
-Learn how to use the `i18n` abstraction.
-
 ### [`channel`](./channel/)
 Learn how to use the `channel` abstraction.
 

examples/storage/Cargo.toml

@@ -11,4 +11,4 @@ dioxus = { workspace = true, features = ["router"] }
 web = ["dioxus/web"]
 desktop = ["dioxus/desktop"]
 fullstack = ["dioxus/fullstack"]
-server = ["dioxus/axum"]
+server = ["dioxus/server"]

examples/timing/Cargo.toml

@@ -5,10 +5,9 @@ edition = "2021"
 
 [dependencies]
 dioxus-sdk = { workspace = true, features = ["timing"] }
-dioxus = { workspace = true, features = ["desktop"] }
+dioxus = { workspace = true }
+dioxus-logger = "0.5.1"
 
-log = "0.4.6"
-
-# WebAssembly Debug
-wasm-logger = "0.2.0"
-console_error_panic_hook = "0.1.7"
+[features]
+web = ["dioxus/web"]
+desktop = ["dioxus/desktop"]

examples/timing/src/main.rs

@@ -1,24 +1,24 @@
 use dioxus::prelude::*;
+use dioxus_logger::tracing::{info, Level};
 use dioxus_sdk::utils::timing::{use_debounce, use_interval};
 use std::time::Duration;
 
 fn main() {
-    // init debug tool for WebAssembly
-    wasm_logger::init(wasm_logger::Config::default());
-    console_error_panic_hook::set_once();
-
+    dioxus_logger::init(Level::INFO).expect("logger failed to init");
     launch(app);
 }
 
 fn app() -> Element {
     let mut count = use_signal(|| 0);
 
-    use_interval(Duration::from_millis(100), move || {
+    // using `use_interval`, we increment the count by 1 every second.
+    use_interval(Duration::from_secs(1), move || {
         count += 1;
     });
 
+    // using `use_debounce`, we reset the counter after 2 seconds since the last button click.
     let mut debounce = use_debounce(Duration::from_millis(2000), move |text| {
-        println!("{text}");
+        info!("{text}");
         count.set(0);
     });
 

examples/window_size/Cargo.toml

@@ -10,5 +10,3 @@ dioxus = { workspace = true }
 [features]
 web = ["dioxus/web"]
 desktop = ["dioxus/desktop"]
-
-

sdk/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dioxus-sdk"
-version = "0.5.0"
+version = "0.6.0"
 authors = ["Jonathan Kelley", "Dioxus Labs", "ealmloff", "DogeDark", "marc2332"]
 edition = "2021"
 description = "Platform agnostic library for supercharging your productivity with Dioxus"
@@ -29,6 +29,7 @@ geolocation = [
     "windows/Devices_Geolocation",
 
     # Wasm
+    "web-sys/Window",
     "web-sys/Navigator",
     "web-sys/Geolocation",
     "web-sys/PositionOptions",
@@ -59,14 +60,6 @@ window_size = [
     "dep:wasm-bindgen",
 ]
 channel = ["dep:async-broadcast", "uuid/v4"]
-i18n = [
-    # Shared
-    "dep:serde",
-    "dep:serde_json",
-
-    # Non Shared
-    "dep:unic-langid",
-]
 storage = [
     # Shared
     "dep:rustc-hash",
@@ -106,7 +99,6 @@ wasm-testing = [
     "channel",
     "window_size",
     "timing",
-    "i18n",
     "storage",
 ]
 desktop-testing = [
@@ -116,7 +108,6 @@ desktop-testing = [
     "geolocation",
     "channel",
     "window_size",
-    "i18n",
     "timing",
     "storage",
 ]
@@ -129,6 +120,7 @@ desktop-testing = [
 [dependencies]
 dioxus = { workspace = true }
 cfg-if = "1.0.0"
+warnings = "0.2.0"
 
 # Used by: clipboard
 copypasta = { version = "0.8.2", optional = true }
@@ -145,18 +137,14 @@ async-broadcast = { version = "0.5.1", optional = true }
 futures = { version = "0.3.28", features = ["std"], optional = true }
 futures-util = { version = "0.3.28", optional = true }
 
-# Used by: i18n
-serde = { version = "1.0.163", optional = true }
-serde_json = { version = "1.0.96", optional = true }
-unic-langid = { version = "0.9.1", features = ["serde"], optional = true }
-
 # Used by: storage
 rustc-hash = { version = "1.1.0", optional = true }
 postcard = { version = "1.0.2", features = ["use-std"], optional = true }
 once_cell = { version = "1.17.0", optional = true }
-dioxus-signals = { version = "0.5.1", features = [
+dioxus-signals = { workspace = true, features = [
     "serialize",
 ], optional = true }
+serde = { version = "1.0.163", optional = true }
 
 yazi = { version = "0.1.4", optional = true }
 tracing = "0.1.40"

sdk/src/geolocation/platform/wasm.rs

@@ -184,10 +184,12 @@ pub fn listen(
 
 /// Set the device's power mode.
 pub fn set_power_mode(geolocator: &mut Geolocator, power_mode: PowerMode) -> Result<(), Error> {
-    match power_mode {
-        PowerMode::High => geolocator.options.enable_high_accuracy(true),
-        PowerMode::Low => geolocator.options.enable_high_accuracy(false),
+    let value = match power_mode {
+        PowerMode::High => true,
+        PowerMode::Low => false,
     };
 
+    geolocator.options.set_enable_high_accuracy(value);
+
     Ok(())
 }

sdk/src/geolocation/use_geolocation.rs

@@ -20,7 +20,7 @@ pub fn use_geolocation() -> ReadOnlySignal<Result<Geocoordinates, Error>> {
         use_signal(|| Err(Error::NotInitialized));
 
     // Initialize the handler of events
-    let listener = use_coroutine(|mut rx: UnboundedReceiver<Event>| async move {
+    let listener = use_coroutine(move |mut rx: UnboundedReceiver<Event>| async move {
         while let Some(event) = rx.next().await {
             match event {
                 Event::NewGeocoordinates(new_coords) => {