refactor: move `material_theme` and `iced_drop` into separate crates dir

23 files changed, 17 insertions, 24 deletions

diff --git a/Cargo.toml b/Cargo.toml
index e48a39c..1c0984b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -18,9 +18,9 @@ debug = ["iced/debug"]
 iced.workspace = true
 iced_anim.workspace = true
 iced_custom_highlighter = { git = "https://github.com/pml68/iced_custom_highlighter", branch = "master" }
-iced_drop = { path = "iced_drop" }
+iced_drop = { path = "crates/iced_drop" }
 iced_dialog.workspace = true
-material_theme = { path = "material_theme" }
+material_theme = { path = "crates/material_theme" }
 serde.workspace = true
 serde_json = "1.0.140"
 toml.workspace = true
@@ -74,7 +74,8 @@ name = "iced-builder"
 path = "src/main.rs"
 
 [workspace]
-members = ["iced_drop", "material_theme", "theme_test"]
+members = ["crates/*", "theme_test"]
+default-members = ["crates/material_theme", "."]
 
 [lints.rust]
 missing_debug_implementations = "deny"
diff --git a/iced_drop/Cargo.toml b/crates/iced_drop/Cargo.toml
index 0692084..0692084 100644
--- a/iced_drop/Cargo.toml
+++ b/crates/iced_drop/Cargo.toml
diff --git a/iced_drop/LICENSE b/crates/iced_drop/LICENSE
index 89d9fee..89d9fee 100644
--- a/iced_drop/LICENSE
+++ b/crates/iced_drop/LICENSE
diff --git a/iced_drop/README.md b/crates/iced_drop/README.md
index be854f2..be854f2 100644
--- a/iced_drop/README.md
+++ b/crates/iced_drop/README.md
diff --git a/iced_drop/src/lib.rs b/crates/iced_drop/src/lib.rs
index c1e1b03..c1e1b03 100644
--- a/iced_drop/src/lib.rs
+++ b/crates/iced_drop/src/lib.rs
diff --git a/iced_drop/src/widget.rs b/crates/iced_drop/src/widget.rs
index 6b3fed2..6b3fed2 100644
--- a/iced_drop/src/widget.rs
+++ b/crates/iced_drop/src/widget.rs
diff --git a/iced_drop/src/widget/droppable.rs b/crates/iced_drop/src/widget/droppable.rs
index 947cf5b..947cf5b 100644
--- a/iced_drop/src/widget/droppable.rs
+++ b/crates/iced_drop/src/widget/droppable.rs
diff --git a/iced_drop/src/widget/operation.rs b/crates/iced_drop/src/widget/operation.rs
index 3d7dcff..3d7dcff 100644
--- a/iced_drop/src/widget/operation.rs
+++ b/crates/iced_drop/src/widget/operation.rs
diff --git a/iced_drop/src/widget/operation/drop.rs b/crates/iced_drop/src/widget/operation/drop.rs
index ead412c..ead412c 100644
--- a/iced_drop/src/widget/operation/drop.rs
+++ b/crates/iced_drop/src/widget/operation/drop.rs
diff --git a/material_theme/Cargo.toml b/crates/material_theme/Cargo.toml
index eef9605..eef9605 100644
--- a/material_theme/Cargo.toml
+++ b/crates/material_theme/Cargo.toml
diff --git a/material_theme/README.md b/crates/material_theme/README.md
index da5a1ec..da5a1ec 100644
--- a/material_theme/README.md
+++ b/crates/material_theme/README.md
diff --git a/material_theme/assets/themes/dark.toml b/crates/material_theme/assets/themes/dark.toml
index 18a369f..18a369f 100644
--- a/material_theme/assets/themes/dark.toml
+++ b/crates/material_theme/assets/themes/dark.toml
diff --git a/material_theme/assets/themes/light.toml b/crates/material_theme/assets/themes/light.toml
index a7115c4..a7115c4 100644
--- a/material_theme/assets/themes/light.toml
+++ b/crates/material_theme/assets/themes/light.toml
diff --git a/material_theme/src/button.rs b/crates/material_theme/src/button.rs
index 21d77b7..21d77b7 100644
--- a/material_theme/src/button.rs
+++ b/crates/material_theme/src/button.rs
diff --git a/material_theme/src/container.rs b/crates/material_theme/src/container.rs
index a14cfd5..a14cfd5 100644
--- a/material_theme/src/container.rs
+++ b/crates/material_theme/src/container.rs
diff --git a/material_theme/src/dialog.rs b/crates/material_theme/src/dialog.rs
index 68c61b5..68c61b5 100644
--- a/material_theme/src/dialog.rs
+++ b/crates/material_theme/src/dialog.rs
diff --git a/material_theme/src/lib.rs b/crates/material_theme/src/lib.rs
index 521af2c..521af2c 100644
--- a/material_theme/src/lib.rs
+++ b/crates/material_theme/src/lib.rs
diff --git a/material_theme/src/menu.rs b/crates/material_theme/src/menu.rs
index 9f43c72..9f43c72 100644
--- a/material_theme/src/menu.rs
+++ b/crates/material_theme/src/menu.rs
diff --git a/material_theme/src/pick_list.rs b/crates/material_theme/src/pick_list.rs
index c589100..c589100 100644
--- a/material_theme/src/pick_list.rs
+++ b/crates/material_theme/src/pick_list.rs
diff --git a/material_theme/src/scrollable.rs b/crates/material_theme/src/scrollable.rs
index 8a22e56..ee739ba 100644
--- a/material_theme/src/scrollable.rs
+++ b/crates/material_theme/src/scrollable.rs
@@ -98,21 +98,17 @@ pub fn default(theme: &Theme, status: Status) -> Style {
             Style {
                 horizontal_rail: if is_horizontal_scrollbar_disabled {
                     disabled
+                } else if is_horizontal_scrollbar_hovered {
+                    hovered_rail
                 } else {
-                    if is_horizontal_scrollbar_hovered {
-                        hovered_rail
-                    } else {
-                        active
-                    }
+                    active
                 },
                 vertical_rail: if is_vertical_scrollbar_disabled {
                     disabled
+                } else if is_vertical_scrollbar_hovered {
+                    hovered_rail
                 } else {
-                    if is_vertical_scrollbar_hovered {
-                        hovered_rail
-                    } else {
-                        active
-                    }
+                    active
                 },
                 ..style
             }
@@ -138,21 +134,17 @@ pub fn default(theme: &Theme, status: Status) -> Style {
             Style {
                 horizontal_rail: if is_horizontal_scrollbar_disabled {
                     disabled
+                } else if is_horizontal_scrollbar_dragged {
+                    dragged_rail
                 } else {
-                    if is_horizontal_scrollbar_dragged {
-                        dragged_rail
-                    } else {
-                        active
-                    }
+                    active
                 },
                 vertical_rail: if is_vertical_scrollbar_disabled {
                     disabled
+                } else if is_vertical_scrollbar_dragged {
+                    dragged_rail
                 } else {
-                    if is_vertical_scrollbar_dragged {
-                        dragged_rail
-                    } else {
-                        active
-                    }
+                    active
                 },
                 ..style
             }
diff --git a/material_theme/src/text.rs b/crates/material_theme/src/text.rs
index 10b2e65..10b2e65 100644
--- a/material_theme/src/text.rs
+++ b/crates/material_theme/src/text.rs
diff --git a/material_theme/src/utils.rs b/crates/material_theme/src/utils.rs
index a05bc62..a05bc62 100644
--- a/material_theme/src/utils.rs
+++ b/crates/material_theme/src/utils.rs
diff --git a/theme_test/Cargo.toml b/theme_test/Cargo.toml
index 5ccbefa..29fcdc8 100644
--- a/theme_test/Cargo.toml
+++ b/theme_test/Cargo.toml
@@ -7,4 +7,4 @@ edition = "2024"
 iced.workspace = true
 iced_anim.workspace = true
 iced_dialog.workspace = true
-material_theme = { path = "../material_theme", features = ["dialog", "animate"] }
+material_theme = { path = "../crates/material_theme", features = ["dialog", "animate"] }