feat: icons, improved team picker, etc

Author: claration

apps/plumeimpactor/src/appearance/fonts.rs

@@ -0,0 +1,64 @@
+use iced::widget::{Row, Text};
+use iced::{Alignment::Center, Font, Length::Fixed, font};
+use iced::{Color, Element};
+
+use super::THEME_ICON_SIZE;
+
+pub(crate) fn load_fonts() -> Vec<std::borrow::Cow<'static, [u8]>> {
+    vec![include_bytes!("./plume_icons.ttf").as_slice().into()]
+}
+
+pub(crate) const GEAR: &str = "\u{e800}";
+pub(crate) const CHEVRON_BACK: &str = "\u{e801}";
+pub(crate) const DOWNLOAD: &str = "\u{e802}";
+pub(crate) const STAR: &str = "\u{e803}";
+pub(crate) const WRENCH: &str = "\u{e804}";
+pub(crate) const PLUS: &str = "\u{e805}";
+pub(crate) const MINUS: &str = "\u{e806}";
+pub(crate) const SHARE: &str = "\u{e807}";
+pub(crate) const FILE: &str = "\u{f15b}";
+
+pub(crate) fn icon_text<M: 'static>(
+    icon: &'static str,
+    label: &'static str,
+    color: Option<Color>,
+) -> Element<'static, M> {
+    let icon_font = Font {
+        family: iced::font::Family::Name("plume_icons".into()),
+        weight: iced::font::Weight::Normal,
+        stretch: iced::font::Stretch::Normal,
+        style: iced::font::Style::Normal,
+    };
+
+    let mut row = Row::new().spacing(10).align_y(Center);
+
+    let mut icon_text_widget = Text::new(icon)
+        .font(icon_font)
+        .width(Fixed(THEME_ICON_SIZE));
+    if let Some(c) = color {
+        icon_text_widget = icon_text_widget.color(c);
+    }
+    row = row.push(icon_text_widget);
+
+    let mut label_widget = Text::new(label);
+    if let Some(c) = color {
+        label_widget = label_widget.color(c);
+    }
+    row = row.push(label_widget);
+
+    row.into()
+}
+
+pub(crate) fn icon(icon: &'static str) -> Text<'static> {
+    let icon_font = Font {
+        family: font::Family::Name("plume_icons".into()),
+        weight: font::Weight::Normal,
+        stretch: font::Stretch::Normal,
+        style: font::Style::Normal,
+    };
+
+    Text::new(icon)
+        .font(icon_font)
+        .align_x(Center)
+        .width(Fixed(THEME_ICON_SIZE))
+}

apps/plumeimpactor/src/appearance/mod.rs

@@ -1,14 +1,21 @@
 use iced::{Color, Theme, color};
 
 mod button;
+mod fonts;
 mod picklist;
 
 pub(crate) use button::{p_button, s_button};
+#[allow(unused)]
+pub(crate) use fonts::{
+    CHEVRON_BACK, DOWNLOAD, FILE, GEAR, MINUS, PLUS, SHARE, STAR, WRENCH, icon, icon_text,
+    load_fonts,
+};
 pub(crate) use picklist::s_pick_list;
 
 pub(crate) const THEME_CORNER_RADIUS: f32 = 4.0;
 pub(crate) const THEME_FONT_SIZE: f32 = 12.0;
 pub(crate) const THEME_PADDING: f32 = 9.0;
+pub(crate) const THEME_ICON_SIZE: f32 = 12.0;
 
 pub(crate) fn p_font() -> iced::Font {
     iced::Font {

apps/plumeimpactor/src/appearance/plume_icons.ttf

@@ -11,6 +11,7 @@ pub(crate) fn default_settings() -> iced::Settings {
     iced::Settings {
         default_font: appearance::p_font(),
         default_text_size: appearance::THEME_FONT_SIZE.into(),
+        fonts: appearance::load_fonts(),
         ..Default::default()
     }
 }

apps/plumeimpactor/src/defaults.rs

@@ -80,10 +80,13 @@ impl GeneralScreen {
         .spacing(10)
         .align_x(Center);
 
-        let footer_links =
-            button(text("Give me a ⭐ star :3").color(Color::from_rgb(1.0, 0.75, 0.8)))
-                .on_press(Message::OpenGitHub)
-                .style(iced::widget::button::text);
+        let footer_links = button(appearance::icon_text(
+            appearance::STAR,
+            "Star us on GitHub!",
+            Some(Color::from_rgb(1.0, 0.75, 0.8)),
+        ))
+        .on_press(Message::OpenGitHub)
+        .style(iced::widget::button::text);
 
         column![
             container(screen_content).center(Fill).height(Fill),
@@ -96,14 +99,18 @@ impl GeneralScreen {
     fn view_buttons(&self) -> Element<'_, Message> {
         container(
             row![
-                button(text("Device Utilities").align_x(Center))
+                button(appearance::icon_text(appearance::WRENCH, "Utilities", None))
                     .on_press(Message::NavigateToUtilities)
                     .width(Fill)
                     .style(appearance::s_button),
-                button(text("Import .ipa / .tipa").align_x(Center))
-                    .on_press(Message::OpenFileDialog)
-                    .width(Fill)
-                    .style(appearance::s_button)
+                button(appearance::icon_text(
+                    appearance::DOWNLOAD,
+                    "Import .ipa / .tipa",
+                    None
+                ))
+                .on_press(Message::OpenFileDialog)
+                .width(Fill)
+                .style(appearance::s_button)
             ]
             .spacing(appearance::THEME_PADDING),
         )