arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-02-12 15:42:40 +00:00
Code Issues Releases Wiki Activity

refactor(core): remove unused fonts

Browse Source 
[no changelog]
This commit is contained in:
obrusvit 2025-02-02 18:05:41 +01:00 committed by Vít Obrusník
parent 991b3662f0
commit 626a56a702
9 changed files with 32 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/embed/rust/src/ui/layout_bolt/fonts/mod.rs
View File

@ -1,22 +1,14 @@
// mod font_roboto_bold_20;
// mod font_roboto_regular_20;
mod font_robotomono_medium_20; mod font_robotomono_medium_20;
mod font_tthoves_bold_17; mod font_tthoves_bold_17;
mod font_tthoves_demibold_21; mod font_tthoves_demibold_21;
mod font_tthoves_regular_21; mod font_tthoves_regular_21;
// use font_roboto_bold_20::Font_Roboto_Bold_20_info;
// use font_roboto_regular_20::Font_Roboto_Regular_20_info;
use font_robotomono_medium_20::Font_RobotoMono_Medium_20_info; use font_robotomono_medium_20::Font_RobotoMono_Medium_20_info;
use font_tthoves_bold_17::Font_TTHoves_Bold_17_upper_info; use font_tthoves_bold_17::Font_TTHoves_Bold_17_upper_info;
use font_tthoves_demibold_21::Font_TTHoves_DemiBold_21_info; use font_tthoves_demibold_21::Font_TTHoves_DemiBold_21_info;
use font_tthoves_regular_21::Font_TTHoves_Regular_21_info; use font_tthoves_regular_21::Font_TTHoves_Regular_21_info;
pub const FONT_NORMAL: crate::ui::display::Font = &Font_TTHoves_Regular_21_info; pub const FONT_NORMAL: crate::ui::display::Font = &Font_TTHoves_Regular_21_info;
// TODO: remove BOLD (points to the same font as BOLD_UPPER)
pub const FONT_BOLD: crate::ui::display::Font = &Font_TTHoves_Bold_17_upper_info;
pub const FONT_BOLD_UPPER: crate::ui::display::Font = &Font_TTHoves_Bold_17_upper_info; pub const FONT_BOLD_UPPER: crate::ui::display::Font = &Font_TTHoves_Bold_17_upper_info;
pub const FONT_DEMIBOLD: crate::ui::display::Font = &Font_TTHoves_DemiBold_21_info; pub const FONT_DEMIBOLD: crate::ui::display::Font = &Font_TTHoves_DemiBold_21_info;
pub const FONT_MONO: crate::ui::display::Font = &Font_RobotoMono_Medium_20_info; pub const FONT_MONO: crate::ui::display::Font = &Font_RobotoMono_Medium_20_info;
// TODO: remove SUB (points to the same font as DEMIBOLD)
pub const FONT_SUB: crate::ui::display::Font = &Font_TTHoves_DemiBold_21_info;

2
core/embed/rust/src/ui/layout_caesar/fonts/mod.rs
View File

@ -21,5 +21,3 @@ pub const FONT_MONO: crate::ui::display::Font = &Font_PixelOperatorMono_Regular_
pub const FONT_BIG: crate::ui::display::Font = &Font_Unifont_Regular_16_info; pub const FONT_BIG: crate::ui::display::Font = &Font_Unifont_Regular_16_info;
pub const FONT_NORMAL_UPPER: crate::ui::display::Font = &Font_PixelOperator_Regular_8_upper_info; pub const FONT_NORMAL_UPPER: crate::ui::display::Font = &Font_PixelOperator_Regular_8_upper_info;
pub const FONT_BOLD_UPPER: crate::ui::display::Font = &Font_PixelOperator_Bold_8_upper_info; pub const FONT_BOLD_UPPER: crate::ui::display::Font = &Font_PixelOperator_Bold_8_upper_info;
// TODO: remove SUB
pub const FONT_SUB: crate::ui::display::Font = &Font_PixelOperator_Regular_8_info;

2
core/embed/rust/src/ui/layout_delizia/component/homescreen.rs
View File

@ -493,7 +493,7 @@ impl Homescreen {
fn render_loader<'s>(&'s self, target: &mut impl Renderer<'s>) { fn render_loader<'s>(&'s self, target: &mut impl Renderer<'s>) {
TR::progress__locking_device.map_translated(|t| { TR::progress__locking_device.map_translated(|t| {
shape::Text::new(TOP_CENTER + Offset::y(HOLD_Y), t, fonts::FONT_NORMAL) shape::Text::new(TOP_CENTER + Offset::y(HOLD_Y), t, fonts::FONT_DEMIBOLD)
.with_align(Alignment::Center) .with_align(Alignment::Center)
.with_fg(theme::FG); .with_fg(theme::FG);
}); });

2
core/embed/rust/src/ui/layout_delizia/component/progress.rs
View File

@ -62,7 +62,7 @@ impl Component for Progress {
.map(|t| t.chars().filter(|c| *c == '\n').count() as i16); .map(|t| t.chars().filter(|c| *c == '\n').count() as i16);
let (title, rest) = Self::AREA.split_top(self.title.max_size().y); let (title, rest) = Self::AREA.split_top(self.title.max_size().y);
let (loader, description) = let (loader, description) =
rest.split_bottom(fonts::FONT_NORMAL.line_height() * description_lines); rest.split_bottom(fonts::FONT_DEMIBOLD.line_height() * description_lines);
let loader = loader.inset(Insets::top(theme::CONTENT_BORDER)); let loader = loader.inset(Insets::top(theme::CONTENT_BORDER));
self.title.place(title); self.title.place(title);
self.loader_y_offset = loader.center().y - constant::screen().center().y; self.loader_y_offset = loader.center().y - constant::screen().center().y;

4
core/embed/rust/src/ui/layout_delizia/component/result.rs
View File

@ -34,11 +34,11 @@ impl ResultStyle {
} }
pub const fn message_style(&self) -> TextStyle { pub const fn message_style(&self) -> TextStyle {
TextStyle::new(fonts::FONT_NORMAL, self.fg_color, self.bg_color, FG, FG) TextStyle::new(fonts::FONT_DEMIBOLD, self.fg_color, self.bg_color, FG, FG)
} }
pub const fn title_style(&self) -> TextStyle { pub const fn title_style(&self) -> TextStyle {
TextStyle::new(fonts::FONT_BOLD, self.fg_color, self.bg_color, FG, FG) TextStyle::new(fonts::FONT_DEMIBOLD, self.fg_color, self.bg_color, FG, FG)
} }
} }

2
core/embed/rust/src/ui/layout_delizia/component/welcome_screen.rs
View File

@ -46,7 +46,7 @@ impl Component for WelcomeScreen {
shape::Text::new( shape::Text::new(
self.area.bottom_center() - Offset::y(TEXT_BOTTOM_MARGIN), self.area.bottom_center() - Offset::y(TEXT_BOTTOM_MARGIN),
model::FULL_NAME, model::FULL_NAME,
fonts::FONT_NORMAL, fonts::FONT_DEMIBOLD,
) )
.with_align(Alignment::Center) .with_align(Alignment::Center)
.with_fg(theme::FG) .with_fg(theme::FG)

4
core/embed/rust/src/ui/layout_delizia/fonts/mod.rs
View File

@ -8,11 +8,7 @@ use font_ttsatoshi_demibold_18::Font_TTSatoshi_DemiBold_18_info;
use font_ttsatoshi_demibold_21::Font_TTSatoshi_DemiBold_21_info; use font_ttsatoshi_demibold_21::Font_TTSatoshi_DemiBold_21_info;
use font_ttsatoshi_demibold_42::Font_TTSatoshi_DemiBold_42_info; use font_ttsatoshi_demibold_42::Font_TTSatoshi_DemiBold_42_info;
pub const FONT_NORMAL: crate::ui::display::Font = &Font_TTSatoshi_DemiBold_21_info;
pub const FONT_BOLD: crate::ui::display::Font = &Font_TTSatoshi_DemiBold_21_info;
pub const FONT_DEMIBOLD: crate::ui::display::Font = &Font_TTSatoshi_DemiBold_21_info; pub const FONT_DEMIBOLD: crate::ui::display::Font = &Font_TTSatoshi_DemiBold_21_info;
pub const FONT_MONO: crate::ui::display::Font = &Font_RobotoMono_Medium_21_info; pub const FONT_MONO: crate::ui::display::Font = &Font_RobotoMono_Medium_21_info;
pub const FONT_BIG: crate::ui::display::Font = &Font_TTSatoshi_DemiBold_42_info; pub const FONT_BIG: crate::ui::display::Font = &Font_TTSatoshi_DemiBold_42_info;
pub const FONT_NORMAL_UPPER: crate::ui::display::Font = &Font_TTSatoshi_DemiBold_21_info;
pub const FONT_BOLD_UPPER: crate::ui::display::Font = &Font_TTSatoshi_DemiBold_21_info;
pub const FONT_SUB: crate::ui::display::Font = &Font_TTSatoshi_DemiBold_18_info; pub const FONT_SUB: crate::ui::display::Font = &Font_TTSatoshi_DemiBold_18_info;

45
core/embed/rust/src/ui/layout_delizia/theme/bootloader.rs
View File

@ -74,21 +74,21 @@ pub const CHECK40: &[u8] = include_res!("layout_delizia/res/check40.toif");
pub fn button_confirm() -> ButtonStyleSheet { pub fn button_confirm() -> ButtonStyleSheet {
ButtonStyleSheet { ButtonStyleSheet {
normal: &ButtonStyle { normal: &ButtonStyle {
font: fonts::FONT_BOLD, font: fonts::FONT_DEMIBOLD,
text_color: BLD_BG, text_color: BLD_BG,
button_color: WHITE, button_color: WHITE,
icon_color: BLD_BG, icon_color: BLD_BG,
background_color: BLD_BG, background_color: BLD_BG,
}, },
active: &ButtonStyle { active: &ButtonStyle {
font: fonts::FONT_BOLD, font: fonts::FONT_DEMIBOLD,
text_color: BLD_BG, text_color: BLD_BG,
button_color: BLD_INSTALL_BTN_COLOR_ACTIVE, button_color: BLD_INSTALL_BTN_COLOR_ACTIVE,
icon_color: BLD_BG, icon_color: BLD_BG,
background_color: BLD_BG, background_color: BLD_BG,
}, },
disabled: &ButtonStyle { disabled: &ButtonStyle {
font: fonts::FONT_BOLD, font: fonts::FONT_DEMIBOLD,
text_color: FG, text_color: FG,
button_color: GREY_DARK, button_color: GREY_DARK,
icon_color: BLD_BG, icon_color: BLD_BG,
@ -100,21 +100,21 @@ pub fn button_confirm() -> ButtonStyleSheet {
pub fn button_wipe_cancel() -> ButtonStyleSheet { pub fn button_wipe_cancel() -> ButtonStyleSheet {
ButtonStyleSheet { ButtonStyleSheet {
normal: &ButtonStyle { normal: &ButtonStyle {
font: fonts::FONT_BOLD, font: fonts::FONT_DEMIBOLD,
text_color: WHITE, text_color: WHITE,
button_color: BLD_WIPE_CANCEL_BTN_COLOR, button_color: BLD_WIPE_CANCEL_BTN_COLOR,
icon_color: WHITE, icon_color: WHITE,
background_color: BLD_WIPE_COLOR, background_color: BLD_WIPE_COLOR,
}, },
active: &ButtonStyle { active: &ButtonStyle {
font: fonts::FONT_BOLD, font: fonts::FONT_DEMIBOLD,
text_color: WHITE, text_color: WHITE,
button_color: BLD_WIPE_CANCEL_BTN_COLOR_ACTIVE, button_color: BLD_WIPE_CANCEL_BTN_COLOR_ACTIVE,
icon_color: WHITE, icon_color: WHITE,
background_color: BLD_WIPE_COLOR, background_color: BLD_WIPE_COLOR,
}, },
disabled: &ButtonStyle { disabled: &ButtonStyle {
font: fonts::FONT_BOLD, font: fonts::FONT_DEMIBOLD,
text_color: GREY_LIGHT, text_color: GREY_LIGHT,
button_color: GREY_DARK, button_color: GREY_DARK,
icon_color: GREY_LIGHT, icon_color: GREY_LIGHT,
@ -126,21 +126,21 @@ pub fn button_wipe_cancel() -> ButtonStyleSheet {
pub fn button_wipe_confirm() -> ButtonStyleSheet { pub fn button_wipe_confirm() -> ButtonStyleSheet {
ButtonStyleSheet { ButtonStyleSheet {
normal: &ButtonStyle { normal: &ButtonStyle {
font: fonts::FONT_BOLD, font: fonts::FONT_DEMIBOLD,
text_color: BLD_WIPE_COLOR, text_color: BLD_WIPE_COLOR,
button_color: BLD_WIPE_BTN_COLOR, button_color: BLD_WIPE_BTN_COLOR,
icon_color: BLD_WIPE_COLOR, icon_color: BLD_WIPE_COLOR,
background_color: BLD_WIPE_COLOR, background_color: BLD_WIPE_COLOR,
}, },
active: &ButtonStyle { active: &ButtonStyle {
font: fonts::FONT_BOLD, font: fonts::FONT_DEMIBOLD,
text_color: BLD_WIPE_COLOR, text_color: BLD_WIPE_COLOR,
button_color: BLD_WIPE_BTN_COLOR_ACTIVE, button_color: BLD_WIPE_BTN_COLOR_ACTIVE,
icon_color: BLD_WIPE_COLOR, icon_color: BLD_WIPE_COLOR,
background_color: BLD_WIPE_COLOR, background_color: BLD_WIPE_COLOR,
}, },
disabled: &ButtonStyle { disabled: &ButtonStyle {
font: fonts::FONT_BOLD, font: fonts::FONT_DEMIBOLD,
text_color: FG, text_color: FG,
button_color: GREY_DARK, button_color: GREY_DARK,
icon_color: FG, icon_color: FG,
@ -152,21 +152,21 @@ pub fn button_wipe_confirm() -> ButtonStyleSheet {
pub fn button_bld_menu() -> ButtonStyleSheet { pub fn button_bld_menu() -> ButtonStyleSheet {
ButtonStyleSheet { ButtonStyleSheet {
normal: &ButtonStyle { normal: &ButtonStyle {
font: fonts::FONT_BOLD, font: fonts::FONT_DEMIBOLD,
text_color: BLD_FG, text_color: BLD_FG,
button_color: BLD_BG, button_color: BLD_BG,
icon_color: BLD_FG, icon_color: BLD_FG,
background_color: BLD_BG, background_color: BLD_BG,
}, },
active: &ButtonStyle { active: &ButtonStyle {
font: fonts::FONT_BOLD, font: fonts::FONT_DEMIBOLD,
text_color: BLD_FG, text_color: BLD_FG,
button_color: BLD_BG, button_color: BLD_BG,
icon_color: BLD_FG, icon_color: BLD_FG,
background_color: BLD_BG, background_color: BLD_BG,
}, },
disabled: &ButtonStyle { disabled: &ButtonStyle {
font: fonts::FONT_BOLD, font: fonts::FONT_DEMIBOLD,
text_color: GREY_LIGHT, text_color: GREY_LIGHT,
button_color: BLD_BG, button_color: BLD_BG,
icon_color: GREY_LIGHT, icon_color: GREY_LIGHT,
@ -178,21 +178,21 @@ pub fn button_bld_menu() -> ButtonStyleSheet {
pub fn button_bld() -> ButtonStyleSheet { pub fn button_bld() -> ButtonStyleSheet {
ButtonStyleSheet { ButtonStyleSheet {
normal: &ButtonStyle { normal: &ButtonStyle {
font: fonts::FONT_BOLD, font: fonts::FONT_DEMIBOLD,
text_color: BLD_FG, text_color: BLD_FG,
button_color: BLD_BTN_COLOR, button_color: BLD_BTN_COLOR,
icon_color: BLD_FG, icon_color: BLD_FG,
background_color: BLD_BG, background_color: BLD_BG,
}, },
active: &ButtonStyle { active: &ButtonStyle {
font: fonts::FONT_BOLD, font: fonts::FONT_DEMIBOLD,
text_color: BLD_FG, text_color: BLD_FG,
button_color: BLD_BTN_COLOR_ACTIVE, button_color: BLD_BTN_COLOR_ACTIVE,
icon_color: BLD_FG, icon_color: BLD_FG,
background_color: BLD_BG, background_color: BLD_BG,
}, },
disabled: &ButtonStyle { disabled: &ButtonStyle {
font: fonts::FONT_BOLD, font: fonts::FONT_DEMIBOLD,
text_color: GREY_LIGHT, text_color: GREY_LIGHT,
button_color: BLD_BTN_COLOR, button_color: BLD_BTN_COLOR,
icon_color: GREY_LIGHT, icon_color: GREY_LIGHT,
@ -203,7 +203,7 @@ pub fn button_bld() -> ButtonStyleSheet {
pub const fn text_title(bg: Color) -> TextStyle { pub const fn text_title(bg: Color) -> TextStyle {
TextStyle::new( TextStyle::new(
fonts::FONT_BOLD, fonts::FONT_DEMIBOLD,
BLD_TITLE_COLOR, BLD_TITLE_COLOR,
bg, bg,
BLD_TITLE_COLOR, BLD_TITLE_COLOR,
@ -212,28 +212,29 @@ pub const fn text_title(bg: Color) -> TextStyle {
} }
pub const TEXT_NORMAL: TextStyle = pub const TEXT_NORMAL: TextStyle =
TextStyle::new(fonts::FONT_NORMAL, BLD_FG, BLD_BG, BLD_FG, BLD_FG); TextStyle::new(fonts::FONT_DEMIBOLD, BLD_FG, BLD_BG, BLD_FG, BLD_FG);
pub const TEXT_WARNING: TextStyle = TextStyle::new( pub const TEXT_WARNING: TextStyle = TextStyle::new(
fonts::FONT_BOLD, fonts::FONT_DEMIBOLD,
BLD_WARN_COLOR, BLD_WARN_COLOR,
BLD_BG, BLD_BG,
BLD_WARN_COLOR, BLD_WARN_COLOR,
BLD_WARN_COLOR, BLD_WARN_COLOR,
); );
pub const fn text_fingerprint(bg: Color) -> TextStyle { pub const fn text_fingerprint(bg: Color) -> TextStyle {
TextStyle::new(fonts::FONT_NORMAL, BLD_FG, bg, BLD_FG, BLD_FG) TextStyle::new(fonts::FONT_DEMIBOLD, BLD_FG, bg, BLD_FG, BLD_FG)
.with_line_breaking(BreakWordsNoHyphen) .with_line_breaking(BreakWordsNoHyphen)
} }
pub const TEXT_BOLD: TextStyle = TextStyle::new(fonts::FONT_BOLD, BLD_FG, BLD_BG, BLD_FG, BLD_FG); pub const TEXT_BOLD: TextStyle =
TextStyle::new(fonts::FONT_DEMIBOLD, BLD_FG, BLD_BG, BLD_FG, BLD_FG);
pub const TEXT_WIPE_BOLD: TextStyle = TextStyle::new( pub const TEXT_WIPE_BOLD: TextStyle = TextStyle::new(
fonts::FONT_BOLD, fonts::FONT_DEMIBOLD,
BLD_WIPE_TEXT_COLOR, BLD_WIPE_TEXT_COLOR,
BLD_WIPE_COLOR, BLD_WIPE_COLOR,
BLD_WIPE_TEXT_COLOR, BLD_WIPE_TEXT_COLOR,
BLD_WIPE_TEXT_COLOR, BLD_WIPE_TEXT_COLOR,
); );
pub const TEXT_WIPE_NORMAL: TextStyle = TextStyle::new( pub const TEXT_WIPE_NORMAL: TextStyle = TextStyle::new(
fonts::FONT_NORMAL, fonts::FONT_DEMIBOLD,
BLD_WIPE_TEXT_COLOR, BLD_WIPE_TEXT_COLOR,
BLD_WIPE_COLOR, BLD_WIPE_COLOR,
BLD_WIPE_TEXT_COLOR, BLD_WIPE_TEXT_COLOR,

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

@ -223,15 +223,12 @@ impl FirmwareUI for UIDelizia {
let mut ops = OpTextLayout::new(theme::TEXT_NORMAL); let mut ops = OpTextLayout::new(theme::TEXT_NORMAL);
for item in IterBuf::new().try_iterate(items)? { for item in IterBuf::new().try_iterate(items)? {
if item.is_str() { if item.is_str() {
ops = ops.text(TString::try_from(item)?, fonts::FONT_NORMAL) ops = ops.text(TString::try_from(item)?, fonts::FONT_DEMIBOLD)
} else { } else {
let [emphasis, text]: [Obj; 2] = util::iter_into_array(item)?; let [_emphasis, text]: [Obj; 2] = util::iter_into_array(item)?;
let text: TString = text.try_into()?; let text: TString = text.try_into()?;
if emphasis.try_into()? { // emphasis not implemented on Delizia
ops = ops.text(text, fonts::FONT_DEMIBOLD); ops = ops.text(text, fonts::FONT_DEMIBOLD);
} else {
ops = ops.text(text, fonts::FONT_NORMAL);
}
} }
} }