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

fixed size for badges

Browse Source
This commit is contained in:
pythcoiner 2024-02-24 19:39:36 +01:00
parent 3fcbb0b67d
commit 66f392c754
2 changed files with 75 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gui/src/app/view/psbts.rs
View File

@ -133,17 +133,17 @@ fn spend_tx_list_view(i: usize, tx: &SpendTx) -> Element<'_, Message> {
.align_items(Alignment::Center)
.width(Length::Fill),
)
.push_maybe(match tx.status {
SpendStatus::Deprecated => Some(badge::deprecated()),
SpendStatus::Broadcast => Some(badge::unconfirmed()),
SpendStatus::Spent => Some(badge::spent()),
_ => None,
})
.push_maybe(if tx.is_batch() {
Some(badge::batch())
} else {
None
})
.push_maybe(match tx.status {
SpendStatus::Deprecated => Some(badge::deprecated_sized(120.0)),
SpendStatus::Broadcast => Some(badge::unconfirmed_sized(120.0)),
SpendStatus::Spent => Some(badge::spent_sized(120.0)),
_ => None,
})
.push(
Column::new()
.align_items(Alignment::End)
@ -153,7 +153,7 @@ fn spend_tx_list_view(i: usize, tx: &SpendTx) -> Element<'_, Message> {
Container::new(p1_regular("Self-transfer"))
})
.push_maybe(tx.fee_amount.map(|fee| amount_with_size(&fee, P2_SIZE)))
.width(Length::Shrink),
.width(Length::Fixed(140.0)),
)
.align_items(Alignment::Center)
.spacing(20),

113
gui/ui/src/component/badge.rs
View File

@ -1,5 +1,6 @@
use iced::{widget::tooltip, Length};
use crate::util::Collection;
use crate::{component::text, icon, image, theme, widget::*};
pub struct Badge {
@ -75,66 +76,88 @@ pub fn coin<T>() -> Container<'static, T> {
}
pub fn recovery<'a, T: 'a>() -> Container<'a, T> {
Container::new(
tooltip::Tooltip::new(
Container::new(text::p2_regular(" Recovery "))
.padding(10)
.style(theme::Container::Pill(theme::Pill::Simple)),
"This transaction is using a recovery path",
tooltip::Position::Top,
)
.style(theme::Container::Card(theme::Card::Simple)),
badge_pill(
" Recovery ",
"This transaction is using a recovery path",
None,
)
}
pub fn unconfirmed<'a, T: 'a>() -> Container<'a, T> {
Container::new(
tooltip::Tooltip::new(
Container::new(text::p2_regular(" Unconfirmed "))
.padding(10)
.style(theme::Container::Pill(theme::Pill::Simple)),
"Do not treat this as a payment until it is confirmed",
tooltip::Position::Top,
)
.style(theme::Container::Card(theme::Card::Simple)),
badge_pill(
" Unconfirmed ",
"Do not treat this as a payment until it is confirmed",
None,
)
}
pub fn unconfirmed_sized<'a, T: 'a>(width: f32) -> Container<'a, T> {
badge_pill(
" Unconfirmed ",
"Do not treat this as a payment until it is confirmed",
Some(width),
)
}
pub fn batch<'a, T: 'a>() -> Container<'a, T> {
Container::new(
tooltip::Tooltip::new(
Container::new(text::p2_regular(" Batch "))
.padding(10)
.style(theme::Container::Pill(theme::Pill::Simple)),
"This transaction contains multiple payments",
tooltip::Position::Top,
)
.style(theme::Container::Card(theme::Card::Simple)),
badge_pill(
" Batch ",
"This transaction contains multiple payments",
None,
)
}
pub fn deprecated<'a, T: 'a>() -> Container<'a, T> {
Container::new(
tooltip::Tooltip::new(
Container::new(text::p2_regular(" Deprecated "))
.padding(10)
.style(theme::Container::Pill(theme::Pill::Simple)),
"This transaction cannot be included in the blockchain anymore.",
tooltip::Position::Top,
)
.style(theme::Container::Card(theme::Card::Simple)),
badge_pill(
" Deprecated ",
"This transaction cannot be included in the blockchain anymore.",
None,
)
}
pub fn deprecated_sized<'a, T: 'a>(width: f32) -> Container<'a, T> {
badge_pill(
" Deprecated ",
"This transaction cannot be included in the blockchain anymore.",
Some(width),
)
}
pub fn spent<'a, T: 'a>() -> Container<'a, T> {
Container::new(
tooltip::Tooltip::new(
Container::new(text::p2_regular(" Spent "))
.padding(10)
.style(theme::Container::Pill(theme::Pill::Simple)),
"The transaction was included in the blockchain.",
tooltip::Position::Top,
)
.style(theme::Container::Card(theme::Card::Simple)),
badge_pill(
" Spent ",
"The transaction was included in the blockchain.",
None,
)
}
pub fn spent_sized<'a, T: 'a>(width: f32) -> Container<'a, T> {
badge_pill(
" Spent ",
"The transaction was included in the blockchain.",
Some(width),
)
}
pub fn badge_pill<'a, T: 'a>(
label: &'a str,
tooltip: &'a str,
width: Option<f32>,
) -> Container<'a, T> {
Container::new({
let mut pill: Container<'a, T> = Container::new(
Row::new()
.push_maybe(width.map(|_| iced::widget::Space::with_width(Length::Fill)))
.push(text::p2_regular(label))
.push_maybe(width.map(|_| iced::widget::Space::with_width(Length::Fill))),
)
.padding(10)
.style(theme::Container::Pill(theme::Pill::Simple));
if let Some(w) = width {
pill = pill.width(Length::Fixed(w));
}
tooltip::Tooltip::new(pill, tooltip, tooltip::Position::Top)
.style(theme::Container::Card(theme::Card::Simple))
})
}