arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-08-02 11:58:32 +00:00
Code Issues Releases Wiki Activity

refactor(core/eckhart): unify spacing constants

Browse Source 
[no changelog]
This commit is contained in:
Lukas Bielesch 2025-07-23 13:35:58 +02:00 committed by Lukáš Bielesch
parent 1711a563e6
commit 4caee20d78
8 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/embed/rust/src/ui/layout_eckhart/firmware/fido.rs
View File

@ -28,7 +28,6 @@ pub struct FidoCredential<F: FidoAccountName> {
impl<F: FidoAccountName> FidoCredential<F> { impl<F: FidoAccountName> FidoCredential<F> {
const ICON_SIZE: i16 = 32; const ICON_SIZE: i16 = 32;
const SPACING: i16 = 24;
pub fn new( pub fn new(
icon_name: Option<TString<'static>>, icon_name: Option<TString<'static>>,
@ -45,7 +44,7 @@ impl<F: FidoAccountName> FidoCredential<F> {
]) ])
.into_paragraphs() .into_paragraphs()
.with_placement(LinearPlacement::vertical()) .with_placement(LinearPlacement::vertical())
.with_spacing(Self::SPACING); .with_spacing(theme::TEXT_VERTICAL_SPACING);
Self { Self {
app_icon, app_icon,
text, text,
@ -60,7 +59,8 @@ impl<F: FidoAccountName> Component for FidoCredential<F> {
fn place(&mut self, bounds: Rect) -> Rect { fn place(&mut self, bounds: Rect) -> Rect {
let text_area = if let Some(app_icon) = &mut self.app_icon { let text_area = if let Some(app_icon) = &mut self.app_icon {
let icon_size = app_icon.toif.size(); let icon_size = app_icon.toif.size();
let (icon_area, text_area) = bounds.split_top(icon_size.y + Self::SPACING); let (icon_area, text_area) =
bounds.split_top(icon_size.y + theme::TEXT_VERTICAL_SPACING);
app_icon.place(icon_area.with_width(icon_size.x).with_height(icon_size.y)); app_icon.place(icon_area.with_width(icon_size.x).with_height(icon_size.y));
text_area text_area
} else { } else {

6
core/embed/rust/src/ui/layout_eckhart/flow/confirm_output.rs
View File

@ -263,7 +263,7 @@ fn content_menu_info(
paragraphs paragraphs
.map_or_else(ParagraphVecShort::new, |p| p) .map_or_else(ParagraphVecShort::new, |p| p)
.into_paragraphs() .into_paragraphs()
.with_placement(LinearPlacement::vertical().with_spacing(theme::PARAGRAPHS_SPACING)), .with_placement(LinearPlacement::vertical().with_spacing(theme::PROP_INNER_SPACING)),
) )
.with_header(Header::new(title).with_close_button()) .with_header(Header::new(title).with_close_button())
.with_subtitle(subtitle.unwrap_or(TString::empty())) .with_subtitle(subtitle.unwrap_or(TString::empty()))
@ -303,7 +303,7 @@ pub fn new_confirm_output(
let content_main = TextScreen::new( let content_main = TextScreen::new(
main_paragraphs main_paragraphs
.into_paragraphs() .into_paragraphs()
.with_placement(LinearPlacement::vertical().with_spacing(theme::PARAGRAPHS_SPACING)), .with_placement(LinearPlacement::vertical().with_spacing(theme::PROP_INNER_SPACING)),
) )
.with_header(Header::new(title.unwrap_or(TString::empty())).with_menu_button()) .with_header(Header::new(title.unwrap_or(TString::empty())).with_menu_button())
.with_action_bar(ActionBar::new_single(Button::with_text( .with_action_bar(ActionBar::new_single(Button::with_text(
@ -401,7 +401,7 @@ pub fn new_confirm_output(
// Summary // Summary
let content_summary = let content_summary =
TextScreen::new(summary_paragraphs.into_paragraphs().with_placement( TextScreen::new(summary_paragraphs.into_paragraphs().with_placement(
LinearPlacement::vertical().with_spacing(theme::PARAGRAPHS_SPACING), LinearPlacement::vertical().with_spacing(theme::PROP_INNER_SPACING),
)) ))
.with_header( .with_header(
Header::new(summary_title.unwrap_or(TR::words__title_summary.into())) Header::new(summary_title.unwrap_or(TR::words__title_summary.into()))

4
core/embed/rust/src/ui/layout_eckhart/flow/confirm_summary.rs
View File

@ -81,7 +81,7 @@ fn content_menu_info(
paragraphs paragraphs
.map_or_else(ParagraphVecShort::new, |p| p) .map_or_else(ParagraphVecShort::new, |p| p)
.into_paragraphs() .into_paragraphs()
.with_placement(LinearPlacement::vertical().with_spacing(theme::PARAGRAPHS_SPACING)), .with_placement(LinearPlacement::vertical().with_spacing(theme::PROP_INNER_SPACING)),
) )
.with_header(Header::new(title).with_close_button()) .with_header(Header::new(title).with_close_button())
.with_subtitle(subtitle.unwrap_or(TString::empty())) .with_subtitle(subtitle.unwrap_or(TString::empty()))
@ -121,7 +121,7 @@ pub fn new_confirm_summary(
let content_summary = TextScreen::new( let content_summary = TextScreen::new(
summary_paragraphs summary_paragraphs
.into_paragraphs() .into_paragraphs()
.with_placement(LinearPlacement::vertical().with_spacing(theme::PARAGRAPHS_SPACING)), .with_placement(LinearPlacement::vertical().with_spacing(theme::PROP_INNER_SPACING)),
) )
.with_header(Header::new(title).with_menu_button()) .with_header(Header::new(title).with_menu_button())
.with_action_bar(if back_button { .with_action_bar(if back_button {

2
core/embed/rust/src/ui/layout_eckhart/flow/continue_recovery_homepage.rs
View File

@ -192,7 +192,7 @@ pub fn new_continue_recovery_homepage(
pars_main pars_main
.into_paragraphs() .into_paragraphs()
.with_placement(LinearPlacement::vertical()) .with_placement(LinearPlacement::vertical())
.with_spacing(24), .with_spacing(theme::TEXT_VERTICAL_SPACING),
) )
.with_header(header) .with_header(header)
.with_action_bar(ActionBar::new_single(Button::with_text(verb.into()))) .with_action_bar(ActionBar::new_single(Button::with_text(verb.into())))

2
core/embed/rust/src/ui/layout_eckhart/flow/show_danger.rs
View File

@ -71,7 +71,7 @@ pub fn new_show_danger(
Paragraph::new(&theme::TEXT_MONO_EXTRA_LIGHT, value), Paragraph::new(&theme::TEXT_MONO_EXTRA_LIGHT, value),
] ]
.into_paragraphs() .into_paragraphs()
.with_placement(LinearPlacement::vertical().with_spacing(35)); .with_placement(LinearPlacement::vertical().with_spacing(theme::TEXT_VERTICAL_SPACING));
let content_message = TextScreen::new(paragraphs) let content_message = TextScreen::new(paragraphs)
.with_header( .with_header(

2
core/embed/rust/src/ui/layout_eckhart/flow/show_share_words.rs
View File

@ -80,7 +80,7 @@ pub fn new_show_share_words_flow(
instructions_paragraphs instructions_paragraphs
.unwrap_or_default() .unwrap_or_default()
.into_paragraphs() .into_paragraphs()
.with_placement(LinearPlacement::vertical().with_spacing(24)), .with_placement(LinearPlacement::vertical().with_spacing(theme::TEXT_VERTICAL_SPACING)),
) )
.with_header(Header::new(TR::reset__recovery_wallet_backup_title.into())) .with_header(Header::new(TR::reset__recovery_wallet_backup_title.into()))
.with_action_bar(ActionBar::new_single(Button::with_text( .with_action_bar(ActionBar::new_single(Button::with_text(

5
core/embed/rust/src/ui/layout_eckhart/theme/mod.rs
View File

@ -54,9 +54,12 @@ pub const PADDING: i16 = 24; // [px]
pub const HEADER_HEIGHT: i16 = 96; // [px] pub const HEADER_HEIGHT: i16 = 96; // [px]
pub const SIDE_INSETS: Insets = Insets::sides(PADDING); pub const SIDE_INSETS: Insets = Insets::sides(PADDING);
pub const ACTION_BAR_HEIGHT: i16 = 90; // [px] pub const ACTION_BAR_HEIGHT: i16 = 90; // [px]
pub const PARAGRAPHS_SPACING: i16 = 12; // [px]
pub const TEXT_VERTICAL_SPACING: i16 = 24; // [px] pub const TEXT_VERTICAL_SPACING: i16 = 24; // [px]
// props settings
pub const PROP_INNER_SPACING: i16 = 12; // [px]
pub const PROPS_SPACING: i16 = 16; // [px]
// checklist settings // checklist settings
pub const CHECKLIST_CHECK_WIDTH: i16 = 32; // [px] pub const CHECKLIST_CHECK_WIDTH: i16 = 32; // [px]
pub const CHECKLIST_SPACING: i16 = 40; // [px] pub const CHECKLIST_SPACING: i16 = 40; // [px]

10
core/embed/rust/src/ui/layout_eckhart/ui_firmware.rs
View File

@ -251,14 +251,14 @@ impl FirmwareUI for UIEckhart {
paragraphs paragraphs
.add( .add(
Paragraph::new(&theme::TEXT_SMALL_LIGHT, description) Paragraph::new(&theme::TEXT_SMALL_LIGHT, description)
.with_bottom_padding(theme::PARAGRAPHS_SPACING), .with_bottom_padding(theme::PROP_INNER_SPACING),
) )
.add(Paragraph::new(&theme::TEXT_MONO_EXTRA_LIGHT, change).with_bottom_padding(16)); .add(Paragraph::new(&theme::TEXT_MONO_EXTRA_LIGHT, change).with_bottom_padding(16));
} }
paragraphs paragraphs
.add( .add(
Paragraph::new(&theme::TEXT_SMALL_LIGHT, total_label) Paragraph::new(&theme::TEXT_SMALL_LIGHT, total_label)
.with_bottom_padding(theme::PARAGRAPHS_SPACING), .with_bottom_padding(theme::PROP_INNER_SPACING),
) )
.add(Paragraph::new(&theme::TEXT_MONO_EXTRA_LIGHT, total_fee_new)); .add(Paragraph::new(&theme::TEXT_MONO_EXTRA_LIGHT, total_fee_new));
@ -297,7 +297,7 @@ impl FirmwareUI for UIEckhart {
let layout = RootComponent::new( let layout = RootComponent::new(
TextScreen::new(paragraphs.into_paragraphs().with_placement( TextScreen::new(paragraphs.into_paragraphs().with_placement(
LinearPlacement::vertical().with_spacing(theme::PARAGRAPHS_SPACING), LinearPlacement::vertical().with_spacing(theme::PROP_INNER_SPACING),
)) ))
.with_header(Header::new(TR::modify_amount__title.into())) .with_header(Header::new(TR::modify_amount__title.into()))
.with_action_bar(ActionBar::new_cancel_confirm()), .with_action_bar(ActionBar::new_cancel_confirm()),
@ -394,7 +394,7 @@ impl FirmwareUI for UIEckhart {
title, title,
None, None,
paragraphs.into_paragraphs().with_placement( paragraphs.into_paragraphs().with_placement(
LinearPlacement::vertical().with_spacing(theme::PARAGRAPHS_SPACING), LinearPlacement::vertical().with_spacing(theme::PROP_INNER_SPACING),
), ),
None, None,
verb, verb,
@ -1286,7 +1286,7 @@ impl FirmwareUI for UIEckhart {
let screen = let screen =
TextScreen::new(paragraphs.into_paragraphs().with_placement( TextScreen::new(paragraphs.into_paragraphs().with_placement(
LinearPlacement::vertical().with_spacing(theme::PARAGRAPHS_SPACING), LinearPlacement::vertical().with_spacing(theme::PROP_INNER_SPACING),
)) ))
.with_header(Header::new(title).with_close_button()); .with_header(Header::new(title).with_close_button());
let layout = RootComponent::new(screen); let layout = RootComponent::new(screen);