From f04b022662226495569e935697a766be670e8c3a Mon Sep 17 00:00:00 2001 From: matejcik Date: Fri, 21 Feb 2025 12:26:53 +0100 Subject: [PATCH] refactor(core/rust): add a helper for a swipeup-footer --- .../src/ui/layout_delizia/component/frame.rs | 8 ++++ .../ui/layout_delizia/flow/confirm_action.rs | 8 +--- .../ui/layout_delizia/flow/confirm_fido.rs | 6 +-- .../flow/confirm_firmware_update.rs | 3 +- .../layout_delizia/flow/confirm_homescreen.rs | 6 +-- .../ui/layout_delizia/flow/confirm_reset.rs | 3 +- .../flow/confirm_set_new_pin.rs | 9 +--- .../flow/continue_recovery_homepage.rs | 21 +++------ .../src/ui/layout_delizia/flow/get_address.rs | 6 +-- .../ui/layout_delizia/flow/prompt_backup.rs | 8 +--- .../ui/layout_delizia/flow/request_number.rs | 3 +- .../ui/layout_delizia/flow/set_brightness.rs | 3 +- .../src/ui/layout_delizia/flow/show_danger.rs | 3 +- .../layout_delizia/flow/show_share_words.rs | 6 +-- .../rust/src/ui/layout_delizia/flow/util.rs | 16 +++++++ .../rust/src/ui/layout_delizia/ui_firmware.rs | 47 +++++++------------ 16 files changed, 64 insertions(+), 92 deletions(-) diff --git a/core/embed/rust/src/ui/layout_delizia/component/frame.rs b/core/embed/rust/src/ui/layout_delizia/component/frame.rs index 4c63f0947a..1715379652 100644 --- a/core/embed/rust/src/ui/layout_delizia/component/frame.rs +++ b/core/embed/rust/src/ui/layout_delizia/component/frame.rs @@ -198,6 +198,14 @@ where self } + #[cfg(feature = "translations")] + pub fn with_swipeup_footer(self, description: Option>) -> 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)); diff --git a/core/embed/rust/src/ui/layout_delizia/flow/confirm_action.rs b/core/embed/rust/src/ui/layout_delizia/flow/confirm_action.rs index 1a520c08bb..937d803c58 100644 --- a/core/embed/rust/src/ui/layout_delizia/flow/confirm_action.rs +++ b/core/embed/rust/src/ui/layout_delizia/flow/confirm_action.rs @@ -274,12 +274,8 @@ fn new_confirm_action_uni( 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 { .. } => { diff --git a/core/embed/rust/src/ui/layout_delizia/flow/confirm_fido.rs b/core/embed/rust/src/ui/layout_delizia/flow/confirm_fido.rs index 000569fdca..f430deb5ff 100644 --- a/core/embed/rust/src/ui/layout_delizia/flow/confirm_fido.rs +++ b/core/embed/rust/src/ui/layout_delizia/flow/confirm_fido.rs @@ -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() diff --git a/core/embed/rust/src/ui/layout_delizia/flow/confirm_firmware_update.rs b/core/embed/rust/src/ui/layout_delizia/flow/confirm_firmware_update.rs index ce1cb0c1dc..35fe29711d 100644 --- a/core/embed/rust/src/ui/layout_delizia/flow/confirm_firmware_update.rs +++ b/core/embed/rust/src/ui/layout_delizia/flow/confirm_firmware_update.rs @@ -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(); diff --git a/core/embed/rust/src/ui/layout_delizia/flow/confirm_homescreen.rs b/core/embed/rust/src/ui/layout_delizia/flow/confirm_homescreen.rs index fb885242d3..2313d152b9 100644 --- a/core/embed/rust/src/ui/layout_delizia/flow/confirm_homescreen.rs +++ b/core/embed/rust/src/ui/layout_delizia/flow/confirm_homescreen.rs @@ -61,11 +61,7 @@ pub fn new_confirm_homescreen( ) -> Result { 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); diff --git a/core/embed/rust/src/ui/layout_delizia/flow/confirm_reset.rs b/core/embed/rust/src/ui/layout_delizia/flow/confirm_reset.rs index dc8c2ce7e0..405a623217 100644 --- a/core/embed/rust/src/ui/layout_delizia/flow/confirm_reset.rs +++ b/core/embed/rust/src/ui/layout_delizia/flow/confirm_reset.rs @@ -113,8 +113,7 @@ pub fn new_confirm_reset(recovery: bool) -> Result { .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); diff --git a/core/embed/rust/src/ui/layout_delizia/flow/confirm_set_new_pin.rs b/core/embed/rust/src/ui/layout_delizia/flow/confirm_set_new_pin.rs index 548df32301..9cbb2b1c33 100644 --- a/core/embed/rust/src/ui/layout_delizia/flow/confirm_set_new_pin.rs +++ b/core/embed/rust/src/ui/layout_delizia/flow/confirm_set_new_pin.rs @@ -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(); diff --git a/core/embed/rust/src/ui/layout_delizia/flow/continue_recovery_homepage.rs b/core/embed/rust/src/ui/layout_delizia/flow/continue_recovery_homepage.rs index 392b7416a5..4296c124b8 100644 --- a/core/embed/rust/src/ui/layout_delizia/flow/continue_recovery_homepage.rs +++ b/core/embed/rust/src/ui/layout_delizia/flow/continue_recovery_homepage.rs @@ -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( diff --git a/core/embed/rust/src/ui/layout_delizia/flow/get_address.rs b/core/embed/rust/src/ui/layout_delizia/flow/get_address.rs index 5fff53d710..b7fa83edd7 100644 --- a/core/embed/rust/src/ui/layout_delizia/flow/get_address.rs +++ b/core/embed/rust/src/ui/layout_delizia/flow/get_address.rs @@ -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(); diff --git a/core/embed/rust/src/ui/layout_delizia/flow/prompt_backup.rs b/core/embed/rust/src/ui/layout_delizia/flow/prompt_backup.rs index d618e242bc..d0f63240af 100644 --- a/core/embed/rust/src/ui/layout_delizia/flow/prompt_backup.rs +++ b/core/embed/rust/src/ui/layout_delizia/flow/prompt_backup.rs @@ -67,8 +67,7 @@ pub fn new_prompt_backup() -> Result { 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 { 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(); diff --git a/core/embed/rust/src/ui/layout_delizia/flow/request_number.rs b/core/embed/rust/src/ui/layout_delizia/flow/request_number.rs index 7a7496c8c9..2bacdec766 100644 --- a/core/embed/rust/src/ui/layout_delizia/flow/request_number.rs +++ b/core/embed/rust/src/ui/layout_delizia/flow/request_number.rs @@ -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) => { diff --git a/core/embed/rust/src/ui/layout_delizia/flow/set_brightness.rs b/core/embed/rust/src/ui/layout_delizia/flow/set_brightness.rs index 3ed9b02058..d25aea4ea6 100644 --- a/core/embed/rust/src/ui/layout_delizia/flow/set_brightness.rs +++ b/core/embed/rust/src/ui/layout_delizia/flow/set_brightness.rs @@ -115,8 +115,7 @@ pub fn new_set_brightness(brightness: Option) -> Result { )) .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)); diff --git a/core/embed/rust/src/ui/layout_delizia/flow/show_danger.rs b/core/embed/rust/src/ui/layout_delizia/flow/show_danger.rs index 12b171e1d5..aa59b4971e 100644 --- a/core/embed/rust/src/ui/layout_delizia/flow/show_danger.rs +++ b/core/embed/rust/src/ui/layout_delizia/flow/show_danger.rs @@ -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); diff --git a/core/embed/rust/src/ui/layout_delizia/flow/show_share_words.rs b/core/embed/rust/src/ui/layout_delizia/flow/show_share_words.rs index f08f55241a..11ef39be3f 100644 --- a/core/embed/rust/src/ui/layout_delizia/flow/show_share_words.rs +++ b/core/embed/rust/src/ui/layout_delizia/flow/show_share_words.rs @@ -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)? diff --git a/core/embed/rust/src/ui/layout_delizia/flow/util.rs b/core/embed/rust/src/ui/layout_delizia/flow/util.rs index 2d3e4cf03c..a5a5c9653e 100644 --- a/core/embed/rust/src/ui/layout_delizia/flow/util.rs +++ b/core/embed/rust/src/ui/layout_delizia/flow/util.rs @@ -173,6 +173,14 @@ impl ConfirmValue { self } + pub const fn with_swipeup_footer(self, description: Option>) -> 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>) -> 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 diff --git a/core/embed/rust/src/ui/layout_delizia/ui_firmware.rs b/core/embed/rust/src/ui/layout_delizia/ui_firmware.rs index d06bd72b36..19b90f26a7 100644 --- a/core/embed/rust/src/ui/layout_delizia/ui_firmware.rs +++ b/core/embed/rust/src/ui/layout_delizia/ui_firmware.rs @@ -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 { 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, 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()