nik/liana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

installer: keep refresh button to list hws

Browse Source
This commit is contained in:
edouard 2022-11-25 11:18:20 +01:00
parent 92699c645b
commit b260ac4208
3 changed files with 46 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
gui/src/installer/view.rs
View File

@ -317,9 +317,24 @@ pub fn register_descriptor<'a>(
.align_items(Alignment::Center),
)
.push_maybe(error.map(|e| card::error("Failed to import xpub", e.to_string())))
.push(if !hws.is_empty() {
.push(
Column::new()
.push(text(format!("{} hardware wallets connected", hws.len())).bold())
.push(
Row::new()
.spacing(10)
.align_items(Alignment::Center)
.push(
Container::new(
text(format!("{} hardware wallets connected", hws.len()))
.bold(),
)
.width(Length::Fill),
)
.push(
button::border(Some(icon::reload_icon()), "Refresh")
.on_press(Message::Reload),
),
)
.spacing(10)
.push(
hws.iter()
@ -334,17 +349,8 @@ pub fn register_descriptor<'a>(
))
}),
)
.width(Length::Fill)
} else {
Column::new().push(card::simple(
Column::new()
.spacing(20)
.push("No hardware wallet connected")
.push(button::primary(None, "Refresh").on_press(Message::Reload))
.align_items(Alignment::Center)
.width(Length::Fill),
))
})
.width(Length::Fill),
)
.push(
button::primary(None, "Next")
.on_press(Message::Next)
@ -473,9 +479,24 @@ pub fn hardware_wallet_xpubs_modal<'a>(
.size(50),
)
.push_maybe(error.map(|e| card::error("Failed to import xpub", e.to_string())))
.push(if !hws.is_empty() {
.push(
Column::new()
.push(text(format!("{} hardware wallets connected", hws.len())).bold())
.push(
Row::new()
.spacing(10)
.align_items(Alignment::Center)
.push(
Container::new(
text(format!("{} hardware wallets connected", hws.len()))
.bold(),
)
.width(Length::Fill),
)
.push(
button::border(Some(icon::reload_icon()), "Refresh")
.on_press(Message::Reload),
),
)
.spacing(10)
.push(
hws.iter()
@ -490,22 +511,8 @@ pub fn hardware_wallet_xpubs_modal<'a>(
))
}),
)
.width(Length::Fill)
} else {
Column::new()
.push(
card::simple(
Column::new()
.spacing(20)
.width(Length::Fill)
.push("Please connect a hardware wallet")
.push(button::primary(None, "Refresh").on_press(Message::Reload))
.align_items(Alignment::Center),
)
.width(Length::Fill),
)
.width(Length::Fill)
})
.width(Length::Fill),
)
.width(Length::Fill)
.height(Length::Fill)
.padding(100)

4
gui/src/ui/component/button.rs
View File

@ -16,6 +16,10 @@ pub fn transparent<'a, T: 'a>(icon: Option<Text<'a>>, t: &'static str) -> button
button::Button::new(content(icon, t)).style(Style::Transparent.into())
}
pub fn border<'a, T: 'a>(icon: Option<Text<'a>>, t: &'static str) -> button::Button<'a, T> {
button::Button::new(content(icon, t)).style(Style::Border.into())
}
pub fn transparent_border<'a, T: 'a>(
icon: Option<Text<'a>>,
t: &'static str,

4
gui/src/ui/icon.rs
View File

@ -13,6 +13,10 @@ fn icon(unicode: char) -> Text<'static> {
.size(20)
}
pub fn reload_icon() -> Text<'static> {
icon('\u{F130}')
}
pub fn import_icon() -> Text<'static> {
icon('\u{F30A}')
}