From e0a207bb06460b03df17b0d61c131ecc9dceeb42 Mon Sep 17 00:00:00 2001 From: edouard Date: Tue, 9 May 2023 20:57:19 +0200 Subject: [PATCH] installer: change user path icons --- gui/src/installer/view.rs | 80 +++++++++++++++++------------- gui/ui/src/icon.rs | 4 -- gui/ui/src/image.rs | 21 ++++++++ gui/ui/static/icons/blueprint.svg | 12 +++++ gui/ui/static/icons/discussion.svg | 4 ++ gui/ui/static/icons/syncdata.svg | 5 ++ 6 files changed, 87 insertions(+), 39 deletions(-) create mode 100644 gui/ui/static/icons/blueprint.svg create mode 100644 gui/ui/static/icons/discussion.svg create mode 100644 gui/ui/static/icons/syncdata.svg diff --git a/gui/src/installer/view.rs b/gui/src/installer/view.rs index 86e60142..71862925 100644 --- a/gui/src/installer/view.rs +++ b/gui/src/installer/view.rs @@ -10,10 +10,10 @@ use liana_ui::{ color, component::{ button, card, collapse, form, hw, separation, - text::{h3, text, Text}, + text::{h3, p1_regular, text, Text}, tooltip, }, - icon, theme, + icon, image, theme, util::Collection, widget::*, }; @@ -80,48 +80,58 @@ pub fn welcome<'a>() -> Element<'a, Message> { Column::new() .push( Row::new() + .align_items(Alignment::End) .spacing(20) .push( - Button::new( - Container::new( - Column::new() - .width(Length::Units(250)) - .push(icon::wallet_icon().size(50).width(Length::Units(100))) - .push(text("Create a new wallet")) - .align_items(Alignment::Center), - ) - .padding(20), + Container::new( + Column::new() + .spacing(20) + .align_items(Alignment::Center) + .push(image::create_new_wallet_icon().width(Length::Units(100))) + .push(p1_regular("Create a new wallet").style(color::GREY_3)) + .push( + button::secondary(None, "Select") + .width(Length::Units(200)) + .on_press(Message::CreateWallet), + ) + .align_items(Alignment::Center), ) - .style(theme::Button::Secondary) - .on_press(Message::CreateWallet), + .padding(20), ) .push( - Button::new( - Container::new( - Column::new() - .width(Length::Units(250)) - .push(icon::people_icon().size(50).width(Length::Units(100))) - .push(text("Participate in a new wallet")) - .align_items(Alignment::Center), - ) - .padding(20), + Container::new( + Column::new() + .spacing(20) + .align_items(Alignment::Center) + .push( + image::participate_in_new_wallet_icon() + .width(Length::Units(200)), + ) + .push(p1_regular("Participate in new wallet").style(color::GREY_3)) + .push( + button::secondary(None, "Select") + .width(Length::Units(200)) + .on_press(Message::ParticipateWallet), + ) + .align_items(Alignment::Center), ) - .style(theme::Button::Secondary) - .on_press(Message::ParticipateWallet), + .padding(20), ) .push( - Button::new( - Container::new( - Column::new() - .width(Length::Units(250)) - .push(icon::import_icon().size(50).width(Length::Units(100))) - .push(text("Import a wallet backup")) - .align_items(Alignment::Center), - ) - .padding(20), + Container::new( + Column::new() + .spacing(20) + .align_items(Alignment::Center) + .push(image::restore_wallet_icon().width(Length::Units(100))) + .push(p1_regular("Restore a wallet").style(color::GREY_3)) + .push( + button::secondary(None, "Select") + .width(Length::Units(200)) + .on_press(Message::ImportWallet), + ) + .align_items(Alignment::Center), ) - .style(theme::Button::Secondary) - .on_press(Message::ImportWallet), + .padding(20), ), ) .width(Length::Fill) diff --git a/gui/ui/src/icon.rs b/gui/ui/src/icon.rs index 756de529..9ce74dab 100644 --- a/gui/ui/src/icon.rs +++ b/gui/ui/src/icon.rs @@ -110,10 +110,6 @@ pub fn up_icon() -> Text<'static> { bootstrap_icon('\u{F27C}') } -pub fn people_icon() -> Text<'static> { - bootstrap_icon('\u{F4CF}') -} - pub fn network_icon() -> Text<'static> { bootstrap_icon('\u{F40D}') } diff --git a/gui/ui/src/image.rs b/gui/ui/src/image.rs index 55783f6a..ec1ca8ae 100644 --- a/gui/ui/src/image.rs +++ b/gui/ui/src/image.rs @@ -12,3 +12,24 @@ pub fn liana_grey_logo() -> Svg { let h = Handle::from_memory(LIANA_LOGO_GREY.to_vec()); Svg::new(h) } + +const CREATE_NEW_WALLET_ICON: &[u8] = include_bytes!("../static/icons/blueprint.svg"); + +pub fn create_new_wallet_icon() -> Svg { + let h = Handle::from_memory(CREATE_NEW_WALLET_ICON.to_vec()); + Svg::new(h) +} + +const PARTICIPATE_IN_NEW_WALLET_ICON: &[u8] = include_bytes!("../static/icons/discussion.svg"); + +pub fn participate_in_new_wallet_icon() -> Svg { + let h = Handle::from_memory(PARTICIPATE_IN_NEW_WALLET_ICON.to_vec()); + Svg::new(h) +} + +const RESTORE_WALLET_ICON: &[u8] = include_bytes!("../static/icons/syncdata.svg"); + +pub fn restore_wallet_icon() -> Svg { + let h = Handle::from_memory(RESTORE_WALLET_ICON.to_vec()); + Svg::new(h) +} diff --git a/gui/ui/static/icons/blueprint.svg b/gui/ui/static/icons/blueprint.svg new file mode 100644 index 00000000..8977d1fb --- /dev/null +++ b/gui/ui/static/icons/blueprint.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/gui/ui/static/icons/discussion.svg b/gui/ui/static/icons/discussion.svg new file mode 100644 index 00000000..937006a9 --- /dev/null +++ b/gui/ui/static/icons/discussion.svg @@ -0,0 +1,4 @@ + + + + diff --git a/gui/ui/static/icons/syncdata.svg b/gui/ui/static/icons/syncdata.svg new file mode 100644 index 00000000..f483f3c1 --- /dev/null +++ b/gui/ui/static/icons/syncdata.svg @@ -0,0 +1,5 @@ + + + + +