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

bld

Browse Source
This commit is contained in:
tychovrahe 2022-11-11 12:55:22 +01:00
parent 87e070b0fe
commit b521f2d8c3
2 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/embed/rust/src/ui/model_tr/bootloader/confirm.rs
View File

@ -5,7 +5,7 @@ use crate::ui::{
}, },
constant::screen, constant::screen,
display, display,
display::Color, display::{Color, Font},
geometry::{Point, Rect}, geometry::{Point, Rect},
model_tr::{ model_tr::{
bootloader::theme::WHITE, bootloader::theme::WHITE,
@ -13,7 +13,6 @@ use crate::ui::{
constant::{HEIGHT, WIDTH}, constant::{HEIGHT, WIDTH},
}, },
}; };
use crate::ui::display::Font;
use super::ReturnToC; use super::ReturnToC;

36
core/embed/rust/src/ui/model_tr/bootloader/mod.rs
View File

@ -146,20 +146,16 @@ extern "C" fn screen_wipe_confirm() -> u32 {
let mut messages = ParagraphVecShort::new(); let mut messages = ParagraphVecShort::new();
messages.add( messages.add(Paragraph::new(
Paragraph::new( &theme::TEXT_NORMAL,
&theme::TEXT_NORMAL, "Do you really want to wipe the device?",
"Do you really want to wipe the device?", ));
)
);
messages.add(Paragraph::new(&theme::TEXT_BOLD, "Seed will be erased!")); messages.add(Paragraph::new(&theme::TEXT_BOLD, "Seed will be erased!"));
let message = let message =
Paragraphs::new(messages).with_placement(LinearPlacement::vertical().align_at_center()); Paragraphs::new(messages).with_placement(LinearPlacement::vertical().align_at_center());
let mut frame = Confirm::new(BLD_BG, ICON, let mut frame = Confirm::new(BLD_BG, ICON, "WIPE TREZOR", message, "WIPE", true);
"WIPE TREZOR",
message, "WIPE", true);
run(&mut frame) run(&mut frame)
} }
@ -206,17 +202,19 @@ fn screen_progress(
((100_u32 * progress as u32) / 1000) as _, ((100_u32 * progress as u32) / 1000) as _,
icon, icon,
); );
display::text_center(screen().center() + Offset::y(8), display::text_center(
text, screen().center() + Offset::y(8),
Font::BOLD, text,
fg_color, Font::BOLD,
bg_color fg_color,
bg_color,
); );
display::text_center(screen().center() + Offset::y(20), display::text_center(
text2, screen().center() + Offset::y(20),
Font::BOLD, text2,
fg_color, Font::BOLD,
bg_color fg_color,
bg_color,
); );
// let loader_area = Rect::new(Point::new(5, HEIGHT - 16), Point::new(WIDTH - 5, // let loader_area = Rect::new(Point::new(5, HEIGHT - 16), Point::new(WIDTH - 5,