Skip to content

Commit c84e967

Browse files
marc2332marc2332
committed
refactor: Improved crates organization
1 parent a8ad6a2 commit c84e967

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+348
-370
lines changed

‎Cargo.lock

Lines changed: 119 additions & 120 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
11
[package]
22
name = "examples"
3-
version = "0.1.0"
3+
version = "0.0.0"
44
edition = "2021"
55

66
[workspace]
7-
members = ["layers", "layout", "renderer", "state", "freya", "elements-namespace", "components", "hooks"]
7+
members = ["layers", "layout", "renderer", "state", "freya", "elements", "components", "hooks"]
88

99
[features]
1010
x11 = ["freya/x11"]
1111
wireframe = ["freya/wireframe"]
1212

1313
[dev-dependencies]
1414
freya = { path = "./freya"}
15-
dioxus = { git = "https://github.com/marc2332/dioxus", branch = "patch-3", features = ["macro", "hooks"]}
15+
dioxus = { git = "https://github.com/dioxuslabs/dioxus", features = ["macro", "hooks"]}
1616
tokio = "1.17.0"
17-
elements-namespace = { path = "./elements-namespace"}
18-
components = { path = "./components"}
19-
fermi = { git = "https://github.com/marc2332/dioxus", branch = "patch-3" }
20-
hooks = { path = "./hooks"}
17+
fermi = { git = "https://github.com/dioxuslabs/dioxus" }

‎components/Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[package]
2-
name = "components"
2+
name = "freya-components"
33
version = "0.1.0"
44
edition = "2021"
55

66
[dependencies]
7-
dioxus = { git = "https://github.com/marc2332/dioxus" , branch = "patch-3" }
8-
elements-namespace = { path = "../elements-namespace"}
9-
state = { path = "../state"}
10-
fermi = { git = "https://github.com/marc2332/dioxus", branch = "patch-3" }
11-
hooks = { path = "../hooks"}
7+
dioxus = { git = "https://github.com/dioxuslabs/dioxus" }
8+
fermi = { git = "https://github.com/dioxuslabs/dioxus" }
9+
freya-elements = { path = "../elements", version = "0.1.0" }
10+
freya-node-state = { path = "../state", version = "0.1.0" }
11+
freya-hooks = { path = "../hooks", version = "0.1.0" }

‎components/src/button.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use dioxus::{events::MouseEvent, prelude::*};
2-
use elements_namespace as dioxus_elements;
32
use fermi::*;
3+
use freya_elements as dioxus_elements;
44

55
use crate::THEME;
66

‎components/src/scroll_view.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use dioxus::{core::UiEvent, events::WheelData, prelude::*};
2-
use elements_namespace as dioxus_elements;
2+
use freya_elements as dioxus_elements;
33

44
#[allow(non_snake_case)]
55
pub fn ScrollView<'a>(cx: Scope<'a, ScrollViewProps<'a>>) -> Element {

‎components/src/switch.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use dioxus::{core::UiEvent, events::MouseData, prelude::*};
2-
use elements_namespace as dioxus_elements;
32
use fermi::use_atom_ref;
4-
use hooks::{use_animation, AnimationMode};
3+
use freya_elements as dioxus_elements;
4+
use freya_hooks::{use_animation, AnimationMode};
55

66
use crate::THEME;
77

‎elements-namespace/Cargo.toml

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎elements/Cargo.toml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
[package]
2+
name = "freya-elements"
3+
version = "0.1.0"
4+
edition = "2021"
5+
6+
[dependencies]
7+
bumpalo = "3.11.0"
8+
dioxus-core = { git = "https://github.com/dioxuslabs/dioxus" }
9+
dioxus-html = { git = "https://github.com/dioxuslabs/dioxus" }

‎elements-namespace/src/lib.rs renamed to ‎elements/src/lib.rs

File renamed without changes.

‎examples/animation.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@
44
)]
55

66
use dioxus::{core::UiEvent, events::MouseData, prelude::*};
7-
use elements_namespace as dioxus_elements;
8-
9-
use freya::launch;
10-
use hooks::{use_animation, AnimationMode};
7+
use freya::{dioxus_elements, *};
118

129
fn main() {
1310
launch(app);

‎examples/click.rs

Lines changed: 38 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,38 @@
1-
#![cfg_attr(
2-
all(not(debug_assertions), target_os = "windows"),
3-
windows_subsystem = "windows"
4-
)]
5-
6-
use dioxus::prelude::*;
7-
use elements_namespace as dioxus_elements;
8-
9-
use freya::launch;
10-
11-
fn main() {
12-
launch(app);
13-
}
14-
15-
fn app(cx: Scope) -> Element {
16-
let mut count = use_state(&cx, || 0);
17-
18-
cx.render(rsx!(
19-
rect {
20-
background: "red",
21-
padding: "50",
22-
direction: "both",
23-
width: "auto",
24-
height: "auto",
25-
rect {
26-
padding: "25",
27-
height: "100%",
28-
width: "100%",
29-
background: "blue",
30-
onclick: move |_| count += 10,
31-
label {
32-
"Increase!"
33-
}
34-
label {
35-
"{count}"
36-
}
37-
}
38-
}
39-
))
40-
}
1+
#![cfg_attr(
2+
all(not(debug_assertions), target_os = "windows"),
3+
windows_subsystem = "windows"
4+
)]
5+
6+
use dioxus::prelude::*;
7+
use freya::{dioxus_elements, *};
8+
9+
fn main() {
10+
launch(app);
11+
}
12+
13+
fn app(cx: Scope) -> Element {
14+
let mut count = use_state(&cx, || 0);
15+
16+
cx.render(rsx!(
17+
rect {
18+
background: "red",
19+
padding: "50",
20+
direction: "both",
21+
width: "auto",
22+
height: "auto",
23+
rect {
24+
padding: "25",
25+
height: "100%",
26+
width: "100%",
27+
background: "blue",
28+
onclick: move |_| count += 10,
29+
label {
30+
"Increase!"
31+
}
32+
label {
33+
"{count}"
34+
}
35+
}
36+
}
37+
))
38+
}

‎examples/counter.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
)]
55

66
use dioxus::prelude::*;
7-
use elements_namespace as dioxus_elements;
8-
use freya::launch;
7+
use freya::{dioxus_elements, *};
98

109
fn main() {
1110
launch(app);

‎examples/divider.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
)]
55

66
use dioxus::prelude::*;
7-
use elements_namespace as dioxus_elements;
8-
use freya::launch;
7+
use freya::{dioxus_elements, *};
98

109
fn main() {
1110
launch(app);

‎examples/drag.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
)]
55

66
use dioxus::{core::UiEvent, events::MouseData, prelude::*};
7-
use elements_namespace as dioxus_elements;
8-
9-
use freya::launch;
7+
use freya::{dioxus_elements, *};
108

119
fn main() {
1210
launch(app);

‎examples/drawer.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@
33
windows_subsystem = "windows"
44
)]
55

6-
use components::ScrollView;
76
use dioxus::{events::MouseEvent, prelude::*};
8-
use elements_namespace as dioxus_elements;
9-
use freya::launch;
7+
use freya::{dioxus_elements, *};
108
use tokio::time::Instant;
119

1210
fn main() {

‎examples/image.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66
use dioxus::core::UiEvent;
77
use dioxus::events::WheelData;
88
use dioxus::prelude::*;
9-
use elements_namespace as dioxus_elements;
10-
use elements_namespace::AttributeValue;
11-
use freya::launch;
9+
use freya::{
10+
dioxus_elements::{self, AttributeValue},
11+
*,
12+
};
1213

1314
fn main() {
1415
launch(app);

‎examples/min_size.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
)]
55

66
use dioxus::prelude::*;
7-
use elements_namespace as dioxus_elements;
8-
9-
use freya::launch;
7+
use freya::{dioxus_elements, *};
108

119
fn main() {
1210
launch(app);

‎examples/mouse.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
)]
55

66
use dioxus::{core::UiEvent, events::MouseData, prelude::*};
7-
use elements_namespace as dioxus_elements;
8-
use freya::launch;
7+
use freya::{dioxus_elements, *};
98

109
fn main() {
1110
launch(app);

0 commit comments

Comments
 (0)