diff --git a/src/countries/country_utils.rs b/src/countries/country_utils.rs index 80764767..de69c8ef 100644 --- a/src/countries/country_utils.rs +++ b/src/countries/country_utils.rs @@ -19,8 +19,7 @@ use crate::countries::flags_pictures::{ UG, UNKNOWN, US, UY, UZ, VA, VC, VE, VG, VI, VN, VU, WS, YE, ZA, ZM, ZW, }; use crate::countries::types::country::Country; -use crate::gui::styles::container::{ContainerStyleTuple, ContainerType}; -use crate::gui::styles::style_constants::get_font; +use crate::gui::styles::container::ContainerType; use crate::gui::types::message::Message; use crate::networking::types::traffic_type::TrafficType; use crate::translations::translations_2::{ diff --git a/src/gui/app.rs b/src/gui/app.rs index 05cbe7cb..b7ecfce8 100644 --- a/src/gui/app.rs +++ b/src/gui/app.rs @@ -4,13 +4,11 @@ use std::time::Duration; -use iced::application::StyleSheet; use iced::keyboard::{Event, KeyCode, Modifiers}; -use iced::widget::{container, Column, Container, Row}; +use iced::widget::Column; use iced::Event::{Keyboard, Window}; use iced::{ - executor, font, subscription, window, Application, Command, Element, Renderer, Settings, - Subscription, Theme, + executor, font, subscription, window, Application, Command, Element, Renderer, Subscription, }; use crate::gui::components::footer::footer; diff --git a/src/gui/components/footer.rs b/src/gui/components/footer.rs index add82d64..a375f5ec 100644 --- a/src/gui/components/footer.rs +++ b/src/gui/components/footer.rs @@ -6,13 +6,11 @@ use iced::alignment::{Horizontal, Vertical}; use iced::widget::horizontal_space; use iced::widget::tooltip::Position; use iced::widget::{button, Container, Row, Text, Tooltip}; -use iced::{Alignment, Color, Font, Length, Renderer}; +use iced::{Alignment, Font, Length, Renderer}; -use crate::gui::styles::button::{ButtonStyleTuple, ButtonType}; -use crate::gui::styles::container::{ContainerStyleTuple, ContainerType}; -use crate::gui::styles::style_constants::{ - get_font, get_font_headers, FONT_SIZE_FOOTER, FONT_SIZE_SUBTITLE, ICONS, -}; +use crate::gui::styles::button::ButtonType; +use crate::gui::styles::container::ContainerType; +use crate::gui::styles::style_constants::{FONT_SIZE_FOOTER, FONT_SIZE_SUBTITLE, ICONS}; use crate::gui::styles::text::TextType; use crate::gui::styles::types::gradient_type::GradientType; use crate::gui::styles::types::style_type::StyleType; diff --git a/src/gui/components/header.rs b/src/gui/components/header.rs index a886b156..f3264f4b 100644 --- a/src/gui/components/header.rs +++ b/src/gui/components/header.rs @@ -8,9 +8,8 @@ use iced::Length::FillPortion; use iced::{Alignment, Font, Length, Renderer}; use crate::gui::pages::types::settings_page::SettingsPage; -use crate::gui::styles::button::{ButtonStyleTuple, ButtonType}; -use crate::gui::styles::container::{ContainerStyleTuple, ContainerType}; -use crate::gui::styles::style_constants::{get_font, ICONS}; +use crate::gui::styles::container::ContainerType; +use crate::gui::styles::style_constants::ICONS; use crate::gui::styles::types::gradient_type::GradientType; use crate::gui::types::message::Message; use crate::translations::translations::{quit_analysis_translation, settings_translation}; diff --git a/src/gui/components/modal.rs b/src/gui/components/modal.rs index 7bd670c2..b1880a22 100644 --- a/src/gui/components/modal.rs +++ b/src/gui/components/modal.rs @@ -13,9 +13,9 @@ use iced::{ Size, }; -use crate::gui::styles::button::{ButtonStyleTuple, ButtonType}; -use crate::gui::styles::container::{ContainerStyleTuple, ContainerType}; -use crate::gui::styles::style_constants::{get_font, get_font_headers, FONT_SIZE_TITLE}; +use crate::gui::styles::button::ButtonType; +use crate::gui::styles::container::ContainerType; +use crate::gui::styles::style_constants::FONT_SIZE_TITLE; use crate::gui::styles::types::gradient_type::GradientType; use crate::gui::types::message::Message; use crate::translations::translations::{ diff --git a/src/gui/components/radio.rs b/src/gui/components/radio.rs index 44ee1d3e..c14c7df8 100644 --- a/src/gui/components/radio.rs +++ b/src/gui/components/radio.rs @@ -2,9 +2,8 @@ use iced::widget::horizontal_space; use iced::widget::{Column, Radio, Row, Text}; use iced::{Alignment, Font, Length, Renderer}; -use crate::gui::styles::radio::{RadioStyleTuple, RadioType}; use crate::gui::styles::style_constants::FONT_SIZE_SUBTITLE; -use crate::gui::styles::text::{TextStyleTuple, TextType}; +use crate::gui::styles::text::TextType; use crate::gui::types::message::Message; use crate::notifications::types::notifications::{ BytesNotification, FavoriteNotification, Notification, PacketsNotification, diff --git a/src/gui/components/tab.rs b/src/gui/components/tab.rs index ae201ff3..12b63f4a 100644 --- a/src/gui/components/tab.rs +++ b/src/gui/components/tab.rs @@ -4,9 +4,9 @@ use iced::widget::{button, horizontal_space, Button, Row, Text}; use iced::{alignment, Alignment, Font, Length, Renderer}; use crate::gui::pages::types::settings_page::SettingsPage; -use crate::gui::styles::button::{ButtonStyleTuple, ButtonType}; -use crate::gui::styles::style_constants::{get_font, get_font_headers, FONT_SIZE_SUBTITLE, ICONS}; -use crate::gui::styles::text::{TextStyleTuple, TextType}; +use crate::gui::styles::button::ButtonType; +use crate::gui::styles::style_constants::{FONT_SIZE_SUBTITLE, ICONS}; +use crate::gui::styles::text::TextType; use crate::gui::types::message::Message; use crate::{Language, RunningPage, StyleType}; diff --git a/src/gui/pages/connection_details_page.rs b/src/gui/pages/connection_details_page.rs index 5e686dae..658c6970 100644 --- a/src/gui/pages/connection_details_page.rs +++ b/src/gui/pages/connection_details_page.rs @@ -9,11 +9,9 @@ use iced::{Alignment, Font, Length, Renderer}; use crate::countries::country_utils::{get_computer_tooltip, get_flag_tooltip}; use crate::countries::flags_pictures::FLAGS_WIDTH_BIG; -use crate::gui::styles::button::{ButtonStyleTuple, ButtonType}; -use crate::gui::styles::container::{ContainerStyleTuple, ContainerType}; -use crate::gui::styles::rule::{RuleStyleTuple, RuleType}; +use crate::gui::styles::container::ContainerType; use crate::gui::styles::style_constants::{get_font, get_font_headers, FONT_SIZE_TITLE, ICONS}; -use crate::gui::styles::text::{TextStyleTuple, TextType}; +use crate::gui::styles::text::TextType; use crate::gui::styles::types::gradient_type::GradientType; use crate::gui::types::message::Message; use crate::networking::manage_packets::{get_address_to_lookup, get_traffic_type, is_my_address}; diff --git a/src/gui/pages/initial_page.rs b/src/gui/pages/initial_page.rs index 9f92155e..dbb3490a 100644 --- a/src/gui/pages/initial_page.rs +++ b/src/gui/pages/initial_page.rs @@ -13,12 +13,11 @@ use iced::{alignment, Alignment, Font, Length, Renderer}; use pcap::Device; use crate::gui::components::radio::{ip_version_radios, transport_protocol_radios}; -use crate::gui::styles::button::{ButtonStyleTuple, ButtonType}; -use crate::gui::styles::container::{ContainerStyleTuple, ContainerType}; -use crate::gui::styles::picklist::{PicklistStyleTuple, PicklistType}; -use crate::gui::styles::scrollbar::{ScrollbarStyleTuple, ScrollbarType}; +use crate::gui::styles::button::ButtonType; +use crate::gui::styles::container::ContainerType; +use crate::gui::styles::scrollbar::ScrollbarType; use crate::gui::styles::style_constants::{get_font, FONT_SIZE_SUBTITLE, FONT_SIZE_TITLE, ICONS}; -use crate::gui::styles::text::{TextStyleTuple, TextType}; +use crate::gui::styles::text::TextType; use crate::gui::styles::types::gradient_type::GradientType; use crate::gui::types::message::Message; use crate::gui::types::sniffer::Sniffer; diff --git a/src/gui/pages/inspect_page.rs b/src/gui/pages/inspect_page.rs index bf6a511b..c1120303 100644 --- a/src/gui/pages/inspect_page.rs +++ b/src/gui/pages/inspect_page.rs @@ -9,15 +9,12 @@ use iced::{alignment, Alignment, Font, Length, Renderer}; use crate::gui::components::tab::get_pages_tabs; use crate::gui::components::types::my_modal::MyModal; -use crate::gui::styles::button::{ButtonStyleTuple, ButtonType}; -use crate::gui::styles::checkbox::{CheckboxStyleTuple, CheckboxType}; -use crate::gui::styles::container::{ContainerStyleTuple, ContainerType}; -use crate::gui::styles::picklist::{PicklistStyleTuple, PicklistType}; -use crate::gui::styles::rule::{RuleStyleTuple, RuleType}; -use crate::gui::styles::scrollbar::{ScrollbarStyleTuple, ScrollbarType}; +use crate::gui::styles::button::ButtonType; +use crate::gui::styles::container::ContainerType; +use crate::gui::styles::scrollbar::ScrollbarType; use crate::gui::styles::style_constants::{get_font, get_font_headers, FONT_SIZE_TITLE, ICONS}; -use crate::gui::styles::text::{TextStyleTuple, TextType}; -use crate::gui::styles::text_input::{TextInputStyleTuple, TextInputType}; +use crate::gui::styles::text::TextType; +use crate::gui::styles::text_input::TextInputType; use crate::gui::types::message::Message; use crate::networking::types::search_parameters::{FilterInputType, SearchParameters}; use crate::networking::types::traffic_direction::TrafficDirection; diff --git a/src/gui/pages/notifications_page.rs b/src/gui/pages/notifications_page.rs index 908f1b09..f5e7caa6 100644 --- a/src/gui/pages/notifications_page.rs +++ b/src/gui/pages/notifications_page.rs @@ -12,11 +12,10 @@ use crate::gui::components::header::get_button_settings; use crate::gui::components::tab::get_pages_tabs; use crate::gui::components::types::my_modal::MyModal; use crate::gui::pages::types::settings_page::SettingsPage; -use crate::gui::styles::button::{ButtonStyleTuple, ButtonType}; -use crate::gui::styles::container::{ContainerStyleTuple, ContainerType}; -use crate::gui::styles::scrollbar::{ScrollbarStyleTuple, ScrollbarType}; +use crate::gui::styles::container::ContainerType; +use crate::gui::styles::scrollbar::ScrollbarType; use crate::gui::styles::style_constants::{get_font, get_font_headers, FONT_SIZE_FOOTER, ICONS}; -use crate::gui::styles::text::{TextStyleTuple, TextType}; +use crate::gui::styles::text::TextType; use crate::gui::types::message::Message; use crate::notifications::types::logged_notification::{ BytesThresholdExceeded, FavoriteTransmitted, LoggedNotification, PacketsThresholdExceeded, diff --git a/src/gui/pages/overview_page.rs b/src/gui/pages/overview_page.rs index 57fc60d6..00c6fb30 100644 --- a/src/gui/pages/overview_page.rs +++ b/src/gui/pages/overview_page.rs @@ -14,12 +14,12 @@ use crate::countries::country_utils::get_flag_tooltip; use crate::countries::flags_pictures::FLAGS_WIDTH_BIG; use crate::gui::components::radio::chart_radios; use crate::gui::components::tab::get_pages_tabs; -use crate::gui::styles::button::{ButtonStyleTuple, ButtonType}; -use crate::gui::styles::container::{ContainerStyleTuple, ContainerType}; -use crate::gui::styles::rule::{RuleStyleTuple, RuleType}; -use crate::gui::styles::scrollbar::{ScrollbarStyleTuple, ScrollbarType}; +use crate::gui::styles::button::ButtonType; +use crate::gui::styles::container::ContainerType; +use crate::gui::styles::rule::RuleType; +use crate::gui::styles::scrollbar::ScrollbarType; use crate::gui::styles::style_constants::{get_font, get_font_headers, FONT_SIZE_TITLE, ICONS}; -use crate::gui::styles::text::{TextStyleTuple, TextType}; +use crate::gui::styles::text::TextType; use crate::gui::types::message::Message; use crate::gui::types::sniffer::Sniffer; use crate::networking::types::data_info::DataInfo; diff --git a/src/gui/pages/settings_language_page.rs b/src/gui/pages/settings_language_page.rs index 53ff197d..4efe4b8c 100644 --- a/src/gui/pages/settings_language_page.rs +++ b/src/gui/pages/settings_language_page.rs @@ -7,9 +7,9 @@ use crate::gui::components::radio::language_radios; use crate::gui::components::tab::get_settings_tabs; use crate::gui::pages::settings_notifications_page::settings_header; use crate::gui::pages::types::settings_page::SettingsPage; -use crate::gui::styles::container::{ContainerStyleTuple, ContainerType}; +use crate::gui::styles::container::ContainerType; use crate::gui::styles::style_constants::{get_font, get_font_headers, FONT_SIZE_SUBTITLE}; -use crate::gui::styles::text::{TextStyleTuple, TextType}; +use crate::gui::styles::text::TextType; use crate::gui::types::message::Message; use crate::translations::translations::languages_title_translation; use crate::{Language, Sniffer, StyleType}; diff --git a/src/gui/pages/settings_notifications_page.rs b/src/gui/pages/settings_notifications_page.rs index 018ef60c..83c5a1de 100644 --- a/src/gui/pages/settings_notifications_page.rs +++ b/src/gui/pages/settings_notifications_page.rs @@ -14,16 +14,12 @@ use crate::gui::components::radio::{ }; use crate::gui::components::tab::get_settings_tabs; use crate::gui::pages::types::settings_page::SettingsPage; -use crate::gui::styles::button::{ButtonStyleTuple, ButtonType}; -use crate::gui::styles::checkbox::{CheckboxStyleTuple, CheckboxType}; -use crate::gui::styles::container::{ContainerStyleTuple, ContainerType}; -use crate::gui::styles::scrollbar::{ScrollbarStyleTuple, ScrollbarType}; -use crate::gui::styles::slider::{SliderStyleTuple, SliderType}; +use crate::gui::styles::container::ContainerType; +use crate::gui::styles::scrollbar::ScrollbarType; use crate::gui::styles::style_constants::{ get_font, get_font_headers, FONT_SIZE_FOOTER, FONT_SIZE_SUBTITLE, FONT_SIZE_TITLE, ICONS, }; -use crate::gui::styles::text::{TextStyleTuple, TextType}; -use crate::gui::styles::text_input::{TextInputStyleTuple, TextInputType}; +use crate::gui::styles::text::TextType; use crate::gui::styles::types::gradient_type::GradientType; use crate::gui::types::message::Message; use crate::notifications::types::notifications::{ diff --git a/src/gui/pages/settings_style_page.rs b/src/gui/pages/settings_style_page.rs index 8f66f19e..b093a92f 100644 --- a/src/gui/pages/settings_style_page.rs +++ b/src/gui/pages/settings_style_page.rs @@ -8,14 +8,14 @@ use iced::{Alignment, Element, Font, Length, Renderer}; use crate::gui::components::tab::get_settings_tabs; use crate::gui::pages::settings_notifications_page::settings_header; use crate::gui::pages::types::settings_page::SettingsPage; -use crate::gui::styles::button::{ButtonStyleTuple, ButtonType}; -use crate::gui::styles::container::{ContainerStyleTuple, ContainerType}; -use crate::gui::styles::rule::{RuleStyleTuple, RuleType}; -use crate::gui::styles::scrollbar::{ScrollbarStyleTuple, ScrollbarType}; +use crate::gui::styles::button::ButtonType; +use crate::gui::styles::container::ContainerType; +use crate::gui::styles::rule::RuleType; +use crate::gui::styles::scrollbar::ScrollbarType; use crate::gui::styles::style_constants::{ get_font, get_font_headers, BORDER_WIDTH, FONT_SIZE_SUBTITLE, ICONS, }; -use crate::gui::styles::text::{TextStyleTuple, TextType}; +use crate::gui::styles::text::TextType; use crate::gui::styles::types::custom_palette::ExtraStyles; use crate::gui::styles::types::gradient_type::GradientType; use crate::gui::types::message::Message; diff --git a/src/gui/styles/container.rs b/src/gui/styles/container.rs index 6cdf359a..f41f1807 100644 --- a/src/gui/styles/container.rs +++ b/src/gui/styles/container.rs @@ -1,8 +1,6 @@ //! Containers style -use iced::theme::Container; use iced::widget::container::Appearance; -use iced::Theme; use iced::{Background, Color}; use crate::gui::styles::style_constants::{ diff --git a/src/gui/styles/picklist.rs b/src/gui/styles/picklist.rs index e8de0fab..056816a3 100644 --- a/src/gui/styles/picklist.rs +++ b/src/gui/styles/picklist.rs @@ -1,7 +1,5 @@ //! Picklists style -use std::rc::Rc; - use iced::widget::pick_list; use iced::{Background, Color}; diff --git a/src/gui/styles/radio.rs b/src/gui/styles/radio.rs index 2afb052d..a802fc2c 100644 --- a/src/gui/styles/radio.rs +++ b/src/gui/styles/radio.rs @@ -1,7 +1,6 @@ //! Radios style use iced::Background; -use iced::Theme; use crate::gui::styles::style_constants::BORDER_WIDTH; use crate::{get_colors, StyleType}; diff --git a/src/gui/styles/scrollbar.rs b/src/gui/styles/scrollbar.rs index ec08db27..125c4821 100644 --- a/src/gui/styles/scrollbar.rs +++ b/src/gui/styles/scrollbar.rs @@ -2,7 +2,6 @@ use iced::widget::scrollable::Properties; use iced::widget::scrollable::{Scrollbar, Scroller}; -use iced::Theme; use iced::{Background, Color}; use crate::gui::styles::style_constants::{get_alpha_round_borders, BORDER_ROUNDED_RADIUS}; diff --git a/src/gui/styles/svg.rs b/src/gui/styles/svg.rs index 1134cb93..8b1ce7be 100644 --- a/src/gui/styles/svg.rs +++ b/src/gui/styles/svg.rs @@ -1,8 +1,9 @@ //! SVG style -use crate::StyleType; use iced::widget::svg::Appearance; +use crate::StyleType; + #[derive(Clone, Copy, Default)] pub enum SvgType { #[default] diff --git a/src/gui/styles/text.rs b/src/gui/styles/text.rs index 9e354b4b..b094c95c 100644 --- a/src/gui/styles/text.rs +++ b/src/gui/styles/text.rs @@ -4,7 +4,6 @@ use iced::widget::text::Appearance; use iced::widget::{Column, Text}; use iced::{Color, Font, Renderer}; -use crate::gui::styles::style_constants::get_font; use crate::gui::types::message::Message; use crate::{get_colors, StyleType}; diff --git a/src/gui/styles/types/style_type.rs b/src/gui/styles/types/style_type.rs index be443286..8d5d1fa3 100644 --- a/src/gui/styles/types/style_type.rs +++ b/src/gui/styles/types/style_type.rs @@ -1,10 +1,8 @@ -use crate::get_colors; -use crate::gui::styles::container::ContainerType; +use iced::application; use iced::application::Appearance; -use iced::widget::{container, text}; -use iced::{application, Background, Color}; use serde::{Deserialize, Serialize}; +use crate::get_colors; use crate::gui::styles::types::custom_palette::ExtraStyles; /// Used to specify the kind of style of the application diff --git a/src/report/get_report_entries.rs b/src/report/get_report_entries.rs index 3a7ceb4e..16fb48d4 100644 --- a/src/report/get_report_entries.rs +++ b/src/report/get_report_entries.rs @@ -1,8 +1,8 @@ -use iced::Renderer; use std::cmp::{min, Ordering}; use std::sync::{Arc, Mutex}; use iced::widget::Tooltip; +use iced::Renderer; use crate::countries::country_utils::get_flag_tooltip; use crate::countries::flags_pictures::FLAGS_WIDTH_SMALL; diff --git a/src/translations/translations.rs b/src/translations/translations.rs index ae14b841..ebe0fd0f 100644 --- a/src/translations/translations.rs +++ b/src/translations/translations.rs @@ -1,8 +1,8 @@ -use crate::StyleType; use iced::widget::Text; use iced::Renderer; use crate::translations::types::language::Language; +use crate::StyleType; pub fn choose_adapters_translation(language: Language) -> Text<'static, Renderer> { Text::new(match language { diff --git a/src/utils/formatted_strings.rs b/src/utils/formatted_strings.rs index 36dc8a29..4c43a146 100644 --- a/src/utils/formatted_strings.rs +++ b/src/utils/formatted_strings.rs @@ -2,17 +2,15 @@ use std::net::IpAddr; use std::path::PathBuf; use iced::widget::{Column, Text}; -use iced::{Color, Font, Renderer}; +use iced::{Font, Renderer}; -use crate::gui::styles::style_constants::get_font; -use crate::gui::styles::text::{TextStyleTuple, TextType}; +use crate::gui::styles::text::TextType; use crate::gui::types::message::Message; use crate::networking::types::filters::Filters; -use crate::networking::types::traffic_direction::TrafficDirection; use crate::translations::translations::{ active_filters_translation, none_translation, open_report_translation, }; -use crate::{get_colors, AppProtocol, IpVersion, Language, StyleType, TransProtocol}; +use crate::{AppProtocol, IpVersion, Language, StyleType, TransProtocol}; /// Application version number (to be displayed in gui footer) pub const APP_VERSION: &str = env!("CARGO_PKG_VERSION");