From 6cfb2bf02f6dbeda77b982e53c827da92311d175 Mon Sep 17 00:00:00 2001 From: StarArawn <toasterthegamer@gmail.com> Date: Mon, 13 Dec 2021 09:48:17 -0500 Subject: [PATCH] Rename kayak_components to kayak_widgets --- Cargo.lock | 18 +++++++++--------- Cargo.toml | 9 ++------- bevy_kayak_ui/Cargo.toml | 2 +- examples/bevy.rs | 2 +- examples/counter.rs | 2 +- examples/full_ui.rs | 2 +- examples/global_counter.rs | 2 +- examples/image.rs | 2 +- examples/nine_patch.rs | 2 +- {kayak_components => kayak_widgets}/.gitignore | 0 {kayak_components => kayak_widgets}/Cargo.toml | 2 +- {kayak_components => kayak_widgets}/src/app.rs | 0 .../src/background.rs | 0 .../src/button.rs | 0 .../src/clip.rs | 0 .../src/element.rs | 0 .../src/image.rs | 0 {kayak_components => kayak_widgets}/src/lib.rs | 0 .../src/nine_patch.rs | 0 .../src/text.rs | 0 .../src/window.rs | 0 src/lib.rs | 2 +- 22 files changed, 20 insertions(+), 25 deletions(-) rename {kayak_components => kayak_widgets}/.gitignore (100%) rename {kayak_components => kayak_widgets}/Cargo.toml (83%) rename {kayak_components => kayak_widgets}/src/app.rs (100%) rename {kayak_components => kayak_widgets}/src/background.rs (100%) rename {kayak_components => kayak_widgets}/src/button.rs (100%) rename {kayak_components => kayak_widgets}/src/clip.rs (100%) rename {kayak_components => kayak_widgets}/src/element.rs (100%) rename {kayak_components => kayak_widgets}/src/image.rs (100%) rename {kayak_components => kayak_widgets}/src/lib.rs (100%) rename {kayak_components => kayak_widgets}/src/nine_patch.rs (100%) rename {kayak_components => kayak_widgets}/src/text.rs (100%) rename {kayak_components => kayak_widgets}/src/window.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index 0298c92..bbc3219 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -429,10 +429,10 @@ dependencies = [ "bevy", "bytemuck", "crevice", - "kayak_components", "kayak_core", "kayak_font", "kayak_render_macros", + "kayak_widgets", "serde", "serde_json", "serde_path_to_error", @@ -1989,13 +1989,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "kayak_components" -version = "0.1.0" -dependencies = [ - "kayak_core", -] - [[package]] name = "kayak_core" version = "0.1.0" @@ -2042,7 +2035,14 @@ version = "0.1.0" dependencies = [ "bevy", "bevy_kayak_ui", - "kayak_components", + "kayak_core", + "kayak_widgets", +] + +[[package]] +name = "kayak_widgets" +version = "0.1.0" +dependencies = [ "kayak_core", ] diff --git a/Cargo.toml b/Cargo.toml index 5fd5487..746bd9e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,15 +5,10 @@ edition = "2021" resolver = "2" [workspace] -members = [ - "kayak_components", - "kayak_core", - "kayak_render_macros", - "kayak_font", -] +members = ["kayak_widgets", "kayak_core", "kayak_render_macros", "kayak_font"] [dependencies] -kayak_components = { path = "kayak_components" } +kayak_widgets = { path = "kayak_widgets" } kayak_core = { path = "kayak_core" } [dev-dependencies] diff --git a/bevy_kayak_ui/Cargo.toml b/bevy_kayak_ui/Cargo.toml index 3e9f474..0337af0 100644 --- a/bevy_kayak_ui/Cargo.toml +++ b/bevy_kayak_ui/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" bytemuck = "1.7.2" bevy = { git = "https://github.com/bevyengine/bevy", rev = "38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c" } kayak_core = { path = "../kayak_core" } -kayak_components = { path = "../kayak_components" } +kayak_widgets = { path = "../kayak_widgets" } kayak_render_macros = { path = "../kayak_render_macros" } kayak_font = { path = "../kayak_font" } #kayak_font = { path = "../kayak_font" } diff --git a/examples/bevy.rs b/examples/bevy.rs index eade83d..ebc2f49 100644 --- a/examples/bevy.rs +++ b/examples/bevy.rs @@ -5,10 +5,10 @@ use bevy::{ PipelinedDefaultPlugins, }; use bevy_kayak_ui::{BevyContext, BevyKayakUIPlugin, FontMapping, UICameraBundle}; -use kayak_components::Window; use kayak_core::Index; use kayak_ui::components::App; use kayak_ui::core::{rsx, widget}; +use kayak_widgets::Window; #[widget] fn TestState() { diff --git a/examples/counter.rs b/examples/counter.rs index 3e555e7..08c0a73 100644 --- a/examples/counter.rs +++ b/examples/counter.rs @@ -5,7 +5,7 @@ use bevy::{ PipelinedDefaultPlugins, }; use bevy_kayak_ui::{BevyContext, BevyKayakUIPlugin, FontMapping, UICameraBundle}; -use kayak_components::{Button, Text, Window}; +use kayak_widgets::{Button, Text, Window}; use kayak_core::{ styles::{Style, StyleProp, Units}, Bound, EventType, Index, MutableBound, OnEvent, diff --git a/examples/full_ui.rs b/examples/full_ui.rs index 295d11b..2ac8416 100644 --- a/examples/full_ui.rs +++ b/examples/full_ui.rs @@ -5,7 +5,7 @@ use bevy::{ PipelinedDefaultPlugins, }; use bevy_kayak_ui::{BevyContext, BevyKayakUIPlugin, FontMapping, ImageManager, UICameraBundle}; -use kayak_components::{NinePatch, Text}; +use kayak_widgets::{NinePatch, Text}; use kayak_core::{ layout_cache::Space, styles::{LayoutType, Style, StyleProp, Units}, diff --git a/examples/global_counter.rs b/examples/global_counter.rs index 7c12559..6c46afd 100644 --- a/examples/global_counter.rs +++ b/examples/global_counter.rs @@ -5,7 +5,7 @@ use bevy::{ PipelinedDefaultPlugins, }; use bevy_kayak_ui::{BevyContext, BevyKayakUIPlugin, FontMapping, UICameraBundle}; -use kayak_components::{Text, Window}; +use kayak_widgets::{Text, Window}; use kayak_core::{bind, Binding, Bound, Index, MutableBound}; use kayak_ui::components::App; use kayak_ui::core::{rsx, widget}; diff --git a/examples/image.rs b/examples/image.rs index 82b5714..25aade5 100644 --- a/examples/image.rs +++ b/examples/image.rs @@ -5,7 +5,7 @@ use bevy::{ PipelinedDefaultPlugins, }; use bevy_kayak_ui::{BevyContext, BevyKayakUIPlugin, ImageManager, UICameraBundle}; -use kayak_components::Image; +use kayak_widgets::Image; use kayak_core::Index; use kayak_ui::components::App; use kayak_ui::core::rsx; diff --git a/examples/nine_patch.rs b/examples/nine_patch.rs index 0a14f1a..340b2bb 100644 --- a/examples/nine_patch.rs +++ b/examples/nine_patch.rs @@ -5,7 +5,6 @@ use bevy::{ PipelinedDefaultPlugins, }; use bevy_kayak_ui::{BevyContext, BevyKayakUIPlugin, ImageManager, UICameraBundle}; -use kayak_components::NinePatch; use kayak_core::{ layout_cache::Space, styles::{Style, StyleProp, Units}, @@ -13,6 +12,7 @@ use kayak_core::{ }; use kayak_ui::components::App; use kayak_ui::core::rsx; +use kayak_widgets::NinePatch; fn startup( mut commands: Commands, diff --git a/kayak_components/.gitignore b/kayak_widgets/.gitignore similarity index 100% rename from kayak_components/.gitignore rename to kayak_widgets/.gitignore diff --git a/kayak_components/Cargo.toml b/kayak_widgets/Cargo.toml similarity index 83% rename from kayak_components/Cargo.toml rename to kayak_widgets/Cargo.toml index 4f8fea6..04a5ec4 100644 --- a/kayak_components/Cargo.toml +++ b/kayak_widgets/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "kayak_components" +name = "kayak_widgets" version = "0.1.0" edition = "2021" resolver = "2" diff --git a/kayak_components/src/app.rs b/kayak_widgets/src/app.rs similarity index 100% rename from kayak_components/src/app.rs rename to kayak_widgets/src/app.rs diff --git a/kayak_components/src/background.rs b/kayak_widgets/src/background.rs similarity index 100% rename from kayak_components/src/background.rs rename to kayak_widgets/src/background.rs diff --git a/kayak_components/src/button.rs b/kayak_widgets/src/button.rs similarity index 100% rename from kayak_components/src/button.rs rename to kayak_widgets/src/button.rs diff --git a/kayak_components/src/clip.rs b/kayak_widgets/src/clip.rs similarity index 100% rename from kayak_components/src/clip.rs rename to kayak_widgets/src/clip.rs diff --git a/kayak_components/src/element.rs b/kayak_widgets/src/element.rs similarity index 100% rename from kayak_components/src/element.rs rename to kayak_widgets/src/element.rs diff --git a/kayak_components/src/image.rs b/kayak_widgets/src/image.rs similarity index 100% rename from kayak_components/src/image.rs rename to kayak_widgets/src/image.rs diff --git a/kayak_components/src/lib.rs b/kayak_widgets/src/lib.rs similarity index 100% rename from kayak_components/src/lib.rs rename to kayak_widgets/src/lib.rs diff --git a/kayak_components/src/nine_patch.rs b/kayak_widgets/src/nine_patch.rs similarity index 100% rename from kayak_components/src/nine_patch.rs rename to kayak_widgets/src/nine_patch.rs diff --git a/kayak_components/src/text.rs b/kayak_widgets/src/text.rs similarity index 100% rename from kayak_components/src/text.rs rename to kayak_widgets/src/text.rs diff --git a/kayak_components/src/window.rs b/kayak_widgets/src/window.rs similarity index 100% rename from kayak_components/src/window.rs rename to kayak_widgets/src/window.rs diff --git a/src/lib.rs b/src/lib.rs index fa4be9f..ef4090a 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,5 +1,5 @@ pub mod components { - pub use kayak_components::*; + pub use kayak_widgets::*; } pub mod core { -- GitLab