From 626a56a702e39af39f7de4c202f822930df7c684 Mon Sep 17 00:00:00 2001 From: obrusvit Date: Sun, 2 Feb 2025 18:05:41 +0100 Subject: [PATCH] refactor(core): remove unused fonts [no changelog] --- .../rust/src/ui/layout_bolt/fonts/mod.rs | 8 ---- .../rust/src/ui/layout_caesar/fonts/mod.rs | 2 - .../ui/layout_delizia/component/homescreen.rs | 2 +- .../ui/layout_delizia/component/progress.rs | 2 +- .../src/ui/layout_delizia/component/result.rs | 4 +- .../component/welcome_screen.rs | 2 +- .../rust/src/ui/layout_delizia/fonts/mod.rs | 4 -- .../src/ui/layout_delizia/theme/bootloader.rs | 45 ++++++++++--------- .../rust/src/ui/layout_delizia/ui_firmware.rs | 11 ++--- 9 files changed, 32 insertions(+), 48 deletions(-) diff --git a/core/embed/rust/src/ui/layout_bolt/fonts/mod.rs b/core/embed/rust/src/ui/layout_bolt/fonts/mod.rs index 99d02b246e..3246944fa0 100644 --- a/core/embed/rust/src/ui/layout_bolt/fonts/mod.rs +++ b/core/embed/rust/src/ui/layout_bolt/fonts/mod.rs @@ -1,22 +1,14 @@ -// mod font_roboto_bold_20; -// mod font_roboto_regular_20; mod font_robotomono_medium_20; mod font_tthoves_bold_17; mod font_tthoves_demibold_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_tthoves_bold_17::Font_TTHoves_Bold_17_upper_info; use font_tthoves_demibold_21::Font_TTHoves_DemiBold_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; -// 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_DEMIBOLD: crate::ui::display::Font = &Font_TTHoves_DemiBold_21_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; diff --git a/core/embed/rust/src/ui/layout_caesar/fonts/mod.rs b/core/embed/rust/src/ui/layout_caesar/fonts/mod.rs index a3fc03d01b..ed0b122bd6 100644 --- a/core/embed/rust/src/ui/layout_caesar/fonts/mod.rs +++ b/core/embed/rust/src/ui/layout_caesar/fonts/mod.rs @@ -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_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; -// TODO: remove SUB -pub const FONT_SUB: crate::ui::display::Font = &Font_PixelOperator_Regular_8_info; diff --git a/core/embed/rust/src/ui/layout_delizia/component/homescreen.rs b/core/embed/rust/src/ui/layout_delizia/component/homescreen.rs index f9924f98b0..fe68b28a56 100644 --- a/core/embed/rust/src/ui/layout_delizia/component/homescreen.rs +++ b/core/embed/rust/src/ui/layout_delizia/component/homescreen.rs @@ -493,7 +493,7 @@ impl Homescreen { fn render_loader<'s>(&'s self, target: &mut impl Renderer<'s>) { 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_fg(theme::FG); }); diff --git a/core/embed/rust/src/ui/layout_delizia/component/progress.rs b/core/embed/rust/src/ui/layout_delizia/component/progress.rs index 9924ccfe8a..db00518270 100644 --- a/core/embed/rust/src/ui/layout_delizia/component/progress.rs +++ b/core/embed/rust/src/ui/layout_delizia/component/progress.rs @@ -62,7 +62,7 @@ impl Component for Progress { .map(|t| t.chars().filter(|c| *c == '\n').count() as i16); let (title, rest) = Self::AREA.split_top(self.title.max_size().y); 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)); self.title.place(title); self.loader_y_offset = loader.center().y - constant::screen().center().y; diff --git a/core/embed/rust/src/ui/layout_delizia/component/result.rs b/core/embed/rust/src/ui/layout_delizia/component/result.rs index 32da17402e..223ef2214a 100644 --- a/core/embed/rust/src/ui/layout_delizia/component/result.rs +++ b/core/embed/rust/src/ui/layout_delizia/component/result.rs @@ -34,11 +34,11 @@ impl ResultStyle { } 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 { - 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) } } diff --git a/core/embed/rust/src/ui/layout_delizia/component/welcome_screen.rs b/core/embed/rust/src/ui/layout_delizia/component/welcome_screen.rs index 6cdd1db03f..67e5f7d92e 100644 --- a/core/embed/rust/src/ui/layout_delizia/component/welcome_screen.rs +++ b/core/embed/rust/src/ui/layout_delizia/component/welcome_screen.rs @@ -46,7 +46,7 @@ impl Component for WelcomeScreen { shape::Text::new( self.area.bottom_center() - Offset::y(TEXT_BOTTOM_MARGIN), model::FULL_NAME, - fonts::FONT_NORMAL, + fonts::FONT_DEMIBOLD, ) .with_align(Alignment::Center) .with_fg(theme::FG) diff --git a/core/embed/rust/src/ui/layout_delizia/fonts/mod.rs b/core/embed/rust/src/ui/layout_delizia/fonts/mod.rs index 2251177396..528504c7de 100644 --- a/core/embed/rust/src/ui/layout_delizia/fonts/mod.rs +++ b/core/embed/rust/src/ui/layout_delizia/fonts/mod.rs @@ -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_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_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_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; diff --git a/core/embed/rust/src/ui/layout_delizia/theme/bootloader.rs b/core/embed/rust/src/ui/layout_delizia/theme/bootloader.rs index 52afcf0aab..cfc5b5983d 100644 --- a/core/embed/rust/src/ui/layout_delizia/theme/bootloader.rs +++ b/core/embed/rust/src/ui/layout_delizia/theme/bootloader.rs @@ -74,21 +74,21 @@ pub const CHECK40: &[u8] = include_res!("layout_delizia/res/check40.toif"); pub fn button_confirm() -> ButtonStyleSheet { ButtonStyleSheet { normal: &ButtonStyle { - font: fonts::FONT_BOLD, + font: fonts::FONT_DEMIBOLD, text_color: BLD_BG, button_color: WHITE, icon_color: BLD_BG, background_color: BLD_BG, }, active: &ButtonStyle { - font: fonts::FONT_BOLD, + font: fonts::FONT_DEMIBOLD, text_color: BLD_BG, button_color: BLD_INSTALL_BTN_COLOR_ACTIVE, icon_color: BLD_BG, background_color: BLD_BG, }, disabled: &ButtonStyle { - font: fonts::FONT_BOLD, + font: fonts::FONT_DEMIBOLD, text_color: FG, button_color: GREY_DARK, icon_color: BLD_BG, @@ -100,21 +100,21 @@ pub fn button_confirm() -> ButtonStyleSheet { pub fn button_wipe_cancel() -> ButtonStyleSheet { ButtonStyleSheet { normal: &ButtonStyle { - font: fonts::FONT_BOLD, + font: fonts::FONT_DEMIBOLD, text_color: WHITE, button_color: BLD_WIPE_CANCEL_BTN_COLOR, icon_color: WHITE, background_color: BLD_WIPE_COLOR, }, active: &ButtonStyle { - font: fonts::FONT_BOLD, + font: fonts::FONT_DEMIBOLD, text_color: WHITE, button_color: BLD_WIPE_CANCEL_BTN_COLOR_ACTIVE, icon_color: WHITE, background_color: BLD_WIPE_COLOR, }, disabled: &ButtonStyle { - font: fonts::FONT_BOLD, + font: fonts::FONT_DEMIBOLD, text_color: GREY_LIGHT, button_color: GREY_DARK, icon_color: GREY_LIGHT, @@ -126,21 +126,21 @@ pub fn button_wipe_cancel() -> ButtonStyleSheet { pub fn button_wipe_confirm() -> ButtonStyleSheet { ButtonStyleSheet { normal: &ButtonStyle { - font: fonts::FONT_BOLD, + font: fonts::FONT_DEMIBOLD, text_color: BLD_WIPE_COLOR, button_color: BLD_WIPE_BTN_COLOR, icon_color: BLD_WIPE_COLOR, background_color: BLD_WIPE_COLOR, }, active: &ButtonStyle { - font: fonts::FONT_BOLD, + font: fonts::FONT_DEMIBOLD, text_color: BLD_WIPE_COLOR, button_color: BLD_WIPE_BTN_COLOR_ACTIVE, icon_color: BLD_WIPE_COLOR, background_color: BLD_WIPE_COLOR, }, disabled: &ButtonStyle { - font: fonts::FONT_BOLD, + font: fonts::FONT_DEMIBOLD, text_color: FG, button_color: GREY_DARK, icon_color: FG, @@ -152,21 +152,21 @@ pub fn button_wipe_confirm() -> ButtonStyleSheet { pub fn button_bld_menu() -> ButtonStyleSheet { ButtonStyleSheet { normal: &ButtonStyle { - font: fonts::FONT_BOLD, + font: fonts::FONT_DEMIBOLD, text_color: BLD_FG, button_color: BLD_BG, icon_color: BLD_FG, background_color: BLD_BG, }, active: &ButtonStyle { - font: fonts::FONT_BOLD, + font: fonts::FONT_DEMIBOLD, text_color: BLD_FG, button_color: BLD_BG, icon_color: BLD_FG, background_color: BLD_BG, }, disabled: &ButtonStyle { - font: fonts::FONT_BOLD, + font: fonts::FONT_DEMIBOLD, text_color: GREY_LIGHT, button_color: BLD_BG, icon_color: GREY_LIGHT, @@ -178,21 +178,21 @@ pub fn button_bld_menu() -> ButtonStyleSheet { pub fn button_bld() -> ButtonStyleSheet { ButtonStyleSheet { normal: &ButtonStyle { - font: fonts::FONT_BOLD, + font: fonts::FONT_DEMIBOLD, text_color: BLD_FG, button_color: BLD_BTN_COLOR, icon_color: BLD_FG, background_color: BLD_BG, }, active: &ButtonStyle { - font: fonts::FONT_BOLD, + font: fonts::FONT_DEMIBOLD, text_color: BLD_FG, button_color: BLD_BTN_COLOR_ACTIVE, icon_color: BLD_FG, background_color: BLD_BG, }, disabled: &ButtonStyle { - font: fonts::FONT_BOLD, + font: fonts::FONT_DEMIBOLD, text_color: GREY_LIGHT, button_color: BLD_BTN_COLOR, icon_color: GREY_LIGHT, @@ -203,7 +203,7 @@ pub fn button_bld() -> ButtonStyleSheet { pub const fn text_title(bg: Color) -> TextStyle { TextStyle::new( - fonts::FONT_BOLD, + fonts::FONT_DEMIBOLD, BLD_TITLE_COLOR, bg, BLD_TITLE_COLOR, @@ -212,28 +212,29 @@ pub const fn text_title(bg: Color) -> 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( - fonts::FONT_BOLD, + fonts::FONT_DEMIBOLD, BLD_WARN_COLOR, BLD_BG, BLD_WARN_COLOR, BLD_WARN_COLOR, ); 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) } -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( - fonts::FONT_BOLD, + fonts::FONT_DEMIBOLD, BLD_WIPE_TEXT_COLOR, BLD_WIPE_COLOR, BLD_WIPE_TEXT_COLOR, BLD_WIPE_TEXT_COLOR, ); pub const TEXT_WIPE_NORMAL: TextStyle = TextStyle::new( - fonts::FONT_NORMAL, + fonts::FONT_DEMIBOLD, BLD_WIPE_TEXT_COLOR, BLD_WIPE_COLOR, BLD_WIPE_TEXT_COLOR, 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 9f509a7703..80b25adb44 100644 --- a/core/embed/rust/src/ui/layout_delizia/ui_firmware.rs +++ b/core/embed/rust/src/ui/layout_delizia/ui_firmware.rs @@ -223,15 +223,12 @@ impl FirmwareUI for UIDelizia { let mut ops = OpTextLayout::new(theme::TEXT_NORMAL); for item in IterBuf::new().try_iterate(items)? { 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 { - 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()?; - if emphasis.try_into()? { - ops = ops.text(text, fonts::FONT_DEMIBOLD); - } else { - ops = ops.text(text, fonts::FONT_NORMAL); - } + // emphasis not implemented on Delizia + ops = ops.text(text, fonts::FONT_DEMIBOLD); } }