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

TR-rust/bootloader: make it compile - TODO: get rid of StrBuffer dependence

Browse Source
This commit is contained in:
grdddj 2023-03-31 15:08:31 +02:00
parent a4f55c9680
commit 16e7a492dd
5 changed files with 31 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,8 +32,8 @@ pub struct Confirm {
bg_color: Color,
icon: Option<Icon>,
message: Child<Paragraphs<ParagraphVecShort<&'static str>>>,
left: Child<Button<&'static str>>,
right: Child<Button<&'static str>>,
left: Child<Button>,
right: Child<Button>,
confirm_left: bool,
}
@ -42,8 +42,8 @@ impl Confirm {
bg_color: Color,
icon: Option<Icon>,
message: Paragraphs<ParagraphVecShort<&'static str>>,
left: Button<&'static str>,
right: Button<&'static str>,
left: Button,
right: Button,
confirm_left: bool,
) -> Self {
let mut instance = Self {
@ -111,6 +111,7 @@ impl Component for Confirm {
self.right.paint();
}
#[cfg(feature = "ui_bounds")]
fn bounds(&self, sink: &mut dyn FnMut(Rect)) {
self.left.bounds(sink);
self.right.bounds(sink);

11
core/embed/rust/src/ui/model_tr/bootloader/intro.rs
View File

@ -35,8 +35,8 @@ impl ReturnToC for IntroMsg {
pub struct Intro {
bg: Pad,
title: Child<Title>,
host: Child<Button<&'static str>>,
menu: Child<Button<&'static str>>,
host: Child<Button>,
menu: Child<Button>,
text: Child<Paragraphs<ParagraphVecShort<&'static str>>>,
}
@ -55,12 +55,14 @@ impl Intro {
title: Child::new(Title::new(bld_version)),
host: Child::new(Button::with_text(
ButtonPos::Left,
"INSTALL FIRMWARE",
// TODO: this relies on StrBuffer support for bootloader, decide what to do
"INSTALL FIRMWARE".into(),
bld_button_default(),
)),
menu: Child::new(Button::with_text(
ButtonPos::Right,
"MENU",
// TODO: this relies on StrBuffer support for bootloader, decide what to do
"MENU".into(),
bld_button_default(),
)),
text: Child::new(p1),
@ -107,6 +109,7 @@ impl Component for Intro {
self.menu.paint();
}
#[cfg(feature = "ui_bounds")]
fn bounds(&self, sink: &mut dyn FnMut(Rect)) {
self.title.bounds(sink);
self.text.bounds(sink);

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

@ -78,7 +78,7 @@ where
{
frame.place(SCREEN_ADJ);
frame.paint();
fade_backlight_duration(BACKLIGHT_NORMAL as _, 500);
fade_backlight_duration(BACKLIGHT_NORMAL, 500);
while button_eval().is_some() {}
@ -139,8 +139,9 @@ extern "C" fn screen_install_confirm(
message.add(Paragraph::new(&theme::TEXT_BOLD, "Seed will be erased!").centered());
}
let left = Button::with_text(ButtonPos::Left, "CANCEL", bld_button_cancel());
let right = Button::with_text(ButtonPos::Right, "INSTALL", bld_button_default());
// TODO: this relies on StrBuffer support for bootloader, decide what to do
let left = Button::with_text(ButtonPos::Left, "CANCEL".into(), bld_button_cancel());
let right = Button::with_text(ButtonPos::Right, "INSTALL".into(), bld_button_default());
let mut frame = Confirm::new(
BLD_BG,
@ -172,8 +173,9 @@ extern "C" fn screen_wipe_confirm() -> u32 {
let message =
Paragraphs::new(messages).with_placement(LinearPlacement::vertical().align_at_center());
let left = Button::with_text(ButtonPos::Left, "WIPE", bld_button_default());
let right = Button::with_text(ButtonPos::Right, "CANCEL", bld_button_cancel());
// TODO: this relies on StrBuffer support for bootloader, decide what to do
let left = Button::with_text(ButtonPos::Left, "WIPE".into(), bld_button_default());
let right = Button::with_text(ButtonPos::Right, "CANCEL".into(), bld_button_cancel());
let mut frame = Confirm::new(BLD_BG, icon, message, left, right, true);
@ -220,7 +222,14 @@ fn screen_progress(
let fill_to = (loader_area.width() as u32 * progress as u32) / 1000;
display::bar_with_text_and_fill(loader_area, Some(text), fg_color, bg_color, 0, fill_to as _);
display::bar_with_text_and_fill(
loader_area,
Some(&text),
fg_color,
bg_color,
0,
fill_to as _,
);
display::refresh();
}

28
core/embed/rust/src/ui/model_tr/bootloader/theme.rs
View File

@ -2,7 +2,7 @@ use crate::ui::{
component::text::TextStyle,
display::{Color, Font},
model_tr::{
component::{ButtonStyle, ButtonStyleSheet},
component::ButtonStyleSheet,
theme::{BG, BLACK, FG, WHITE},
},
};
@ -17,33 +17,11 @@ pub const RADIUS: u8 = 2;
pub const ICON_SIZE: i32 = 16;
pub fn bld_button_default() -> ButtonStyleSheet {
ButtonStyleSheet {
normal: &ButtonStyle {
font: Font::NORMAL,
text_color: BG,
border_horiz: true,
},
active: &ButtonStyle {
font: Font::NORMAL,
text_color: FG,
border_horiz: true,
},
}
ButtonStyleSheet::new(BG, FG, false, false, None, None)
}
pub fn bld_button_cancel() -> ButtonStyleSheet {
ButtonStyleSheet {
normal: &ButtonStyle {
font: Font::NORMAL,
text_color: FG,
border_horiz: false,
},
active: &ButtonStyle {
font: Font::NORMAL,
text_color: BG,
border_horiz: false,
},
}
ButtonStyleSheet::new(FG, BG, false, false, None, None)
}
pub const TEXT_NORMAL: TextStyle = TextStyle::new(Font::NORMAL, BLD_FG, BLD_BG, BLD_FG, BLD_FG);

1
core/embed/rust/src/ui/model_tr/bootloader/title.rs
View File

@ -48,5 +48,6 @@ impl Component for Title {
);
}
#[cfg(feature = "ui_bounds")]
fn bounds(&self, _sink: &mut dyn FnMut(Rect)) {}
}