Merge pull request #219 from Redhawk18/main

reran icon script and removed all garbage unicode values
iced-rs · Mar 5, 2024 · 740c683 · 740c683
2 parents e745f75 + fd78299
commit 740c683
Show file tree

Hide file tree

Showing 16 changed files with 10,962 additions and 12,361 deletions.
diff --git a/examples/floating_element multioverlay/src/main.rs b/examples/floating_element multioverlay/src/main.rs
@@ -7,8 +7,8 @@ use iced::{
 };
 
 use iced_aw::floating_element::Anchor;
-use iced_aw::graphics::icons::icon_to_string;
-use iced_aw::BootstrapIcon;
+use iced_aw::graphics::icons::bootstrap::icon_to_string;
+use iced_aw::Bootstrap;
 use iced_aw::{helpers::floating_element, BOOTSTRAP_FONT};
 
 fn main() -> iced::Result {
@@ -103,7 +103,7 @@ impl Application for FloatingElementExample {
                     .max_height(600)
                     .style(theme::Container::Box),
                     Button::new(
-                        Text::new(icon_to_string(BootstrapIcon::Plus))
+                        Text::new(icon_to_string(Bootstrap::Plus))
                             .font(BOOTSTRAP_FONT)
                             .size(35)
                             .line_height(1.0)

diff --git a/examples/floating_element/src/main.rs b/examples/floating_element/src/main.rs
@@ -7,8 +7,8 @@ use iced::{
 };
 
 use iced_aw::floating_element::Anchor;
-use iced_aw::graphics::icons::icon_to_string;
-use iced_aw::BootstrapIcon;
+use iced_aw::graphics::icons::bootstrap::icon_to_string;
+use iced_aw::Bootstrap;
 use iced_aw::{helpers::floating_element, BOOTSTRAP_FONT};
 
 fn main() -> iced::Result {
@@ -109,7 +109,7 @@ impl Application for FloatingElementExample {
                         .max_height(600)
                         .style(theme::Container::Box),
                     Button::new(
-                        Text::new(icon_to_string(BootstrapIcon::Plus))
+                        Text::new(icon_to_string(Bootstrap::Plus))
                             .font(BOOTSTRAP_FONT)
                             .size(35)
                             .line_height(1.0)

diff --git a/examples/menu/src/main.rs b/examples/menu/src/main.rs
@@ -5,7 +5,7 @@ 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::{BootstrapIcon, BOOTSTRAP_FONT, BOOTSTRAP_FONT_BYTES};
+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};
@@ -534,7 +534,7 @@ fn submenu_button<'a>(label: &str) -> button::Button<'a, Message, iced::Theme, i
             text(label)
                 .width(Length::Fill)
                 .vertical_alignment(alignment::Vertical::Center),
-            text(BootstrapIcon::CaretRightFill)
+            text(Bootstrap::CaretRightFill)
                 .font(BOOTSTRAP_FONT)
                 .width(Length::Shrink)
                 .vertical_alignment(alignment::Vertical::Center),

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
@@ -8,7 +8,8 @@ cfg_if! {
         pub mod bootstrap;
         pub mod nerd;
 
-        pub use bootstrap::{BootstrapIcon, icon_to_char, icon_to_string};
+        pub use bootstrap::Bootstrap;
+        pub use nerd::Nerd;
         /// 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.
@@ -21,7 +22,7 @@ cfg_if! {
 
     } else {
         pub mod required;
-        pub use required::{BootstrapIcon, icon_to_char, icon_to_string};
+        // pub use required::{Bootstrap, icon_to_char, icon_to_string};
         /// 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.

diff --git a/src/graphics/icons/bootstrap.rs b/src/graphics/icons/bootstrap.rs