Merge pull request #197 from Redhawk18/main

icon fonts
iced-rs · Nov 22, 2023 · 75a8531 · 75a8531
2 parents 99e5bc1 + 3aec381
commit 75a8531
Show file tree

Hide file tree

Showing 27 changed files with 31,986 additions and 4,295 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -64,6 +64,7 @@ default = [
 ]
 
 [dependencies]
+cfg-if = "1.0"
 num-traits = { version = "0.2.16", optional = true }
 time = { version = "0.3.23", features = ["local-offset"], optional = true }
 chrono = { version = "0.4.26", optional = true }

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::ICON_FONT_BYTES).map(Message::FontLoaded),
+                font::load(iced_aw::graphics::icons::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
@@ -43,7 +43,7 @@ impl Application for CardExample {
         (
             CardExample::Loading,
             Command::batch(vec![
-                font::load(iced_aw::graphics::icons::ICON_FONT_BYTES).map(Message::FontLoaded),
+                font::load(iced_aw::graphics::icons::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
@@ -46,7 +46,7 @@ impl Application for ColorPickerExample {
         (
             ColorPickerExample::Loading,
             Command::batch(vec![
-                font::load(iced_aw::graphics::icons::ICON_FONT_BYTES).map(Message::FontLoaded),
+                font::load(iced_aw::graphics::icons::BOOTSTRAP_FONT_BYTES).map(Message::FontLoaded),
                 Command::perform(load(), Message::Loaded),
             ]),
         )

diff --git a/examples/date_picker/src/main.rs b/examples/date_picker/src/main.rs
@@ -43,7 +43,7 @@ impl Application for DatePickerExample {
         (
             DatePickerExample::Loading,
             Command::batch(vec![
-                font::load(iced_aw::graphics::icons::ICON_FONT_BYTES).map(Message::FontLoaded),
+                font::load(iced_aw::graphics::icons::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
@@ -7,7 +7,9 @@ use iced::{
 };
 
 use iced_aw::floating_element::Anchor;
-use iced_aw::{helpers::floating_element, Icon, ICON_FONT};
+use iced_aw::graphics::icons::bootstrap::icon_to_string;
+use iced_aw::BootstrapIcon;
+use iced_aw::{helpers::floating_element, BOOTSTRAP_FONT};
 
 fn main() -> iced::Result {
     FloatingElementExample::run(Settings::default())
@@ -45,7 +47,7 @@ impl Application for FloatingElementExample {
         (
             FloatingElementExample::Loading,
             Command::batch(vec![
-                font::load(iced_aw::graphics::icons::ICON_FONT_BYTES).map(Message::FontLoaded),
+                font::load(iced_aw::graphics::icons::BOOTSTRAP_FONT_BYTES).map(Message::FontLoaded),
                 Command::perform(load(), Message::Loaded),
             ]),
         )
@@ -106,8 +108,8 @@ impl Application for FloatingElementExample {
                         .max_height(600)
                         .style(theme::Container::Box),
                     Button::new(
-                        Text::new(Icon::Plus.to_string())
-                            .font(ICON_FONT)
+                        Text::new(icon_to_string(BootstrapIcon::Plus))
+                            .font(BOOTSTRAP_FONT)
                             .size(35)
                             .line_height(1.0)
                             .shaping(text::Shaping::Advanced),

diff --git a/examples/modal/src/main.rs b/examples/modal/src/main.rs
@@ -47,7 +47,7 @@ impl Application for ModalExample {
         (
             ModalExample::Loading,
             Command::batch(vec![
-                font::load(iced_aw::graphics::icons::ICON_FONT_BYTES).map(Message::FontLoaded),
+                font::load(iced_aw::graphics::icons::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
@@ -44,7 +44,7 @@ impl Application for ModalExample {
         (
             ModalExample::Loading,
             Command::batch(vec![
-                font::load(iced_aw::graphics::icons::ICON_FONT_BYTES).map(Message::FontLoaded),
+                font::load(iced_aw::graphics::icons::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
@@ -56,7 +56,7 @@ impl Application for MultipleModalsExample {
                 state: State::Start,
                 button_pressed: None,
             },
-            font::load(iced_aw::graphics::icons::ICON_FONT_BYTES).map(Message::FontLoaded),
+            font::load(iced_aw::graphics::icons::BOOTSTRAP_FONT_BYTES).map(Message::FontLoaded),
         )
     }
 

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

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

diff --git a/examples/tabs/src/main.rs b/examples/tabs/src/main.rs
@@ -19,8 +19,8 @@ use settings::{SettingsMessage, SettingsTab, TabBarPosition};
 
 const HEADER_SIZE: u16 = 32;
 const TAB_PADDING: u16 = 16;
-const ICON_FONT_BYTES: &[u8] = include_bytes!("../fonts/icons.ttf");
-const ICON_FONT: Font = Font::with_name("icons");
+const ICON_BYTES: &[u8] = include_bytes!("../fonts/icons.ttf");
+const ICON: Font = Font::with_name("icons");
 
 enum Icon {
     User,
@@ -89,7 +89,7 @@ impl Application for TabBarExample {
         (
             TabBarExample::Loading,
             Command::batch(vec![
-                font::load(ICON_FONT_BYTES).map(Message::FontLoaded),
+                font::load(ICON_BYTES).map(Message::FontLoaded),
                 Command::perform(load(), Message::Loaded),
             ]),
         )
@@ -173,7 +173,7 @@ impl Application for TabBarExample {
                     )
                     .set_active_tab(&state.active_tab)
                     .tab_bar_style(theme.clone())
-                    .icon_font(ICON_FONT)
+                    .icon_font(ICON)
                     .tab_bar_position(match position {
                         TabBarPosition::Top => iced_aw::TabBarPosition::Top,
                         TabBarPosition::Bottom => iced_aw::TabBarPosition::Bottom,

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

diff --git a/src/graphics/fonts/bootstrap-icons.ttf b/src/graphics/fonts/bootstrap-icons.ttf
diff --git a/src/graphics/fonts/nerd-icons.ttf b/src/graphics/fonts/nerd-icons.ttf
diff --git a/src/graphics/icons.rs b/src/graphics/icons.rs
@@ -1,47 +1,30 @@
 //! The default icon font of the widgets of this library.
 
+use cfg_if::cfg_if;
 use iced_widget::core::Font;
 
-#[cfg(feature = "icons")]
-mod bootstrap;
-#[cfg(feature = "icons")]
-pub use bootstrap::*;
+cfg_if! {
+    if #[cfg(feature = "icons")] {
+        pub mod bootstrap;
+        pub mod nerd;
 
-#[cfg(not(feature = "icons"))]
-mod required;
-#[cfg(not(feature = "icons"))]
-pub use required::*;
+        /// The default icon font bytes for loading the font into iced.
+        pub const BOOTSTRAP_FONT_BYTES: &[u8] = include_bytes!("./fonts/bootstrap-icons.ttf");
+        /// the icon font that has all nerd fonts.
+        pub const NERD_FONT_BYTES: &[u8] = include_bytes!("./fonts/nerd-icons.ttf");
 
-/// The default icon font bytes for loading the font into iced.
-#[cfg(feature = "icons")]
-pub const ICON_FONT_BYTES: &[u8] = include_bytes!("./fonts/bootstrap-icons.ttf");
+        /// The bootstrap icon font.
+        pub const BOOTSTRAP_FONT: Font = Font::with_name("bootstrap-icons");
+        /// The nerd icon font.
+        pub const NERD_FONT: Font = Font::with_name("nerd-icons");
 
-/// The default icon font bytes for loading the font into iced.
-#[cfg(not(feature = "icons"))]
-pub const ICON_FONT_BYTES: &[u8] = include_bytes!("./fonts/required-icons.ttf");
+    } else {
+        pub mod required;
 
-/// The default icon font.
-#[cfg(feature = "icons")]
-pub const ICON_FONT: Font = Font::with_name("bootstrap-icons");
-
-/// The default icon font.
-#[cfg(not(feature = "icons"))]
-pub const ICON_FONT: Font = Font::with_name("required-icons");
-
-impl From<Icon> for char {
-    fn from(icon: Icon) -> Self {
-        icon_to_char(icon)
+        /// The default icon font bytes for loading the font into iced.
+        pub const BOOTSTRAP_FONT_BYTES: &[u8] = include_bytes!("./fonts/required-icons.ttf");
+        /// The default icon font.
+        pub const BOOTSTRAP_FONT: Font = Font::with_name("required-icons");
     }
-}
 
-impl From<Icon> for String {
-    fn from(icon: Icon) -> Self {
-        format!("{}", icon_to_char(icon))
-    }
-}
-
-impl std::fmt::Display for Icon {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", icon_to_char(*self))
-    }
 }