Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change primary and secondary button for consistency #1381

Merged
merged 6 commits into from
Oct 15, 2024
Merged

Change primary and secondary button for consistency #1381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
277945d
convert all primary button to secondary button
edouardparis Oct 14, 2024
08854c4
change secondary button ui
edouardparis Oct 14, 2024
8546e55
change button for secondary button for consistency
edouardparis Oct 14, 2024
5c9171d
remove unused picklist theme
edouardparis Oct 14, 2024
0c2f0de
Add light background to active buttons
edouardparis Oct 14, 2024
3e33353
change button kind for transaction save modal
edouardparis Oct 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gui/src/app/view/coins.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ fn coin_list_view<'a>(
} else {
Column::new().push(
Row::new().push(Space::with_width(Length::Fill)).push(
button::primary(Some(icon::arrow_repeat()), "Refresh coin")
button::secondary(Some(icon::arrow_repeat()), "Refresh coin")
.on_press(Message::Menu(Menu::RefreshCoins(vec![
coin.outpoint,
]))),
Expand Down
9 changes: 5 additions & 4 deletions gui/src/app/view/home.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,10 @@ pub fn home_view<'a>(
.width(Length::Fill),
)
.push(
button::primary(Some(icon::arrow_repeat()), "Refresh coins").on_press(
Message::Menu(Menu::RefreshCoins(expiring_coins.to_owned())),
),
button::secondary(Some(icon::arrow_repeat()), "Refresh coins")
.on_press(Message::Menu(Menu::RefreshCoins(
expiring_coins.to_owned(),
))),
),
)
.padding(25)
Expand Down Expand Up @@ -322,7 +323,7 @@ pub fn payment_view<'a>(
.spacing(5),
))
.push(
button::primary(None, "See transaction details")
button::secondary(None, "See transaction details")
.on_press(Message::Menu(Menu::TransactionPreSelected(tx.tx.txid()))),
)
.spacing(20),
Expand Down
10 changes: 5 additions & 5 deletions gui/src/app/view/label.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ pub fn label_editable(
iced::widget::Text::new(label)
.size(size)
.shaping(Shaping::Advanced),
button::primary(Some(icon::pencil_icon()), "Edit").on_press(
button::secondary(Some(icon::pencil_icon()), "Edit").on_press(
view::Message::Label(
labelled,
view::message::LabelMessage::Edited(label.to_string())
Expand All @@ -34,7 +34,7 @@ pub fn label_editable(
}
}
Container::new(
button::primary(Some(icon::pencil_icon()), "Add label").on_press(view::Message::Label(
button::secondary(Some(icon::pencil_icon()), "Add label").on_press(view::Message::Label(
labelled,
view::message::LabelMessage::Edited(String::default()),
)),
Expand All @@ -54,11 +54,11 @@ pub fn label_editing(
.size(size)
.padding(10),
if label.valid {
button::primary(None, "Save").on_press(view::message::LabelMessage::Confirm)
button::secondary(None, "Save").on_press(view::message::LabelMessage::Confirm)
} else {
button::primary(None, "Save")
button::secondary(None, "Save")
},
button::primary(None, "Cancel").on_press(view::message::LabelMessage::Cancel)
button::secondary(None, "Cancel").on_press(view::message::LabelMessage::Cancel)
)
.spacing(5)
.align_items(Alignment::Center),
Expand Down
2 changes: 1 addition & 1 deletion gui/src/app/view/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ pub fn modal<'a, T: Into<Element<'a, Message>>, F: Into<Element<'a, Message>>>(
Column::new().width(Length::Fill)
})
.align_items(iced::Alignment::Center)
.push(button::primary(Some(cross_icon()), "Close").on_press(Message::Close)),
.push(button::secondary(Some(cross_icon()), "Close").on_press(Message::Close)),
)
.padding(10)
.style(theme::Container::Background),
Expand Down
21 changes: 11 additions & 10 deletions gui/src/app/view/psbt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,9 @@ pub fn save_action<'a>(warning: Option<&Error>, saved: bool) -> Element<'a, Mess
.push(text("Save this transaction"))
.push(
Row::new()
.push(Column::new().width(Length::Fill))
.push(button::alert(None, "Ignore").on_press(Message::Close))
.spacing(10)
.push(Space::with_width(Length::Fill))
.push(button::secondary(None, "Ignore").on_press(Message::Close))
.push(
button::primary(None, "Save")
.on_press(Message::Spend(SpendTxMessage::Confirm)),
Expand Down Expand Up @@ -213,7 +214,7 @@ pub fn broadcast_action<'a>(
})
.push(
Row::new().push(Column::new().width(Length::Fill)).push(
button::primary(None, "Broadcast")
button::secondary(None, "Broadcast")
.on_press(Message::Spend(SpendTxMessage::Confirm)),
),
),
Expand All @@ -234,7 +235,7 @@ pub fn delete_action<'a>(warning: Option<&Error>, deleted: bool) -> Element<'a,
.spacing(20)
.align_items(Alignment::Center)
.push(text("Successfully deleted this transaction."))
.push(button::primary(None, "Go back to PSBTs").on_press(Message::Close)),
.push(button::secondary(None, "Go back to PSBTs").on_press(Message::Close)),
)
.align_x(iced::alignment::Horizontal::Center)
.width(Length::Fixed(400.0))
Expand Down Expand Up @@ -379,13 +380,13 @@ pub fn spend_overview_view<'a>(
.push(Space::with_width(Length::Fill))
.push_maybe(if tx.path_ready().is_none() {
Some(
button::primary(None, "Sign")
button::secondary(None, "Sign")
.on_press(Message::Spend(SpendTxMessage::Sign))
.width(Length::Fixed(150.0)),
)
} else {
Some(
button::primary(None, "Broadcast")
button::secondary(None, "Broadcast")
.on_press(Message::Spend(SpendTxMessage::Broadcast))
.width(Length::Fixed(150.0)),
)
Expand Down Expand Up @@ -1127,7 +1128,7 @@ pub fn update_spend_view<'a>(
Row::new()
.push(text("PSBT:").bold().width(Length::Fill))
.push(
button::border(Some(icon::clipboard_icon()), "Copy")
button::secondary(Some(icon::clipboard_icon()), "Copy")
.on_press(Message::Clipboard(psbt)),
)
.align_items(Alignment::Center),
Expand All @@ -1147,12 +1148,12 @@ pub fn update_spend_view<'a>(
)
.push(Row::new().push(Space::with_width(Length::Fill)).push(
if updated.valid && !updated.value.is_empty() && !processing {
button::primary(None, "Update")
button::secondary(None, "Update")
.on_press(Message::ImportSpend(ImportSpendMessage::Confirm))
} else if processing {
button::primary(None, "Processing...")
button::secondary(None, "Processing...")
} else {
button::primary(None, "Update")
button::secondary(None, "Update")
},
)),
),
Expand Down
8 changes: 4 additions & 4 deletions gui/src/app/view/psbts.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ pub fn import_psbt_view<'a>(
)
.push(Row::new().push(Space::with_width(Length::Fill)).push(
if imported.valid && !imported.value.is_empty() && !processing {
button::primary(None, "Import")
button::secondary(None, "Import")
.on_press(Message::ImportSpend(ImportSpendMessage::Confirm))
} else if processing {
button::primary(None, "Processing...")
button::secondary(None, "Processing...")
} else {
button::primary(None, "Import")
button::secondary(None, "Import")
},
)),
))
Expand Down Expand Up @@ -70,7 +70,7 @@ pub fn psbts_view(spend_txs: &[SpendTx]) -> Element<'_, Message> {
.on_press(Message::ImportSpend(ImportSpendMessage::Import)),
)
.push(
button::primary(Some(icon::plus_icon()), "New")
button::secondary(Some(icon::plus_icon()), "New")
.on_press(Message::Menu(Menu::CreateSpendTx)),
),
)
Expand Down
11 changes: 7 additions & 4 deletions gui/src/app/view/receive.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ pub fn receive<'a>(
.align_items(Alignment::Center)
.push(Container::new(h3("Receive")).width(Length::Fill))
.push(
button::primary(Some(icon::plus_icon()), "Generate address")
button::secondary(Some(icon::plus_icon()), "Generate address")
.on_press(Message::Next),
),
)
Expand Down Expand Up @@ -112,12 +112,15 @@ pub fn receive<'a>(
.push(
Row::new()
.push(
button::primary(None, "Verify on hardware device")
.on_press(Message::Select(i)),
button::secondary(
None,
"Verify on hardware device",
)
.on_press(Message::Select(i)),
)
.push(Space::with_width(Length::Fill))
.push(
button::primary(None, "Show QR Code")
button::secondary(None, "Show QR Code")
.on_press(Message::ShowQrCode(i)),
),
)
Expand Down
4 changes: 2 additions & 2 deletions gui/src/app/view/recovery.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,11 @@ pub fn recovery<'a>(
&& !address.value.is_empty()
&& selected_path.is_some()
{
button::primary(None, "Next")
button::secondary(None, "Next")
.on_press(Message::Next)
.width(Length::Fixed(200.0))
} else {
button::primary(None, "Next").width(Length::Fixed(200.0))
button::secondary(None, "Next").width(Length::Fixed(200.0))
},
)
.spacing(20)
Expand Down
18 changes: 9 additions & 9 deletions gui/src/app/view/settings.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ pub fn remote_backend_section<'a>(
None
})
.push(Space::with_width(Length::Fill))
.push(button::primary(None, "Send invitation").on_press_maybe(
.push(button::secondary(None, "Send invitation").on_press_maybe(
if !processing && email_form.valid {
Some(Message::Settings(
SettingsMessage::RemoteBackendSettings(
Expand Down Expand Up @@ -413,7 +413,7 @@ pub fn bitcoind_edit<'a>(
);

let mut cancel_button = button::transparent(None, " Cancel ").padding(5);
let mut confirm_button = button::primary(None, " Save ").padding(5);
let mut confirm_button = button::secondary(None, " Save ").padding(5);
if !processing {
cancel_button = cancel_button.on_press(SettingsEditMessage::Cancel);
confirm_button = confirm_button.on_press(SettingsEditMessage::Confirm);
Expand Down Expand Up @@ -599,7 +599,7 @@ pub fn electrum_edit<'a>(
);

let mut cancel_button = button::transparent(None, " Cancel ").padding(5);
let mut confirm_button = button::primary(None, " Save ").padding(5);
let mut confirm_button = button::secondary(None, " Save ").padding(5);
if !processing {
cancel_button = cancel_button.on_press(SettingsEditMessage::Cancel);
confirm_button = confirm_button.on_press(SettingsEditMessage::Confirm);
Expand Down Expand Up @@ -843,18 +843,18 @@ pub fn rescan<'a>(
&& is_ok_and(&u32::from_str(&day.value), |&v| v > 0 && v <= 31))
{
Row::new().push(Column::new().width(Length::Fill)).push(
button::primary(None, "Start rescan")
button::secondary(None, "Start rescan")
.on_press(SettingsEditMessage::Confirm)
.width(Length::Shrink),
)
} else if processing {
Row::new().push(Column::new().width(Length::Fill)).push(
button::primary(None, "Starting rescan...")
button::secondary(None, "Starting rescan...")
.width(Length::Shrink),
)
} else {
Row::new().push(Column::new().width(Length::Fill)).push(
button::primary(None, "Start rescan").width(Length::Shrink),
button::secondary(None, "Start rescan").width(Length::Shrink),
)
},
),
Expand Down Expand Up @@ -929,7 +929,7 @@ pub fn wallet_settings<'a>(
.on_press(Message::Clipboard(descriptor.to_string())),
)
.push(
button::primary(
button::secondary(
Some(icon::chip_icon()),
"Register on hardware device",
)
Expand Down Expand Up @@ -988,10 +988,10 @@ pub fn wallet_settings<'a>(
None
})
.push(if !processing {
button::primary(None, "Update")
button::secondary(None, "Update")
.on_press(Message::Settings(SettingsMessage::Save))
} else {
button::primary(None, "Updating")
button::secondary(None, "Updating")
}),
)
.spacing(10),
Expand Down
6 changes: 3 additions & 3 deletions gui/src/app/view/spend/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ pub fn create_spend_tx<'a>(
.align_items(Alignment::Center)
.push(Space::with_width(Length::Fill))
.push(
button::primary(None, "Clear")
button::secondary(None, "Clear")
.on_press(Message::CreateSpend(CreateSpendMessage::Clear))
.width(Length::Fixed(100.0)),
)
Expand All @@ -299,11 +299,11 @@ pub fn create_spend_tx<'a>(
&& !duplicate
&& (is_self_send || Some(&Amount::from_sat(0)) == amount_left)
{
button::primary(None, "Next")
button::secondary(None, "Next")
.on_press(Message::CreateSpend(CreateSpendMessage::Generate))
.width(Length::Fixed(100.0))
} else {
button::primary(None, "Next").width(Length::Fixed(100.0))
button::secondary(None, "Next").width(Length::Fixed(100.0))
},
),
)
Expand Down
8 changes: 4 additions & 4 deletions gui/src/app/view/transactions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ pub fn create_rbf_modal<'a>(
replacement_txid: Option<Txid>,
warning: Option<&'a Error>,
) -> Element<'a, Message> {
let mut confirm_button = button::primary(None, "Confirm").width(Length::Fixed(200.0));
let mut confirm_button = button::secondary(None, "Confirm").width(Length::Fixed(200.0));
if feerate.valid || is_cancel {
confirm_button =
confirm_button.on_press(Message::CreateRbf(super::CreateRbfMessage::Confirm));
Expand Down Expand Up @@ -280,7 +280,7 @@ pub fn create_rbf_modal<'a>(
}))
.push_maybe(replacement_txid.map(|id| {
Row::new().push(
button::primary(None, "Go to replacement")
button::secondary(None, "Go to replacement")
.width(Length::Fixed(200.0))
.on_press(Message::Menu(Menu::PsbtPreSelected(id))),
)
Expand Down Expand Up @@ -360,13 +360,13 @@ pub fn tx_view<'a>(
Some(
Row::new()
.push(
button::primary(None, "Bump fee")
button::secondary(None, "Bump fee")
.width(Length::Fixed(200.0))
.on_press(Message::CreateRbf(super::CreateRbfMessage::New(false))),
)
.push(
tooltip::Tooltip::new(
button::primary(None, "Cancel transaction")
button::secondary(None, "Cancel transaction")
.width(Length::Fixed(200.0))
.on_press(Message::CreateRbf(super::CreateRbfMessage::New(true))),
"Best effort attempt at double spending an unconfirmed outgoing transaction",
Expand Down
Loading
Loading