arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-04-05 18:06:07 +00:00
Code Issues Releases Wiki Activity

refactor(core/rust): add a helper for a swipeup-footer

Browse Source
This commit is contained in:
matejcik 2025-02-21 12:26:53 +01:00 committed by Vít Obrusník
parent 5c7986d9b7
commit f04b022662
16 changed files with 64 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/embed/rust/src/ui/layout_delizia/component/frame.rs
View File

@ -198,6 +198,14 @@ where
self
}
#[cfg(feature = "translations")]
pub fn with_swipeup_footer(self, description: Option<TString<'static>>) -> Self {
use crate::translations::TR;
self.with_footer(TR::instructions__swipe_up.into(), description)
.with_swipe(Direction::Up, SwipeSettings::default())
}
#[inline(never)]
pub fn with_footer_counter(mut self, instruction: TString<'static>) -> Self {
self.footer = Some(Footer::with_page_counter(instruction));

8
core/embed/rust/src/ui/layout_delizia/flow/confirm_action.rs
View File

@ -274,12 +274,8 @@ fn new_confirm_action_uni<T: Component + PaginateFull + MaybeTrace + 'static>(
let mut content = Frame::left_aligned(strings.title, content)
.with_margin(frame_margin)
.with_swipe(Direction::Up, SwipeSettings::default())
.with_vertical_pages()
.with_footer(
TR::instructions__swipe_up.into(),
strings.footer_description,
);
.with_swipeup_footer(strings.footer_description)
.with_vertical_pages();
match extra {
ConfirmActionExtra::Menu { .. } => {

6
core/embed/rust/src/ui/layout_delizia/flow/confirm_fido.rs
View File

@ -118,8 +118,7 @@ pub fn new_confirm_fido(
))),
)
.with_menu_button()
.with_footer(TR::instructions__swipe_up.into(), None)
.with_swipe(Direction::Up, SwipeSettings::default())
.with_swipeup_footer(None)
.with_swipe(Direction::Right, SwipeSettings::immediate())
.map_to_button_msg();
@ -163,8 +162,7 @@ pub fn new_confirm_fido(
TR::fido__title_credential_details.into(),
SwipeContent::new(FidoCredential::new(icon_name, app_name, get_account)),
)
.with_footer(TR::instructions__swipe_up.into(), Some(title))
.with_swipe(Direction::Up, SwipeSettings::default())
.with_swipeup_footer(Some(title))
.with_swipe(Direction::Right, SwipeSettings::immediate());
let content_details = if single_cred() {
content_details.with_menu_button()

3
core/embed/rust/src/ui/layout_delizia/flow/confirm_firmware_update.rs
View File

@ -70,8 +70,7 @@ pub fn new_confirm_firmware_update(
SwipeContent::new(paragraphs),
)
.with_menu_button()
.with_footer(TR::instructions__swipe_up.into(), None)
.with_swipe(Direction::Up, SwipeSettings::default())
.with_swipeup_footer(None)
.with_swipe(Direction::Left, SwipeSettings::default())
.map_to_button_msg();

6
core/embed/rust/src/ui/layout_delizia/flow/confirm_homescreen.rs
View File

@ -61,11 +61,7 @@ pub fn new_confirm_homescreen(
) -> Result<SwipeFlow, error::Error> {
let content_homescreen = Frame::left_aligned(title, SwipeContent::new(image))
.with_menu_button()
.with_footer(
TR::instructions__swipe_up.into(),
Some(TR::buttons__change.into()),
)
.with_swipe(Direction::Up, SwipeSettings::default())
.with_swipeup_footer(Some(TR::buttons__change.into()))
.map_to_button_msg()
// Homescreen + Tap to confirm
.with_pages(|_| 2);

3
core/embed/rust/src/ui/layout_delizia/flow/confirm_reset.rs
View File

@ -113,8 +113,7 @@ pub fn new_confirm_reset(recovery: bool) -> Result<SwipeFlow, error::Error> {
.into_paragraphs();
let content_intro = Frame::left_aligned(title, SwipeContent::new(paragraphs))
.with_menu_button()
.with_footer(TR::instructions__swipe_up.into(), None)
.with_swipe(Direction::Up, SwipeSettings::default())
.with_swipeup_footer(None)
.with_swipe(Direction::Left, SwipeSettings::default())
.map_to_button_msg()
.one_button_request(br);

9
core/embed/rust/src/ui/layout_delizia/flow/confirm_set_new_pin.rs
View File

@ -68,8 +68,7 @@ pub fn new_set_new_pin(
let paragraphs = Paragraphs::new(Paragraph::new(&theme::TEXT_MAIN_GREY_LIGHT, description));
let content_intro = Frame::left_aligned(title, SwipeContent::new(paragraphs))
.with_menu_button()
.with_footer(TR::instructions__swipe_up.into(), None)
.with_swipe(Direction::Up, SwipeSettings::default())
.with_swipeup_footer(None)
.with_swipe(Direction::Left, SwipeSettings::default())
.map_to_button_msg();
@ -91,11 +90,7 @@ pub fn new_set_new_pin(
SwipeContent::new(paragraphs_cancel_intro),
)
.with_cancel_button()
.with_footer(
TR::instructions__swipe_up.into(),
Some(TR::pin__cancel_description.into()),
)
.with_swipe(Direction::Up, SwipeSettings::default())
.with_swipeup_footer(Some(TR::pin__cancel_description.into()))
.with_swipe(Direction::Right, SwipeSettings::immediate())
.map_to_button_msg();

21
core/embed/rust/src/ui/layout_delizia/flow/continue_recovery_homepage.rs
View File

@ -170,30 +170,25 @@ pub fn new_continue_recovery_homepage(
};
let mut pars_main = ParagraphVecShort::new();
let footer_instruction;
let footer_description;
if show_instructions {
let footer_description = if show_instructions {
pars_main.add(Paragraph::new(
&theme::TEXT_MAIN_GREY_EXTRA_LIGHT,
TR::recovery__enter_each_word,
));
footer_instruction = TR::instructions__swipe_up.into();
footer_description = None;
None
} else {
pars_main.add(Paragraph::new(&theme::TEXT_MAIN_GREY_EXTRA_LIGHT, text));
if let Some(sub) = subtext {
pars_main.add(Paragraph::new(&theme::TEXT_SUB_GREY, sub));
}
footer_instruction = TR::instructions__swipe_up.into();
footer_description = Some(TR::instructions__enter_next_share.into());
}
Some(TR::instructions__enter_next_share.into())
};
let content_main =
Frame::left_aligned(title.into(), SwipeContent::new(pars_main.into_paragraphs()))
.with_subtitle(TR::words__instructions.into())
.with_menu_button()
.with_footer(footer_instruction, footer_description)
.with_swipe(Direction::Up, SwipeSettings::default())
.with_swipeup_footer(footer_description)
.with_swipe(Direction::Left, SwipeSettings::default())
.map_to_button_msg()
.repeated_button_request(ButtonRequest::new(
@ -210,11 +205,7 @@ pub fn new_continue_recovery_homepage(
let content_cancel_intro =
Frame::left_aligned(cancel_title.into(), SwipeContent::new(paragraphs_cancel))
.with_cancel_button()
.with_footer(
TR::instructions__swipe_up.into(),
Some(TR::words__continue_anyway_question.into()),
)
.with_swipe(Direction::Up, SwipeSettings::default())
.with_swipeup_footer(Some(TR::words__continue_anyway_question.into()))
.with_swipe(Direction::Right, SwipeSettings::immediate())
.map_to_button_msg()
.repeated_button_request(ButtonRequest::new(

6
core/embed/rust/src/ui/layout_delizia/flow/get_address.rs
View File

@ -115,8 +115,7 @@ pub fn new_get_address(
let content_address =
Frame::left_aligned(title, SwipeContent::new(SwipePage::vertical(paragraphs)))
.with_menu_button()
.with_footer(TR::instructions__swipe_up.into(), None)
.with_swipe(Direction::Up, SwipeSettings::default())
.with_swipeup_footer(None)
.with_swipe(Direction::Left, SwipeSettings::default())
.with_vertical_pages()
.map_to_button_msg()
@ -183,8 +182,7 @@ pub fn new_get_address(
))),
)
.with_cancel_button()
.with_footer(TR::instructions__swipe_up.into(), None)
.with_swipe(Direction::Up, SwipeSettings::default())
.with_swipeup_footer(None)
.with_swipe(Direction::Right, SwipeSettings::immediate())
.map_to_button_msg();

8
core/embed/rust/src/ui/layout_delizia/flow/prompt_backup.rs
View File

@ -67,8 +67,7 @@ pub fn new_prompt_backup() -> Result<SwipeFlow, error::Error> {
let paragraphs = Paragraphs::new(Paragraph::new(&theme::TEXT_MAIN_GREY_LIGHT, text_intro));
let content_intro = Frame::left_aligned(title, SwipeContent::new(paragraphs))
.with_menu_button()
.with_footer(TR::instructions__swipe_up.into(), None)
.with_swipe(Direction::Up, SwipeSettings::default())
.with_swipeup_footer(None)
.with_swipe(Direction::Left, SwipeSettings::default())
.map_to_button_msg();
@ -93,10 +92,7 @@ pub fn new_prompt_backup() -> Result<SwipeFlow, error::Error> {
SwipeContent::new(paragraphs_skip_intro),
)
.with_cancel_button()
.with_footer(
TR::instructions__swipe_up.into(),
Some(TR::words__continue_anyway_question.into()),
)
.with_swipeup_footer(Some(TR::words__continue_anyway_question.into()))
.with_swipe(Direction::Up, SwipeSettings::default())
.with_swipe(Direction::Right, SwipeSettings::immediate())
.map_to_button_msg();

3
core/embed/rust/src/ui/layout_delizia/flow/request_number.rs
View File

@ -78,8 +78,7 @@ pub fn new_request_number(
let number_input_dialog = NumberInputDialog::new(min_count, max_count, count, description)?;
let content_number_input = Frame::left_aligned(title, SwipeContent::new(number_input_dialog))
.with_menu_button()
.with_footer(TR::instructions__swipe_up.into(), None)
.with_swipe(Direction::Up, SwipeSettings::default())
.with_swipeup_footer(None)
.with_swipe(Direction::Left, SwipeSettings::default())
.map(|msg| match msg {
NumberInputDialogMsg::Changed(n) => {

3
core/embed/rust/src/ui/layout_delizia/flow/set_brightness.rs
View File

@ -115,8 +115,7 @@ pub fn new_set_brightness(brightness: Option<u8>) -> Result<SwipeFlow, Error> {
))
.with_no_attach_anim(),
)
.with_footer(TR::instructions__swipe_up.into(), None)
.with_swipe(Direction::Up, SwipeSettings::default())
.with_swipeup_footer(None)
.with_result_icon(theme::ICON_BULLET_CHECKMARK, theme::GREEN_LIGHT)
.map(move |_msg| Some(FlowMsg::Confirmed));

3
core/embed/rust/src/ui/layout_delizia/flow/show_danger.rs
View File

@ -75,9 +75,8 @@ pub fn new_show_danger(
.into_paragraphs();
let content_message = Frame::left_aligned(title, SwipeContent::new(paragraphs))
.with_menu_button()
.with_footer(TR::instructions__swipe_up.into(), Some(verb_cancel))
.with_swipeup_footer(Some(verb_cancel))
.with_danger()
.with_swipe(Direction::Up, SwipeSettings::default())
.with_swipe(Direction::Left, SwipeSettings::default())
.map_to_button_msg();
// .one_button_request(ButtonRequestCode::Warning, br_name);

6
core/embed/rust/src/ui/layout_delizia/flow/show_share_words.rs
View File

@ -96,8 +96,7 @@ pub fn new_show_share_words(
),
)
.with_subtitle(TR::words__instructions.into())
.with_footer(TR::instructions__swipe_up.into(), text_footer)
.with_swipe(Direction::Up, SwipeSettings::default())
.with_swipeup_footer(text_footer)
.map_to_button_msg()
.one_button_request(ButtonRequestCode::ResetDevice.with_name("share_words"))
.with_pages(move |_| nwords + 2);
@ -130,8 +129,7 @@ pub fn new_show_share_words(
TR::reset__check_backup_instructions,
))),
)
.with_footer(TR::instructions__swipe_up.into(), None)
.with_swipe(Direction::Up, SwipeSettings::default())
.with_swipeup_footer(None)
.map(|_| Some(FlowMsg::Confirmed));
let res = SwipeFlow::new(&ShowShareWords::Instruction)?

16
core/embed/rust/src/ui/layout_delizia/flow/util.rs
View File

@ -173,6 +173,14 @@ impl ConfirmValue {
self
}
pub const fn with_swipeup_footer(self, description: Option<TString<'static>>) -> Self {
self.with_footer(
TString::from_translation(TR::instructions__swipe_up),
description,
)
.with_swipe_up()
}
pub const fn with_chunkify(mut self, chunkify: bool) -> Self {
self.chunkify = chunkify;
self
@ -375,6 +383,14 @@ impl ShowInfoParams {
self
}
pub const fn with_swipeup_footer(self, description: Option<TString<'static>>) -> Self {
self.with_footer(
TString::from_translation(TR::instructions__swipe_up),
description,
)
.with_swipe_up()
}
pub const fn with_swipe_up(mut self) -> Self {
self.swipe_up = true;
self

47
core/embed/rust/src/ui/layout_delizia/ui_firmware.rs
View File

@ -336,8 +336,7 @@ impl FirmwareUI for UIDelizia {
let layout = RootComponent::new(SwipeUpScreen::new(
Frame::left_aligned(TR::modify_amount__title.into(), paragraphs)
.with_cancel_button()
.with_footer(TR::instructions__swipe_up.into(), None)
.with_swipe(Direction::Up, SwipeSettings::default()),
.with_swipeup_footer(None),
));
Ok(layout)
}
@ -372,8 +371,7 @@ impl FirmwareUI for UIDelizia {
) -> Result<impl LayoutMaybeTrace, Error> {
let mut summary_params = ShowInfoParams::new(title.unwrap_or(TString::empty()))
.with_menu_button()
.with_footer(TR::instructions__swipe_up.into(), None)
.with_swipe_up();
.with_swipeup_footer(None);
summary_params = unwrap!(summary_params.add(amount_label, amount));
summary_params = unwrap!(summary_params.add(fee_label, fee));
@ -532,18 +530,16 @@ impl FirmwareUI for UIDelizia {
ConfirmValue::new(title.unwrap_or(TString::empty()), message, description)
.with_subtitle(subtitle)
.with_menu_button()
.with_footer(TR::instructions__swipe_up.into(), None)
.with_swipeup_footer(None)
.with_chunkify(chunkify)
.with_text_mono(text_mono)
.with_swipe_up();
.with_text_mono(text_mono);
let confirm_amount = amount.map(|amount| {
ConfirmValue::new(TR::words__amount.into(), amount, None)
.with_subtitle(subtitle)
.with_menu_button()
.with_footer(TR::instructions__swipe_up.into(), None)
.with_swipeup_footer(None)
.with_text_mono(text_mono)
.with_swipe_up()
.with_swipe_down()
});
@ -576,8 +572,7 @@ impl FirmwareUI for UIDelizia {
let mut summary =
ShowInfoParams::new(summary_title.unwrap_or(TR::words__title_summary.into()))
.with_menu_button()
.with_footer(TR::instructions__swipe_up.into(), None)
.with_swipe_up()
.with_swipeup_footer(None)
.with_swipe_down();
for pair in IterBuf::new().try_iterate(summary_items.unwrap())? {
let [label, value]: [TString; 2] = util::iter_into_array(pair)?;
@ -820,8 +815,7 @@ impl FirmwareUI for UIDelizia {
let layout = RootComponent::new(SwipeUpScreen::new(
Frame::left_aligned(title, SwipeContent::new(checklist_content))
.with_footer(TR::instructions__swipe_up.into(), None)
.with_swipe(Direction::Up, SwipeSettings::default()),
.with_swipeup_footer(None),
));
Ok(layout)
}
@ -848,13 +842,11 @@ impl FirmwareUI for UIDelizia {
Frame::left_aligned(title, SwipeContent::new(content))
.with_cancel_button()
.with_danger()
.with_footer(TR::instructions__swipe_up.into(), None)
.with_swipe(Direction::Up, SwipeSettings::default())
.with_swipeup_footer(None)
} else {
Frame::left_aligned(title, SwipeContent::new(content))
.with_danger()
.with_footer(TR::instructions__swipe_up.into(), None)
.with_swipe(Direction::Up, SwipeSettings::default())
.with_swipeup_footer(None)
};
let obj = LayoutObj::new(SwipeUpScreen::new(frame))?;
@ -874,9 +866,7 @@ impl FirmwareUI for UIDelizia {
.with_placement(geometry::LinearPlacement::vertical().align_at_center());
let layout = RootComponent::new(SwipeUpScreen::new(
Frame::left_aligned("".into(), SwipeContent::new(paragraphs))
.with_footer(TR::instructions__swipe_up.into(), None)
.with_swipe(Direction::Up, SwipeSettings::default()),
Frame::left_aligned("".into(), SwipeContent::new(paragraphs)).with_swipeup_footer(None),
));
Ok(layout)
}
@ -900,9 +890,7 @@ impl FirmwareUI for UIDelizia {
) -> Result<Gc<LayoutObj>, Error> {
let content = Paragraphs::new(Paragraph::new(&theme::TEXT_MAIN_GREY_LIGHT, description));
let obj = LayoutObj::new(SwipeUpScreen::new(
Frame::left_aligned(title, SwipeContent::new(content))
.with_footer(TR::instructions__swipe_up.into(), None)
.with_swipe(Direction::Up, SwipeSettings::default()),
Frame::left_aligned(title, SwipeContent::new(content)).with_swipeup_footer(None),
))?;
Ok(obj)
}
@ -960,8 +948,7 @@ impl FirmwareUI for UIDelizia {
let layout = RootComponent::new(SwipeUpScreen::new(
Frame::left_aligned(title, SwipeContent::new(paragraphs))
.with_cancel_button()
.with_footer(TR::instructions__swipe_up.into(), Some(button))
.with_swipe(Direction::Up, SwipeSettings::default()),
.with_swipeup_footer(Some(button)),
));
Ok(layout)
@ -1071,9 +1058,8 @@ impl FirmwareUI for UIDelizia {
TR::words__title_success.into(),
SwipeContent::new(content).with_no_attach_anim(),
)
.with_footer(TR::instructions__swipe_up.into(), description)
.with_result_icon(theme::ICON_BULLET_CHECKMARK, theme::GREEN_LIGHT)
.with_swipe(Direction::Up, SwipeSettings::default()),
.with_swipeup_footer(description)
.with_result_icon(theme::ICON_BULLET_CHECKMARK, theme::GREEN_LIGHT),
))?;
Ok(layout)
}
@ -1107,9 +1093,8 @@ impl FirmwareUI for UIDelizia {
])
.into_paragraphs();
let frame = Frame::left_aligned(title, SwipeContent::new(content))
.with_footer(TR::instructions__swipe_up.into(), action)
.with_swipe(Direction::Up, SwipeSettings::default());
let frame =
Frame::left_aligned(title, SwipeContent::new(content)).with_swipeup_footer(action);
let frame_with_icon = if danger {
frame.with_danger_icon()