migrating to iced 0.13 (styling, program, task)

Cargo.toml

@@ -39,8 +39,8 @@ pcap = "2.2.0"
 etherparse = "0.16.0"
 chrono = { version = "0.4.38", default-features = false, features = ["clock"] }
 plotters = { version = "0.3.7", default-features = false, features = ["area_series"] }
-iced = { version = "0.12.1", features = ["tokio", "svg", "advanced", "lazy"] }
-plotters-iced = "0.10.0"
+iced = { version = "0.13.0", features = ["tokio", "svg", "advanced", "lazy"] }
+plotters-iced = "0.11.0"
 maxminddb = "0.24.0"
 confy = "0.6.1"
 serde = { version = "1.0.210", default-features = false, features = ["derive"] }

src/chart/types/traffic_chart.rs

@@ -9,7 +9,7 @@ use plotters::prelude::*;
 use plotters_iced::{Chart, ChartBuilder, ChartWidget, DrawingBackend};
 use splines::Spline;
 
-use crate::gui::app::FONT_FAMILY_NAME;
+use crate::gui::sniffer::FONT_FAMILY_NAME;
 use crate::gui::styles::style_constants::CHARTS_LINE_BORDER;
 use crate::gui::styles::types::palette::to_rgb_color;
 use crate::gui::types::message::Message;

src/countries/country_utils.rs

@@ -35,7 +35,7 @@ fn get_flag_from_country(
  is_loopback: bool,
  traffic_type: TrafficType,
  language: Language,
-) -> (Svg<StyleType>, String) {
+) -> (Svg<'static, StyleType>, String) {
  #![allow(clippy::too_many_lines)]
  let mut tooltip = country.to_string();
  let mut svg_style = SvgType::Standard;

src/gui/components/button.rs

@@ -36,7 +36,7 @@ pub fn button_hide(
  Position::Right,
  )
  .gap(5)
- .style(ContainerType::Tooltip)
+ .class(ContainerType::Tooltip)
 }
 
 pub fn button_open_file(
@@ -69,13 +69,13 @@ pub fn button_open_file(
 
  Tooltip::new(button, Text::new(tooltip_str).font(font), Position::Right)
  .gap(5)
- .style(tooltip_style)
+ .class(tooltip_style)
 }
 
 pub fn row_open_link_tooltip(text: &'static str, font: Font) -> Row<'static, Message, StyleType> {
  Row::new()
  .align_items(Alignment::Center)
  .spacing(10)
  .push(Text::new(text).font(font))
- .push(Icon::OpenLink.to_text().size(16).style(TextType::Title))
+ .push(Icon::OpenLink.to_text().size(16).class(TextType::Title))
 }

src/gui/components/footer.rs

@@ -57,7 +57,7 @@ pub fn footer(
  Container::new(footer_row)
  .height(45)
  .align_y(Vertical::Center)
- .style(ContainerType::Gradient(color_gradient))
+ .class(ContainerType::Gradient(color_gradient))
 }
 
 fn get_button_website(font: Font) -> Tooltip<'static, Message, StyleType> {
@@ -78,7 +78,7 @@ fn get_button_website(font: Font) -> Tooltip<'static, Message, StyleType> {
  row_open_link_tooltip("Website", font),
  Position::Top,
  )
- .style(ContainerType::Tooltip)
+ .class(ContainerType::Tooltip)
 }
 
 fn get_button_github(font: Font) -> Tooltip<'static, Message, StyleType> {
@@ -99,15 +99,15 @@ fn get_button_github(font: Font) -> Tooltip<'static, Message, StyleType> {
  row_open_link_tooltip("GitHub", font),
  Position::Top,
  )
- .style(ContainerType::Tooltip)
+ .class(ContainerType::Tooltip)
 }
 
 fn get_button_sponsor(font: Font) -> Tooltip<'static, Message, StyleType> {
  let content = button(
  Text::new('❤'.to_string())
  .font(font)
  .size(23)
- .style(TextType::Sponsor)
+ .class(TextType::Sponsor)
  .horizontal_alignment(Horizontal::Center)
  .vertical_alignment(Vertical::Center)
  .line_height(LineHeight::Relative(1.0)),
@@ -122,7 +122,7 @@ fn get_button_sponsor(font: Font) -> Tooltip<'static, Message, StyleType> {
  row_open_link_tooltip("Sponsor", font),
  Position::Top,
  )
- .style(ContainerType::Tooltip)
+ .class(ContainerType::Tooltip)
 }
 
 fn get_release_details(
@@ -145,7 +145,7 @@ fn get_release_details(
  // a newer release is available on GitHub
  let button = button(
  Text::new('!'.to_string())
- .style(TextType::Danger)
+ .class(TextType::Danger)
  .size(28)
  .horizontal_alignment(Horizontal::Center)
  .vertical_alignment(Vertical::Center)
@@ -154,14 +154,14 @@ fn get_release_details(
  .padding(0)
  .height(35)
  .width(35)
- .style(ButtonType::Alert)
+ .class(ButtonType::Alert)
  .on_press(Message::OpenWebPage(WebPage::WebsiteDownload));
  let tooltip = Tooltip::new(
  button,
  row_open_link_tooltip(new_version_available_translation(language), font),
  Position::Top,
  )
- .style(ContainerType::Tooltip);
+ .class(ContainerType::Tooltip);
  ret_val = ret_val.push(Space::with_width(10)).push(tooltip);
  } else {
  // this is the latest release

src/gui/components/header.rs

@@ -10,11 +10,11 @@ use crate::configs::types::config_settings::ConfigSettings;
 use crate::gui::components::tab::notifications_badge;
 use crate::gui::pages::types::running_page::RunningPage;
 use crate::gui::pages::types::settings_page::SettingsPage;
+use crate::gui::sniffer::Sniffer;
 use crate::gui::styles::button::ButtonType;
 use crate::gui::styles::container::ContainerType;
 use crate::gui::styles::types::gradient_type::GradientType;
 use crate::gui::types::message::Message;
-use crate::gui::types::sniffer::Sniffer;
 use crate::translations::translations::{quit_analysis_translation, settings_translation};
 use crate::translations::translations_3::thumbnail_mode_translation;
 use crate::utils::types::icon::Icon;
@@ -76,7 +76,7 @@ pub fn header(sniffer: &Sniffer) -> Container<'static, Message, StyleType> {
  )
  .height(80)
  .align_y(Vertical::Center)
- .style(ContainerType::Gradient(color_gradient))
+ .class(ContainerType::Gradient(color_gradient))
 }
 
 fn get_button_reset(font: Font, language: Language) -> Tooltip<'static, Message, StyleType> {
@@ -99,7 +99,7 @@ fn get_button_reset(font: Font, language: Language) -> Tooltip<'static, Message,
  Position::Right,
  )
  .gap(5)
- .style(ContainerType::Tooltip)
+ .class(ContainerType::Tooltip)
 }
 
 pub fn get_button_settings(
@@ -125,7 +125,7 @@ pub fn get_button_settings(
  Position::Left,
  )
  .gap(5)
- .style(ContainerType::Tooltip)
+ .class(ContainerType::Tooltip)
 }
 
 pub fn get_button_minimize(
@@ -160,12 +160,12 @@ pub fn get_button_minimize(
  .padding(0)
  .height(button_size)
  .width(button_size)
- .style(ButtonType::Thumbnail)
+ .class(ButtonType::Thumbnail)
  .on_press(Message::ToggleThumbnail(false));
 
  Tooltip::new(content, Text::new(tooltip).font(font), Position::Right)
  .gap(0)
- .style(tooltip_style)
+ .class(tooltip_style)
 }
 
 fn thumbnail_header(
@@ -187,7 +187,7 @@ fn thumbnail_header(
  .push(if unread_notifications > 0 {
  Container::new(
  notifications_badge(font, unread_notifications)
- .style(ContainerType::HighlightedOnHeader),
+ .class(ContainerType::HighlightedOnHeader),
  )
  .width(40)
  .align_x(Horizontal::Center)
@@ -197,5 +197,5 @@ fn thumbnail_header(
  )
  .height(30)
  .align_y(Vertical::Center)
- .style(ContainerType::Gradient(color_gradient))
+ .class(ContainerType::Gradient(color_gradient))
 }

src/gui/components/modal.rs

@@ -48,7 +48,7 @@ pub fn get_exit_overlay(
  Container::new(content)
  .height(160)
  .width(450)
- .style(ContainerType::Modal)
+ .class(ContainerType::Modal)
 }
 
 pub fn get_clear_all_overlay(
@@ -80,7 +80,7 @@ pub fn get_clear_all_overlay(
  Container::new(content)
  .height(160)
  .width(450)
- .style(ContainerType::Modal)
+ .class(ContainerType::Modal)
 }
 
 fn get_modal_header(
@@ -110,7 +110,7 @@ fn get_modal_header(
  .align_y(Vertical::Center)
  .height(40)
  .width(Length::Fill)
- .style(ContainerType::Gradient(color_gradient))
+ .class(ContainerType::Gradient(color_gradient))
 }
 
 fn confirm_button_row(
@@ -131,7 +131,7 @@ fn confirm_button_row(
  .padding(5)
  .height(40)
  .width(80)
- .style(ButtonType::Alert)
+ .class(ButtonType::Alert)
  .on_press(message),
  )
 }