remove mod.rs files and convert to the newer style.

Migrate widgets to a Widget branch instead of native. Move fonts to core and clean them up a bit. Fix Examples to show new changes.
fashionbrot · Mar 5, 2024 · 89ed86d · 89ed86d
1 parent 740c683
commit 89ed86d
Show file tree

Hide file tree

Showing 81 changed files with 115 additions and 108 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,7 +19,7 @@ badge = []
 card = []
 date_picker = ["chrono", "once_cell", "icons"]
 color_picker = ["icons", "iced/canvas"]
-cupertino = ["time", "iced/canvas"]
+cupertino = ["time", "iced/canvas", "icons"]
 floating_element = []
 grid = ["itertools"]
 glow = []                                                   # TODO

diff --git a/examples/WidgetIDReturn/src/main.rs b/examples/WidgetIDReturn/src/main.rs
@@ -52,7 +52,7 @@ impl Application for NumberInputDemo {
         (
             NumberInputDemo::Loading,
             Command::batch(vec![
-                font::load(iced_aw::graphics::icons::BOOTSTRAP_FONT_BYTES).map(Message::FontLoaded),
+                font::load(iced_aw::BOOTSTRAP_FONT_BYTES).map(Message::FontLoaded),
                 Command::perform(load(), Message::Loaded),
             ]),
         )

diff --git a/examples/card/src/main.rs b/examples/card/src/main.rs
@@ -44,7 +44,7 @@ impl Application for CardExample {
         (
             CardExample::Loading,
             Command::batch(vec![
-                font::load(iced_aw::graphics::icons::BOOTSTRAP_FONT_BYTES).map(Message::FontLoaded),
+                font::load(iced_aw::BOOTSTRAP_FONT_BYTES).map(Message::FontLoaded),
                 Command::perform(load(), Message::Loaded),
             ]),
         )

diff --git a/examples/color_picker/src/main.rs b/examples/color_picker/src/main.rs
@@ -47,7 +47,7 @@ impl Application for ColorPickerExample {
         (
             ColorPickerExample::Loading,
             Command::batch(vec![
-                font::load(iced_aw::graphics::icons::BOOTSTRAP_FONT_BYTES).map(Message::FontLoaded),
+                font::load(iced_aw::BOOTSTRAP_FONT_BYTES).map(Message::FontLoaded),
                 Command::perform(load(), Message::Loaded),
             ]),
         )

diff --git a/examples/cupertino/cupertino_button/src/main.rs b/examples/cupertino/cupertino_button/src/main.rs
@@ -4,7 +4,7 @@ use iced::{
     Application, Command, Element, Length, Settings, Theme,
 };
 
-use iced_aw::native::cupertino::cupertino_button::CupertinoButton;
+use iced_aw::widgets::cupertino::cupertino_button::CupertinoButton;
 
 pub fn main() -> iced::Result {
     ButtonApp::run(Settings {
@@ -42,7 +42,7 @@ impl Application for ButtonApp {
 
     fn new(_flags: ()) -> (Self, Command<Message>) {
         (ButtonApp::Loading, Command::batch(vec![
-            font::load(iced_aw::graphics::SF_UI_ROUNDED_BYTES).map(Message::FontLoaded),
+            font::load(iced_aw::SF_UI_ROUNDED_BYTES).map(Message::FontLoaded),
             Command::perform(load(), Message::Loaded),
         ]))
     }

diff --git a/examples/cupertino/cupertino_spinner/src/main.rs b/examples/cupertino/cupertino_spinner/src/main.rs
@@ -1,7 +1,7 @@
 use iced::alignment;
 use iced::widget::{column, container, text};
 use iced::{executor, Application, Command, Element, Length, Settings, Theme};
-use iced_aw::native::cupertino::cupertino_spinner::CupertinoSpinner;
+use iced_aw::widgets::cupertino::cupertino_spinner::CupertinoSpinner;
 
 pub fn main() -> iced::Result {
     Spinner::run(Settings {

diff --git a/examples/cupertino/cupertino_switch/src/main.rs b/examples/cupertino/cupertino_switch/src/main.rs
@@ -1,6 +1,6 @@
 use iced::widget::{column, container, row, text};
 use iced::{alignment, executor, Application, Color, Command, Element, Length, Settings, Theme};
-use iced_aw::native::cupertino::cupertino_switch::CupertinoSwitch;
+use iced_aw::widgets::cupertino::cupertino_switch::CupertinoSwitch;
 
 pub fn main() -> iced::Result {
     Switch::run(Settings {

diff --git a/examples/date_picker/src/main.rs b/examples/date_picker/src/main.rs
@@ -44,7 +44,7 @@ impl Application for DatePickerExample {
         (
             DatePickerExample::Loading,
             Command::batch(vec![
-                font::load(iced_aw::graphics::icons::BOOTSTRAP_FONT_BYTES).map(Message::FontLoaded),
+                font::load(iced_aw::BOOTSTRAP_FONT_BYTES).map(Message::FontLoaded),
                 Command::perform(load(), Message::Loaded),
             ]),
         )

diff --git a/examples/floating_element multioverlay/src/main.rs b/examples/floating_element multioverlay/src/main.rs
@@ -6,8 +6,8 @@ use iced::{
     Application, Command, Element, Length, Settings, Theme,
 };
 
+use iced_aw::core::icons::bootstrap::icon_to_string;
 use iced_aw::floating_element::Anchor;
-use iced_aw::graphics::icons::bootstrap::icon_to_string;
 use iced_aw::Bootstrap;
 use iced_aw::{helpers::floating_element, BOOTSTRAP_FONT};
 
@@ -49,7 +49,7 @@ impl Application for FloatingElementExample {
         (
             FloatingElementExample::Loading,
             Command::batch(vec![
-                font::load(iced_aw::graphics::icons::BOOTSTRAP_FONT_BYTES).map(Message::FontLoaded),
+                font::load(iced_aw::BOOTSTRAP_FONT_BYTES).map(Message::FontLoaded),
                 Command::perform(load(), Message::Loaded),
             ]),
         )

diff --git a/examples/floating_element/src/main.rs b/examples/floating_element/src/main.rs
@@ -6,8 +6,8 @@ use iced::{
     Application, Command, Element, Length, Settings, Theme,
 };
 
+use iced_aw::core::icons::bootstrap::icon_to_string;
 use iced_aw::floating_element::Anchor;
-use iced_aw::graphics::icons::bootstrap::icon_to_string;
 use iced_aw::Bootstrap;
 use iced_aw::{helpers::floating_element, BOOTSTRAP_FONT};
 
@@ -48,7 +48,7 @@ impl Application for FloatingElementExample {
         (
             FloatingElementExample::Loading,
             Command::batch(vec![
-                font::load(iced_aw::graphics::icons::BOOTSTRAP_FONT_BYTES).map(Message::FontLoaded),
+                font::load(iced_aw::BOOTSTRAP_FONT_BYTES).map(Message::FontLoaded),
                 Command::perform(load(), Message::Loaded),
             ]),
         )

diff --git a/examples/menu/src/main.rs b/examples/menu/src/main.rs
@@ -5,11 +5,11 @@ use iced::widget::{
 use iced::widget::{column as col, vertical_space};
 use iced::{alignment, theme, Application, Border, Color, Element, Length, Pixels, Size};
 
-use iced_aw::graphics::icons::{Bootstrap, BOOTSTRAP_FONT, BOOTSTRAP_FONT_BYTES};
 use iced_aw::menu::{self, Item, Menu, StyleSheet};
 use iced_aw::style::MenuBarStyle;
 use iced_aw::{menu_bar, menu_items};
-use iced_aw::{native::InnerBounds, quad};
+use iced_aw::{quad, widgets::InnerBounds};
+use iced_aw::{Bootstrap, BOOTSTRAP_FONT, BOOTSTRAP_FONT_BYTES};
 
 pub fn main() -> iced::Result {
     // std::env::set_var("RUST_BACKTRACE", "full");

diff --git a/examples/modal/src/main.rs b/examples/modal/src/main.rs
@@ -50,7 +50,7 @@ impl Application for ModalExample {
         (
             ModalExample::Loading,
             Command::batch(vec![
-                font::load(iced_aw::graphics::icons::BOOTSTRAP_FONT_BYTES).map(Message::FontLoaded),
+                font::load(iced_aw::BOOTSTRAP_FONT_BYTES).map(Message::FontLoaded),
                 Command::perform(load(), Message::Loaded),
             ]),
         )

diff --git a/examples/modal_component/src/main.rs b/examples/modal_component/src/main.rs
@@ -45,7 +45,7 @@ impl Application for ModalExample {
         (
             ModalExample::Loading,
             Command::batch(vec![
-                font::load(iced_aw::graphics::icons::BOOTSTRAP_FONT_BYTES).map(Message::FontLoaded),
+                font::load(iced_aw::BOOTSTRAP_FONT_BYTES).map(Message::FontLoaded),
                 Command::perform(load(), Message::Loaded),
             ]),
         )

diff --git a/examples/multiple_modals/src/main.rs b/examples/multiple_modals/src/main.rs
@@ -59,7 +59,7 @@ impl Application for MultipleModalsExample {
                 state: State::Start,
                 button_pressed: None,
             },
-            font::load(iced_aw::graphics::icons::BOOTSTRAP_FONT_BYTES).map(Message::FontLoaded),
+            font::load(iced_aw::BOOTSTRAP_FONT_BYTES).map(Message::FontLoaded),
         )
     }
 

diff --git a/examples/number_input/src/main.rs b/examples/number_input/src/main.rs
@@ -52,7 +52,7 @@ impl Application for NumberInputDemo {
         (
             NumberInputDemo::Loading,
             Command::batch(vec![
-                font::load(iced_aw::graphics::icons::BOOTSTRAP_FONT_BYTES).map(Message::FontLoaded),
+                font::load(iced_aw::BOOTSTRAP_FONT_BYTES).map(Message::FontLoaded),
                 Command::perform(load(), Message::Loaded),
             ]),
         )

diff --git a/examples/segmented_button/src/main.rs b/examples/segmented_button/src/main.rs
@@ -2,7 +2,7 @@ use iced::widget::container;
 use iced::widget::{column, row, text};
 use iced::{Element, Length, Sandbox, Settings};
 
-use iced_aw::native::segmented_button;
+use iced_aw::widgets::segmented_button;
 use segmented_button::SegmentedButton;
 
 pub fn main() -> iced::Result {

diff --git a/examples/tab_bar/src/main.rs b/examples/tab_bar/src/main.rs
@@ -52,7 +52,7 @@ impl Application for TabBarExample {
         (
             TabBarExample::Loading,
             Command::batch(vec![
-                font::load(iced_aw::graphics::icons::BOOTSTRAP_FONT_BYTES).map(Message::FontLoaded),
+                font::load(iced_aw::BOOTSTRAP_FONT_BYTES).map(Message::FontLoaded),
                 Command::perform(load(), Message::Loaded),
             ]),
         )

diff --git a/examples/time_picker/src/main.rs b/examples/time_picker/src/main.rs
@@ -46,7 +46,7 @@ impl Application for TimePickerExample {
         (
             TimePickerExample::Loading,
             Command::batch(vec![
-                font::load(iced_aw::graphics::icons::BOOTSTRAP_FONT_BYTES).map(Message::FontLoaded),
+                font::load(iced_aw::BOOTSTRAP_FONT_BYTES).map(Message::FontLoaded),
                 Command::perform(load(), Message::Loaded),
             ]),
         )

diff --git a/examples/wrap/src/main.rs b/examples/wrap/src/main.rs
@@ -90,7 +90,7 @@ impl Application for RandStrings {
         (
             Self::Loading,
             Command::batch(vec![
-                font::load(iced_aw::graphics::icons::BOOTSTRAP_FONT_BYTES).map(Message::FontLoaded),
+                font::load(iced_aw::BOOTSTRAP_FONT_BYTES).map(Message::FontLoaded),
                 Command::perform(load(), Message::Loaded),
             ]),
         )

diff --git a/src/core.rs b/src/core.rs
@@ -0,0 +1,34 @@
+//! `iced_aw_core`.
+use cfg_if::cfg_if;
+
+#[cfg(feature = "date_picker")]
+pub mod date;
+
+#[cfg(feature = "time_picker")]
+pub mod clock;
+
+#[cfg(feature = "color_picker")]
+pub mod color;
+
+pub mod overlay;
+
+pub mod renderer;
+
+#[cfg(feature = "time_picker")]
+pub mod time;
+
+#[cfg(feature = "drop_down")]
+pub mod offset;
+
+#[cfg(feature = "drop_down")]
+pub mod alignment;
+
+pub mod icons;
+
+cfg_if! {
+    if #[cfg(feature = "icons")] {
+        pub use icons::{BOOTSTRAP_FONT, BOOTSTRAP_FONT_BYTES, NERD_FONT, NERD_FONT_BYTES, SF_UI_ROUNDED_BYTES, SF_UI_ROUNDED, Bootstrap, Nerd};
+    } else {
+        pub use icons::{BOOTSTRAP_FONT, BOOTSTRAP_FONT_BYTES, Bootstrap};
+    }
+}
diff --git a/src/graphics/fonts/SFUIRounded.ttf → src/core/fonts/SFUIRounded.ttf b/src/graphics/fonts/SFUIRounded.ttf → src/core/fonts/SFUIRounded.ttf
diff --git a/src/graphics/fonts/bootstrap-icons.ttf → src/core/fonts/bootstrap-icons.ttf b/src/graphics/fonts/bootstrap-icons.ttf → src/core/fonts/bootstrap-icons.ttf
diff --git a/src/graphics/fonts/nerd-icons.ttf → src/core/fonts/nerd-icons.ttf b/src/graphics/fonts/nerd-icons.ttf → src/core/fonts/nerd-icons.ttf
diff --git a/src/graphics/fonts/required-icons.ttf → src/core/fonts/required-icons.ttf b/src/graphics/fonts/required-icons.ttf → src/core/fonts/required-icons.ttf
diff --git a/src/graphics/icons.rs → src/core/icons.rs b/src/graphics/icons.rs → src/core/icons.rs
@@ -30,3 +30,11 @@ cfg_if! {
     }
 
 }
+
+/// The default cupertino font bytes for loading the font into the system.
+#[cfg(feature = "cupertino")]
+pub const SF_UI_ROUNDED_BYTES: &[u8] = include_bytes!("./fonts/SFUIRounded.ttf");
+
+/// The default cupertino font for alerts and button.
+#[cfg(feature = "cupertino")]
+pub const SF_UI_ROUNDED: iced::Font = iced::Font::with_name(".SF UI Rounded");
diff --git a/src/graphics/icons/bootstrap.rs → src/core/icons/bootstrap.rs b/src/graphics/icons/bootstrap.rs → src/core/icons/bootstrap.rs
diff --git a/src/graphics/icons/nerd.rs → src/core/icons/nerd.rs b/src/graphics/icons/nerd.rs → src/core/icons/nerd.rs
diff --git a/src/graphics/icons/required.rs → src/core/icons/required.rs b/src/graphics/icons/required.rs → src/core/icons/required.rs
diff --git a/src/core/mod.rs b/src/core/mod.rs
diff --git a/src/graphics/mod.rs b/src/graphics/mod.rs