diff --git a/core/assets/model_r/device_name.png b/core/assets/model_r/device_name.png new file mode 100644 index 0000000000..84cdebf5ec Binary files /dev/null and b/core/assets/model_r/device_name.png differ diff --git a/core/embed/rust/src/ui/model_tr/component/welcome_screen.rs b/core/embed/rust/src/ui/model_tr/component/welcome_screen.rs index f675584a7b..e497e81919 100644 --- a/core/embed/rust/src/ui/model_tr/component/welcome_screen.rs +++ b/core/embed/rust/src/ui/model_tr/component/welcome_screen.rs @@ -1,15 +1,11 @@ use crate::ui::{ component::{Component, Event, EventCtx, Never}, - constant::MODEL_NAME, - display, geometry::{self, Offset, Rect}, }; use super::super::theme; -const TEXT_BOTTOM_MARGIN: i16 = 2; // matching the homescreen label margin const ICON_TOP_MARGIN: i16 = 11; -const MODEL_NAME_FONT: display::Font = display::Font::NORMAL; pub struct WelcomeScreen { area: Rect, @@ -34,10 +30,9 @@ impl Component for WelcomeScreen { } fn paint(&mut self) { - display::text_center( - self.area.bottom_center() - Offset::y(TEXT_BOTTOM_MARGIN), - MODEL_NAME, - MODEL_NAME_FONT, + theme::ICON_DEVICE_NAME.draw( + self.area.bottom_center(), + geometry::BOTTOM_CENTER, theme::FG, theme::BG, ); @@ -54,6 +49,6 @@ impl Component for WelcomeScreen { impl crate::trace::Trace for WelcomeScreen { fn trace(&self, t: &mut dyn crate::trace::Tracer) { t.component("WelcomeScreen"); - t.string("model_name", MODEL_NAME); + t.string("model_name", "Trezor Model R"); } } diff --git a/core/embed/rust/src/ui/model_tr/res/device_name.toif b/core/embed/rust/src/ui/model_tr/res/device_name.toif new file mode 100644 index 0000000000..ab9bab67cb Binary files /dev/null and b/core/embed/rust/src/ui/model_tr/res/device_name.toif differ diff --git a/core/embed/rust/src/ui/model_tr/theme.rs b/core/embed/rust/src/ui/model_tr/theme.rs index 4d1befc84a..89092f196e 100644 --- a/core/embed/rust/src/ui/model_tr/theme.rs +++ b/core/embed/rust/src/ui/model_tr/theme.rs @@ -43,10 +43,6 @@ pub fn textstyle_number_bold_or_mono(num: i32) -> &'static TextStyle { } } -// BLD icons -include_icon!(LOGO_EMPTY, "model_tr/res/trezor_empty.toif"); -include_icon!(ICON_FAIL, "model_tr/res/fail.toif"); - // Firmware icons include_icon!(ICON_ARM_LEFT, "model_tr/res/arm_left.toif"); // 6*10 include_icon!(ICON_ARM_RIGHT, "model_tr/res/arm_right.toif"); // 6*10 @@ -71,6 +67,7 @@ include_icon!( empty_right_col = true ); // 8*8 include_icon!(ICON_DELETE, "model_tr/res/delete.toif"); // 10*7 +include_icon!(ICON_DEVICE_NAME, "model_tr/res/device_name.toif"); include_icon!(ICON_EYE, "model_tr/res/eye_round.toif"); // 12*7 include_icon!(ICON_LOCK, "model_tr/res/lock.toif"); // 10*10 include_icon!(ICON_LOGO, "model_tr/res/logo_22_33.toif"); // 22*33