Skip to content

Commit

Permalink
removed unnecessary StyleType parameters from methods
Browse files Browse the repository at this point in the history
  • Loading branch information
@GyulyVGC
GyulyVGC committed Aug 14, 2023
1 parent c47dfcd commit afa758e
Show file tree
Hide file tree
Showing 21 changed files with 230 additions and 336 deletions.
10 changes: 5 additions & 5 deletions src/countries/country_utils.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use iced::widget::svg::Handle;
use iced::widget::tooltip::Position;
use iced::widget::Svg;
use iced::widget::Tooltip;
use iced::{Length, Renderer};
use iced::{Font, Length, Renderer};
use maxminddb::{geoip2, MaxMindDBError, Reader};

use crate::countries::flags_pictures::{
Expand Down Expand Up @@ -325,13 +325,13 @@ pub fn get_flag_tooltip(
is_local: bool,
traffic_type: TrafficType,
language: Language,
style: StyleType,
font: Font,
) -> Tooltip<'static, Message, Renderer<StyleType>> {
let (content, tooltip) =
get_flag_from_country(country, width, is_local, traffic_type, language);

let mut tooltip = Tooltip::new(content, tooltip, Position::FollowCursor)
.font(get_font(style))
.font(font)
.snap_within_viewport(true)
.style(ContainerType::Tooltip);

Expand All @@ -346,7 +346,7 @@ pub fn get_computer_tooltip(
is_my_address: bool,
traffic_type: TrafficType,
language: Language,
style: StyleType,
font: Font,
) -> Tooltip<'static, Message, Renderer<StyleType>> {
let content = Svg::new(Handle::from_memory(Vec::from(
match (is_my_address, traffic_type) {
Expand All @@ -367,7 +367,7 @@ pub fn get_computer_tooltip(
};

Tooltip::new(content, tooltip, Position::FollowCursor)
.font(get_font(style))
.font(font)
.snap_within_viewport(true)
.style(ContainerType::Tooltip)
}
24 changes: 14 additions & 10 deletions src/gui/app.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ use crate::gui::pages::settings_style_page::settings_style_page;
use crate::gui::pages::types::running_page::RunningPage;
use crate::gui::pages::types::settings_page::SettingsPage;
use crate::gui::styles::style_constants::{
get_font, ICONS_BYTES, SARASA_MONO_BOLD_BYTES, SARASA_MONO_BYTES,
get_font, get_font_headers, ICONS_BYTES, SARASA_MONO_BOLD_BYTES, SARASA_MONO_BYTES,
};
use crate::gui::types::message::Message;
use crate::gui::types::sniffer::Sniffer;
Expand Down Expand Up @@ -66,19 +66,19 @@ impl Application for Sniffer {

fn view(&self) -> Element<Message, Renderer<StyleType>> {
let status = *self.status_pair.0.lock().unwrap();
let style = self.style;
let font = get_font(style);
let font = get_font(self.style);
let font_headers = get_font_headers(self.style);

let header = match status {
Status::Init => header(
style,
font,
self.color_gradient,
false,
self.language,
self.last_opened_setting,
),
Status::Running => header(
style,
font,
self.color_gradient,
true,
self.language,
Expand All @@ -98,7 +98,8 @@ impl Application for Sniffer {
let footer = footer(
self.language,
self.color_gradient,
style,
font,
font_headers,
&self.newer_release_available.clone(),
);

Expand All @@ -123,11 +124,14 @@ impl Application for Sniffer {
Some(modal) => {
let overlay = match modal {
MyModal::Quit => {
get_exit_overlay(style, self.color_gradient, font, self.language)
}
MyModal::ClearAll => {
get_clear_all_overlay(style, self.color_gradient, font, self.language)
get_exit_overlay(self.color_gradient, font, font_headers, self.language)
}
MyModal::ClearAll => get_clear_all_overlay(
self.color_gradient,
font,
font_headers,
self.language,
),
MyModal::ConnectionDetails(connection_index) => {
connection_details_page(self, connection_index)
}
Expand Down
32 changes: 14 additions & 18 deletions src/gui/components/footer.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,23 +25,22 @@ use crate::Language;
pub fn footer(
language: Language,
color_gradient: GradientType,
style: StyleType,
font: Font,
font_footer: Font,
newer_release_available: &Arc<Mutex<Result<bool, String>>>,
) -> Container<'static, Message, Renderer<StyleType>> {
let font_footer = get_font_headers(style);

let release_details_row =
get_release_details(language, style, font_footer, newer_release_available);
get_release_details(language, font, font_footer, newer_release_available);

let footer_row = Row::new()
.spacing(10)
.width(Length::Fill)
.padding([0, 20])
.align_items(Alignment::Center)
.push(release_details_row)
.push(get_button_website(style))
.push(get_button_github(style))
.push(get_button_sponsor(style))
.push(get_button_website(font))
.push(get_button_github(font))
.push(get_button_sponsor(font))
.push(
Text::new("Made with ❤ by Giuliano Bellini")
.width(Length::FillPortion(1))
Expand All @@ -58,7 +57,7 @@ pub fn footer(
.style(ContainerType::Gradient(color_gradient))
}

fn get_button_website(style: StyleType) -> Tooltip<'static, Message, Renderer<StyleType>> {
fn get_button_website(font: Font) -> Tooltip<'static, Message, Renderer<StyleType>> {
let content = button(
Text::new('c'.to_string())
.font(ICONS)
Expand All @@ -68,15 +67,14 @@ fn get_button_website(style: StyleType) -> Tooltip<'static, Message, Renderer<St
)
.height(Length::Fixed(30.0))
.width(Length::Fixed(30.0))
.style(ButtonType::Standard)
.on_press(Message::OpenWebPage(WebPage::Website));

Tooltip::new(content, "Website", Position::Top)
.font(get_font(style))
.font(font)
.style(ContainerType::Tooltip)
}

fn get_button_github(style: StyleType) -> Tooltip<'static, Message, Renderer<StyleType>> {
fn get_button_github(font: Font) -> Tooltip<'static, Message, Renderer<StyleType>> {
let content = button(
Text::new('H'.to_string())
.font(ICONS)
Expand All @@ -86,15 +84,14 @@ fn get_button_github(style: StyleType) -> Tooltip<'static, Message, Renderer<Sty
)
.height(Length::Fixed(40.0))
.width(Length::Fixed(40.0))
.style(ButtonType::Standard)
.on_press(Message::OpenWebPage(WebPage::Repo));

Tooltip::new(content, "GitHub", Position::Top)
.font(get_font(style))
.font(font)
.style(ContainerType::Tooltip)
}

fn get_button_sponsor(style: StyleType) -> Tooltip<'static, Message, Renderer<StyleType>> {
fn get_button_sponsor(font: Font) -> Tooltip<'static, Message, Renderer<StyleType>> {
let content = button(
Text::new('❤'.to_string())
.size(23)
Expand All @@ -105,17 +102,16 @@ fn get_button_sponsor(style: StyleType) -> Tooltip<'static, Message, Renderer<St
.padding([2, 0, 0, 0])
.height(Length::Fixed(30.0))
.width(Length::Fixed(30.0))
.style(ButtonType::Standard)
.on_press(Message::OpenWebPage(WebPage::Sponsor));

Tooltip::new(content, "Sponsor", Position::Top)
.font(get_font(style))
.font(font)
.style(ContainerType::Tooltip)
}

fn get_release_details(
language: Language,
style: StyleType,
font: Font,
font_footer: Font,
newer_release_available: &Arc<Mutex<Result<bool, String>>>,
) -> Row<'static, Message, Renderer<StyleType>> {
Expand Down Expand Up @@ -148,7 +144,7 @@ fn get_release_details(
new_version_available_translation(language),
Position::Top,
)
.font(get_font(style))
.font(font)
.style(ContainerType::Tooltip);
ret_val = ret_val
.push(horizontal_space(Length::Fixed(10.0)))
Expand Down
18 changes: 8 additions & 10 deletions src/gui/components/header.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use iced::widget::text::LineHeight;
use iced::widget::tooltip::Position;
use iced::widget::{button, Container, Row, Text, Tooltip};
use iced::Length::FillPortion;
use iced::{Alignment, Length, Renderer};
use iced::{Alignment, Font, Length, Renderer};

use crate::gui::pages::types::settings_page::SettingsPage;
use crate::gui::styles::button::{ButtonStyleTuple, ButtonType};
Expand All @@ -17,7 +17,7 @@ use crate::translations::translations::{quit_analysis_translation, settings_tran
use crate::{Language, StyleType};

pub fn header(
style: StyleType,
font: Font,
color_gradient: GradientType,
back_button: bool,
language: Language,
Expand All @@ -38,7 +38,7 @@ pub fn header(
.width(Length::Fill)
.align_items(Alignment::Center)
.push(if back_button {
Container::new(get_button_reset(style, language))
Container::new(get_button_reset(font, language))
.width(FillPortion(1))
.align_x(Horizontal::Center)
} else {
Expand All @@ -48,7 +48,7 @@ pub fn header(
})
.push(logo)
.push(
Container::new(get_button_settings(style, language, last_opened_setting))
Container::new(get_button_settings(font, language, last_opened_setting))
.width(FillPortion(1))
.align_x(Horizontal::Center),
),
Expand All @@ -60,7 +60,7 @@ pub fn header(
}

fn get_button_reset(
style: StyleType,
font: Font,
language: Language,
) -> Tooltip<'static, Message, Renderer<StyleType>> {
let content = button(
Expand All @@ -73,20 +73,19 @@ fn get_button_reset(
.padding(10)
.height(Length::Fixed(40.0))
.width(Length::Fixed(60.0))
.style(ButtonType::Standard)
.on_press(Message::ResetButtonPressed);

Tooltip::new(
content,
quit_analysis_translation(language),
Position::Right,
)
.font(get_font(style))
.font(font)
.style(ContainerType::Tooltip)
}

pub fn get_button_settings(
style: StyleType,
font: Font,
language: Language,
open_overlay: SettingsPage,
) -> Tooltip<'static, Message, Renderer<StyleType>> {
Expand All @@ -100,10 +99,9 @@ pub fn get_button_settings(
.padding(0)
.height(Length::Fixed(40.0))
.width(Length::Fixed(60.0))
.style(ButtonType::Standard)
.on_press(Message::OpenSettings(open_overlay));

Tooltip::new(content, settings_translation(language), Position::Left)
.font(get_font(style))
.font(font)
.style(ContainerType::Tooltip)
}
22 changes: 11 additions & 11 deletions src/gui/components/modal.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,20 @@ use crate::translations::translations::{
use crate::{Language, StyleType};

pub fn get_exit_overlay(
style: StyleType,
color_gradient: GradientType,
font: Font,
font_headers: Font,
language: Language,
) -> Container<'static, Message, Renderer<StyleType>> {
let row_buttons = confirm_button_row(language, font, style, Message::Reset);
let row_buttons = confirm_button_row(language, font, Message::Reset);

let content = Column::new()
.padding(0)
.align_items(Alignment::Center)
.width(Length::Fill)
.push(get_modal_header(
style,
font,
font_headers,
color_gradient,
language,
quit_analysis_translation(language),
Expand All @@ -57,19 +58,20 @@ pub fn get_exit_overlay(
}

pub fn get_clear_all_overlay(
style: StyleType,
color_gradient: GradientType,
font: Font,
font_headers: Font,
language: Language,
) -> Container<'static, Message, Renderer<StyleType>> {
let row_buttons = confirm_button_row(language, font, style, Message::ClearAllNotifications);
let row_buttons = confirm_button_row(language, font, Message::ClearAllNotifications);

let content = Column::new()
.padding(0)
.align_items(Alignment::Center)
.width(Length::Fill)
.push(get_modal_header(
style,
font,
font_headers,
color_gradient,
language,
clear_all_translation(language),
Expand All @@ -89,20 +91,20 @@ pub fn get_clear_all_overlay(
}

fn get_modal_header(
style: StyleType,
font: Font,
font_headers: Font,
color_gradient: GradientType,
language: Language,
title: String,
) -> Container<'static, Message, Renderer<StyleType>> {
let font = get_font(style);
let tooltip = hide_translation(language).to_string();
//tooltip.push_str(" [esc]");
Container::new(
Row::new()
.push(horizontal_space(Length::FillPortion(1)))
.push(
Text::new(title)
.font(get_font_headers(style))
.font(font_headers)
.size(FONT_SIZE_TITLE)
.width(Length::FillPortion(6))
.horizontal_alignment(Horizontal::Center),
Expand All @@ -120,7 +122,6 @@ fn get_modal_header(
.padding(2)
.height(Length::Fixed(20.0))
.width(Length::Fixed(20.0))
.style(ButtonType::Standard)
.on_press(Message::HideModal),
tooltip,
Position::Right,
Expand All @@ -142,7 +143,6 @@ fn get_modal_header(
fn confirm_button_row(
language: Language,
font: Font,
style: StyleType,
message: Message,
) -> Row<'static, Message, Renderer<StyleType>> {
Row::new()
Expand Down
Loading

0 comments on commit afa758e

Please sign in to comment.