mirror of
https://github.com/trezor/trezor-firmware.git
synced 2025-06-06 16:18:45 +00:00
feat(eckhart): implement show checklist
This commit is contained in:
parent
7f02f4725b
commit
a99aa3144f
@ -862,7 +862,7 @@ pub enum TranslatedString {
|
|||||||
reset__slip39_checklist_set_num_shares = 578, // "Set number of shares"
|
reset__slip39_checklist_set_num_shares = 578, // "Set number of shares"
|
||||||
reset__slip39_checklist_set_sizes = 579, // "Set sizes and thresholds"
|
reset__slip39_checklist_set_sizes = 579, // "Set sizes and thresholds"
|
||||||
reset__slip39_checklist_set_sizes_longer = 580, // "Set size and threshold for each group"
|
reset__slip39_checklist_set_sizes_longer = 580, // "Set size and threshold for each group"
|
||||||
reset__slip39_checklist_set_threshold = 581, // "Set threshold"
|
reset__slip39_checklist_set_threshold = 581, // {"Bolt": "Set threshold", "Caesar": "Set threshold", "Delizia": "Set threshold", "Eckhart": "Set recovery threshold"}
|
||||||
reset__slip39_checklist_title = 582, // "Backup checklist"
|
reset__slip39_checklist_title = 582, // "Backup checklist"
|
||||||
reset__slip39_checklist_write_down = 583, // "Write down and check all shares"
|
reset__slip39_checklist_write_down = 583, // "Write down and check all shares"
|
||||||
reset__slip39_checklist_write_down_recovery = 584, // "Write down & check all wallet backup shares"
|
reset__slip39_checklist_write_down_recovery = 584, // "Write down & check all wallet backup shares"
|
||||||
@ -2291,7 +2291,14 @@ impl TranslatedString {
|
|||||||
Self::reset__slip39_checklist_set_num_shares => "Set number of shares",
|
Self::reset__slip39_checklist_set_num_shares => "Set number of shares",
|
||||||
Self::reset__slip39_checklist_set_sizes => "Set sizes and thresholds",
|
Self::reset__slip39_checklist_set_sizes => "Set sizes and thresholds",
|
||||||
Self::reset__slip39_checklist_set_sizes_longer => "Set size and threshold for each group",
|
Self::reset__slip39_checklist_set_sizes_longer => "Set size and threshold for each group",
|
||||||
|
#[cfg(feature = "layout_bolt")]
|
||||||
Self::reset__slip39_checklist_set_threshold => "Set threshold",
|
Self::reset__slip39_checklist_set_threshold => "Set threshold",
|
||||||
|
#[cfg(feature = "layout_caesar")]
|
||||||
|
Self::reset__slip39_checklist_set_threshold => "Set threshold",
|
||||||
|
#[cfg(feature = "layout_delizia")]
|
||||||
|
Self::reset__slip39_checklist_set_threshold => "Set threshold",
|
||||||
|
#[cfg(feature = "layout_eckhart")]
|
||||||
|
Self::reset__slip39_checklist_set_threshold => "Set recovery threshold",
|
||||||
Self::reset__slip39_checklist_title => "Backup checklist",
|
Self::reset__slip39_checklist_title => "Backup checklist",
|
||||||
Self::reset__slip39_checklist_write_down => "Write down and check all shares",
|
Self::reset__slip39_checklist_write_down => "Write down and check all shares",
|
||||||
Self::reset__slip39_checklist_write_down_recovery => "Write down & check all wallet backup shares",
|
Self::reset__slip39_checklist_write_down_recovery => "Write down & check all wallet backup shares",
|
||||||
|
@ -117,6 +117,14 @@ pub const TEXT_MONO_EXTRA_LIGHT: TextStyle = TextStyle::new(
|
|||||||
GREY_EXTRA_LIGHT,
|
GREY_EXTRA_LIGHT,
|
||||||
);
|
);
|
||||||
|
|
||||||
|
pub const TEXT_CHECKLIST_INACTIVE: TextStyle = TextStyle::new(
|
||||||
|
fonts::FONT_SATOSHI_MEDIUM_26,
|
||||||
|
GREY_DARK,
|
||||||
|
BG,
|
||||||
|
GREY_DARK,
|
||||||
|
GREY_DARK,
|
||||||
|
);
|
||||||
|
|
||||||
// Macro for styles differing only in text color
|
// Macro for styles differing only in text color
|
||||||
macro_rules! label_title {
|
macro_rules! label_title {
|
||||||
($color:expr) => {
|
($color:expr) => {
|
||||||
|
@ -1,3 +1,5 @@
|
|||||||
|
use core::cmp::Ordering;
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
error::Error,
|
error::Error,
|
||||||
io::BinaryData,
|
io::BinaryData,
|
||||||
@ -8,11 +10,13 @@ use crate::{
|
|||||||
component::{
|
component::{
|
||||||
text::{
|
text::{
|
||||||
op::OpTextLayout,
|
op::OpTextLayout,
|
||||||
paragraphs::{Paragraph, ParagraphSource, ParagraphVecShort, Paragraphs, VecExt},
|
paragraphs::{
|
||||||
|
Checklist, Paragraph, ParagraphSource, ParagraphVecShort, Paragraphs, VecExt,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
Empty, FormattedText,
|
Empty, FormattedText,
|
||||||
},
|
},
|
||||||
geometry::LinearPlacement,
|
geometry::{LinearPlacement, Offset},
|
||||||
layout::{
|
layout::{
|
||||||
obj::{LayoutMaybeTrace, LayoutObj, RootComponent},
|
obj::{LayoutMaybeTrace, LayoutObj, RootComponent},
|
||||||
util::{ConfirmValueParams, RecoveryType, StrOrBytes},
|
util::{ConfirmValueParams, RecoveryType, StrOrBytes},
|
||||||
@ -521,12 +525,41 @@ impl FirmwareUI for UIEckhart {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn show_checklist(
|
fn show_checklist(
|
||||||
_title: TString<'static>,
|
title: TString<'static>,
|
||||||
_button: TString<'static>,
|
button: TString<'static>,
|
||||||
_active: usize,
|
active: usize,
|
||||||
_items: [TString<'static>; MAX_CHECKLIST_ITEMS],
|
items: [TString<'static>; MAX_CHECKLIST_ITEMS],
|
||||||
) -> Result<impl LayoutMaybeTrace, Error> {
|
) -> Result<impl LayoutMaybeTrace, Error> {
|
||||||
Err::<RootComponent<Empty, ModelUI>, Error>(Error::ValueError(c"not implemented"))
|
let mut paragraphs = ParagraphVecShort::new();
|
||||||
|
for (i, item) in items.into_iter().enumerate() {
|
||||||
|
let style = match i.cmp(&active) {
|
||||||
|
Ordering::Less => &theme::TEXT_CHECKLIST_INACTIVE,
|
||||||
|
Ordering::Equal => &theme::TEXT_MEDIUM,
|
||||||
|
Ordering::Greater => &theme::TEXT_CHECKLIST_INACTIVE,
|
||||||
|
};
|
||||||
|
paragraphs.add(Paragraph::new(style, item));
|
||||||
|
}
|
||||||
|
|
||||||
|
let checklist_content = Checklist::from_paragraphs(
|
||||||
|
theme::ICON_CHEVRON_RIGHT_MINI,
|
||||||
|
theme::ICON_CHECKMARK_MINI,
|
||||||
|
active,
|
||||||
|
paragraphs.into_paragraphs().with_spacing(40),
|
||||||
|
)
|
||||||
|
.with_check_width(32)
|
||||||
|
.with_icon_done_color(theme::GREEN_LIGHT)
|
||||||
|
.with_done_offset(Offset::y(7))
|
||||||
|
.with_current_offset(Offset::y(4));
|
||||||
|
|
||||||
|
let layout = RootComponent::new(
|
||||||
|
TextScreen::new(checklist_content)
|
||||||
|
.with_header(Header::new(title).with_menu_button())
|
||||||
|
.with_action_bar(ActionBar::new_single(
|
||||||
|
Button::with_text(button).styled(theme::button_default()),
|
||||||
|
)),
|
||||||
|
);
|
||||||
|
|
||||||
|
Ok(layout)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn show_danger(
|
fn show_danger(
|
||||||
|
@ -724,7 +724,12 @@
|
|||||||
"reset__slip39_checklist_set_num_shares": "Set number of shares",
|
"reset__slip39_checklist_set_num_shares": "Set number of shares",
|
||||||
"reset__slip39_checklist_set_sizes": "Set sizes and thresholds",
|
"reset__slip39_checklist_set_sizes": "Set sizes and thresholds",
|
||||||
"reset__slip39_checklist_set_sizes_longer": "Set size and threshold for each group",
|
"reset__slip39_checklist_set_sizes_longer": "Set size and threshold for each group",
|
||||||
"reset__slip39_checklist_set_threshold": "Set threshold",
|
"reset__slip39_checklist_set_threshold": {
|
||||||
|
"Bolt": "Set threshold",
|
||||||
|
"Caesar": "Set threshold",
|
||||||
|
"Delizia": "Set threshold",
|
||||||
|
"Eckhart": "Set recovery threshold"
|
||||||
|
},
|
||||||
"reset__slip39_checklist_threshold_x_template": "Recovery threshold: {0}",
|
"reset__slip39_checklist_threshold_x_template": "Recovery threshold: {0}",
|
||||||
"reset__slip39_checklist_title": "Backup checklist",
|
"reset__slip39_checklist_title": "Backup checklist",
|
||||||
"reset__slip39_checklist_write_down": "Write down and check all shares",
|
"reset__slip39_checklist_write_down": "Write down and check all shares",
|
||||||
|
Loading…
Reference in New Issue
Block a user