Merge pull request #20 from pml68/feat/custom-theme

1 files changed, 29 insertions, 14 deletions

diff --git a/Cargo.toml b/Cargo.toml
index d646fd7..a653682 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,36 +16,44 @@ debug = ["iced/debug"]
 
 [dependencies]
 iced.workspace = true
-iced_anim = { git = "https://github.com/pml68/iced_anim", features = ["derive"] }
+iced_anim.workspace = true
 iced_custom_highlighter = { git = "https://github.com/pml68/iced_custom_highlighter", branch = "master" }
-iced_drop = { path = "iced_drop" }
-iced_dialog = { git = "https://github.com/pml68/iced_dialog", branch = "iced/personal" }
-serde = { version = "1.0.217", features = ["derive"] }
-serde_json = "1.0.138"
-toml = "0.8.20"
-tokio = { version = "1.43", features = ["fs"] }
+iced_drop = { path = "crates/iced_drop" }
+iced_dialog.workspace = true
+material_theme = { path = "crates/material_theme", features = ["animate", "serde", "dialog", "image", "svg"] }
+serde.workspace = true
+serde_json = "1.0.140"
+toml.workspace = true
+tokio = { version = "1.44.2", features = ["fs"] }
 tokio-stream = { version = "0.1", features = ["fs"] }
 # TODO: enable tokio when it actually compiles
 # rfd = { version = "0.15.2", default-features = false, features = ["tokio", "xdg-portal"]  }
 rfd = "0.15.3"
 rust-format = "0.3.4"
 fxhash = "0.2.1"
-thiserror = "2.0.11"
+thiserror = "2.0.12"
 dirs-next = "2.0.0"
 
+[workspace.dependencies]
+iced_widget = "0.14.0-dev"
+iced_anim = { version = "0.2.1", features = ["derive"] }
+iced_dialog = { git = "https://github.com/pml68/iced_dialog", branch = "iced/personal" }
+serde = { version = "1.0.219", features = ["derive"] }
+toml = "0.8.21"
+
 [workspace.dependencies.iced]
-git = "https://github.com/pml68/iced"
-branch = "feat/rehighlight-on-redraw"
-features = ["image", "svg", "advanced", "tokio"]
+version = "0.14.0-dev"
+default-features = false
+features = ["wgpu", "tiny-skia", "web-colors", "auto-detect-theme", "advanced", "tokio", "image", "svg", "lazy"]
 
 [build-dependencies]
-iced_fontello = "0.13.2"
+iced_fontello = { path = "crates/iced_fontello" }
 
 [target.'cfg(target_os = "macos")'.dependencies]
 xdg = "2.5.2"
 
 [target.'cfg(windows)'.build-dependencies]
-embed-resource = "3.0.1"
+embed-resource = "3.0.2"
 windows_exe_info = "0.5"
 
 [profile.dev]
@@ -67,7 +75,8 @@ name = "iced-builder"
 path = "src/main.rs"
 
 [workspace]
-members = ["iced_drop"]
+members = ["crates/*"]
+default-members = ["crates/material_theme", "."]
 
 [lints.rust]
 missing_debug_implementations = "deny"
@@ -88,3 +97,9 @@ from_over_into = "deny"
 needless_borrow = "deny"
 new_without_default = "deny"
 useless_conversion = "deny"
+clone_on_copy = "deny"
+
+[patch.crates-io]
+iced = { git = "https://github.com/pml68/iced", branch = "feat/rehighlight-on-redraw" }
+iced_anim = { git = "https://github.com/pml68/iced_anim" }
+iced_widget = { git = "https://github.com/pml68/iced", branch = "feat/rehighlight-on-redraw" }