From b521f2d8c365b11c7158e5688d513507a89c9d1f Mon Sep 17 00:00:00 2001 From: tychovrahe Date: Fri, 11 Nov 2022 12:55:22 +0100 Subject: [PATCH] bld --- .../src/ui/model_tr/bootloader/confirm.rs | 3 +- .../rust/src/ui/model_tr/bootloader/mod.rs | 36 +++++++++---------- 2 files changed, 18 insertions(+), 21 deletions(-) diff --git a/core/embed/rust/src/ui/model_tr/bootloader/confirm.rs b/core/embed/rust/src/ui/model_tr/bootloader/confirm.rs index bf401f706..9391afe89 100644 --- a/core/embed/rust/src/ui/model_tr/bootloader/confirm.rs +++ b/core/embed/rust/src/ui/model_tr/bootloader/confirm.rs @@ -5,7 +5,7 @@ use crate::ui::{ }, constant::screen, display, - display::Color, + display::{Color, Font}, geometry::{Point, Rect}, model_tr::{ bootloader::theme::WHITE, @@ -13,7 +13,6 @@ use crate::ui::{ constant::{HEIGHT, WIDTH}, }, }; -use crate::ui::display::Font; use super::ReturnToC; diff --git a/core/embed/rust/src/ui/model_tr/bootloader/mod.rs b/core/embed/rust/src/ui/model_tr/bootloader/mod.rs index 135dc3eba..e50548ed2 100644 --- a/core/embed/rust/src/ui/model_tr/bootloader/mod.rs +++ b/core/embed/rust/src/ui/model_tr/bootloader/mod.rs @@ -146,20 +146,16 @@ extern "C" fn screen_wipe_confirm() -> u32 { let mut messages = ParagraphVecShort::new(); - messages.add( - Paragraph::new( - &theme::TEXT_NORMAL, - "Do you really want to wipe the device?", - ) - ); + messages.add(Paragraph::new( + &theme::TEXT_NORMAL, + "Do you really want to wipe the device?", + )); messages.add(Paragraph::new(&theme::TEXT_BOLD, "Seed will be erased!")); let message = Paragraphs::new(messages).with_placement(LinearPlacement::vertical().align_at_center()); - let mut frame = Confirm::new(BLD_BG, ICON, - "WIPE TREZOR", - message, "WIPE", true); + let mut frame = Confirm::new(BLD_BG, ICON, "WIPE TREZOR", message, "WIPE", true); run(&mut frame) } @@ -206,17 +202,19 @@ fn screen_progress( ((100_u32 * progress as u32) / 1000) as _, icon, ); - display::text_center(screen().center() + Offset::y(8), - text, - Font::BOLD, - fg_color, - bg_color + display::text_center( + screen().center() + Offset::y(8), + text, + Font::BOLD, + fg_color, + bg_color, ); - display::text_center(screen().center() + Offset::y(20), - text2, - Font::BOLD, - fg_color, - bg_color + display::text_center( + screen().center() + Offset::y(20), + text2, + Font::BOLD, + fg_color, + bg_color, ); // let loader_area = Rect::new(Point::new(5, HEIGHT - 16), Point::new(WIDTH - 5,