diff --git a/gui/src/installer/view.rs b/gui/src/installer/view.rs index 7a92976f..f504c4f8 100644 --- a/gui/src/installer/view.rs +++ b/gui/src/installer/view.rs @@ -1120,12 +1120,7 @@ pub fn undefined_descriptor_key<'a>() -> Element<'a, message::DefineKey> { Column::new() .spacing(15) .align_items(Alignment::Center) - .push( - icon::key_icon() - .size(30) - .width(Length::Units(50)) - .style(color::GREY_3), - ), + .push(image::key_mark_icon().width(Length::Units(30))), ) .height(Length::Fill) .align_y(alignment::Vertical::Center), @@ -1162,30 +1157,19 @@ pub fn defined_descriptor_key( ), ) .push( - Column::new() - .align_items(Alignment::Center) - .spacing(5) - .push( - Container::new( - Column::new() - .spacing(5) - .align_items(Alignment::Center) - .push( - scrollable(text(name).bold()).horizontal_scroll( - Properties::new().width(2).scroller_width(2), - ), - ) - .push( - icon::circle_check_icon() - .style(color::GREEN) - .size(20) - .width(Length::Units(50)), - ), + Container::new( + Column::new() + .spacing(10) + .align_items(Alignment::Center) + .push( + scrollable(text(name).bold()) + .horizontal_scroll(Properties::new().width(2).scroller_width(2)), ) - .height(Length::Fill) - .align_y(alignment::Vertical::Center), - ) - .height(Length::Fill), + .push(image::success_mark_icon().width(Length::Units(50))) + .push(Space::with_width(Length::Units(1))), + ) + .height(Length::Fill) + .align_y(alignment::Vertical::Center), ) .push( button::secondary(Some(icon::pencil_icon()), "Edit").on_press(message::DefineKey::Edit), diff --git a/gui/ui/src/component/hw.rs b/gui/ui/src/component/hw.rs index 67acd4f4..b5f00c3c 100644 --- a/gui/ui/src/component/hw.rs +++ b/gui/ui/src/component/hw.rs @@ -1,4 +1,4 @@ -use crate::{color, component::text, icon, theme, util::*, widget::*}; +use crate::{color, component::text, icon, image, theme, util::*, widget::*}; use iced::{ widget::{column, container, row, tooltip}, Alignment, Length, @@ -121,7 +121,7 @@ pub fn selected_hardware_wallet<'a, T: 'a, K: Display, V: Display, F: Display>( ]) .width(Length::Fill) .into(), - icon::circle_check_icon().style(color::GREEN).into(), + image::success_mark_icon().width(Length::Units(50)).into(), ]) .align_items(Alignment::Center), ) @@ -151,8 +151,8 @@ pub fn sign_success_hardware_wallet<'a, T: 'a, K: Display, V: Display, F: Displa .width(Length::Fill) .into(), row(vec![ - icon::circle_check_icon().style(color::GREEN).into(), text::p1_regular("Signed").style(color::GREEN).into(), + image::success_mark_icon().width(Length::Units(50)).into(), ]) .align_items(Alignment::Center) .spacing(5) @@ -186,8 +186,8 @@ pub fn registration_success_hardware_wallet<'a, T: 'a, K: Display, V: Display, F .width(Length::Fill) .into(), row(vec![ - icon::circle_check_icon().style(color::GREEN).into(), text::p1_regular("Registered").style(color::GREEN).into(), + image::success_mark_icon().width(Length::Units(50)).into(), ]) .align_items(Alignment::Center) .spacing(5) @@ -250,8 +250,8 @@ pub fn sign_success_hot_signer<'a, T: 'a, F: Display>( .width(Length::Fill) .into(), row(vec![ - icon::circle_check_icon().style(color::GREEN).into(), text::p1_regular("Signed").style(color::GREEN).into(), + image::success_mark_icon().width(Length::Units(50)).into(), ]) .align_items(Alignment::Center) .spacing(5) @@ -284,7 +284,7 @@ pub fn selected_hot_signer<'a, T: 'a, F: Display>( ]) .width(Length::Fill) .into(), - icon::circle_check_icon().style(color::GREEN).into(), + image::success_mark_icon().width(Length::Units(50)).into(), ]) .align_items(Alignment::Center), ) diff --git a/gui/ui/src/image.rs b/gui/ui/src/image.rs index 635466b0..0d095bb6 100644 --- a/gui/ui/src/image.rs +++ b/gui/ui/src/image.rs @@ -39,3 +39,17 @@ pub fn restore_wallet_icon() -> Svg { let h = Handle::from_memory(RESTORE_WALLET_ICON.to_vec()); Svg::new(h) } + +const SUCCESS_MARK_ICON: &[u8] = include_bytes!("../static/icons/success-mark.svg"); + +pub fn success_mark_icon() -> Svg { + let h = Handle::from_memory(SUCCESS_MARK_ICON.to_vec()); + Svg::new(h) +} + +const KEY_MARK_ICON: &[u8] = include_bytes!("../static/icons/key-mark.svg"); + +pub fn key_mark_icon() -> Svg { + let h = Handle::from_memory(KEY_MARK_ICON.to_vec()); + Svg::new(h) +} diff --git a/gui/ui/static/icons/key-mark.svg b/gui/ui/static/icons/key-mark.svg new file mode 100644 index 00000000..22937e54 --- /dev/null +++ b/gui/ui/static/icons/key-mark.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/gui/ui/static/icons/success-mark.svg b/gui/ui/static/icons/success-mark.svg new file mode 100644 index 00000000..66548919 --- /dev/null +++ b/gui/ui/static/icons/success-mark.svg @@ -0,0 +1,4 @@ + + + +