Compare commits

...

2 Commits

Author SHA1 Message Date
obrusvit 3628630584 feat(core/ui): improve T3T1 recovery
2 weeks ago
obrusvit 63965ea07f feat(core/ui): T3T1 mnemonic keyboard
2 weeks ago

@ -152,6 +152,7 @@ static void _librust_qstrs(void) {
MP_QSTR_confirm_backup_written_down;
MP_QSTR_confirm_blob;
MP_QSTR_confirm_coinjoin;
MP_QSTR_confirm_create_wallet;
MP_QSTR_confirm_emphasized;
MP_QSTR_confirm_fido;
MP_QSTR_confirm_firmware_update;

@ -196,7 +196,7 @@ impl Component for Bip39Input {
let icon_center = area.top_right().center(area.bottom_right()) - Offset::new(16 + 8, 0);
shape::ToifImage::new(icon_center, icon.toif)
.with_align(Alignment2D::CENTER)
.with_fg(style.text_color)
.with_fg(style.icon_color)
.render(target);
}
}
@ -227,7 +227,8 @@ impl Bip39Input {
// Styling the input to reflect already filled word
Self {
button: Button::with_icon(theme::ICON_LIST_CHECK).styled(theme::button_pin_confirm()),
button: Button::with_icon(theme::ICON_CONFIRM_INPUT)
.styled(theme::button_pin_confirm()),
textbox: TextBox::new(unwrap!(String::try_from(word))),
multi_tap: MultiTapKeyboard::new(),
options_num: bip39::options_num(word),
@ -293,7 +294,7 @@ impl Bip39Input {
self.button.enable(ctx);
self.button.set_stylesheet(ctx, theme::button_pin_confirm());
self.button
.set_content(ctx, ButtonContent::Icon(theme::ICON_LIST_CHECK));
.set_content(ctx, ButtonContent::Icon(theme::ICON_CONFIRM_INPUT));
self.button_suggestion
.set_stylesheet(ctx, theme::button_suggestion_confirm());
} else {
@ -302,7 +303,7 @@ impl Bip39Input {
self.button
.set_stylesheet(ctx, theme::button_pin_autocomplete());
self.button
.set_content(ctx, ButtonContent::Icon(theme::ICON_CLICK));
.set_content(ctx, ButtonContent::Icon(theme::ICON_AUTOFILL));
self.button_suggestion
.set_stylesheet(ctx, theme::button_suggestion_autocomplete());
}

@ -2,7 +2,7 @@ use crate::{
strutil::TString,
ui::{
component::{maybe::paint_overlapping, Child, Component, Event, EventCtx, Label, Maybe},
geometry::{Alignment2D, Grid, Offset, Rect},
geometry::{Alignment, Grid, Rect},
model_mercury::{
component::{Button, ButtonMsg, Swipe, SwipeDirection},
theme,
@ -44,23 +44,23 @@ where
Self {
prompt: Child::new(Maybe::new(
theme::BG,
Label::centered(prompt, theme::label_keyboard_prompt()),
Label::centered(prompt, theme::TEXT_MAIN_GREY_LIGHT),
prompt_visible,
)),
back: Child::new(Maybe::new(
theme::BG,
Button::with_icon_blend(
theme::IMAGE_BG_BACK_BTN_TALL,
theme::ICON_BACK,
Offset::new(30, 17),
)
.styled(theme::button_reset())
.with_long_press(theme::ERASE_HOLD_DURATION),
Button::with_icon(theme::ICON_DELETE)
.styled(theme::button_default())
.with_long_press(theme::ERASE_HOLD_DURATION),
!prompt_visible,
)),
input: Child::new(Maybe::new(theme::BG, input, !prompt_visible)),
keys: T::keys()
.map(|t| Button::with_text(t.into()).styled(theme::button_pin()))
.map(|t| {
Button::with_text(t.into())
.styled(theme::button_pin())
.with_text_align(Alignment::Center)
})
.map(Child::new),
swipe: Swipe::new().right(),
can_go_back,
@ -109,23 +109,27 @@ where
type Msg = MnemonicKeyboardMsg;
fn place(&mut self, bounds: Rect) -> Rect {
let (_, bounds) = bounds
.inset(theme::borders())
.split_bottom(4 * theme::MNEMONIC_BUTTON_HEIGHT + 3 * theme::KEYBOARD_SPACING);
let grid = Grid::new(bounds, 4, 3).with_spacing(theme::KEYBOARD_SPACING);
let back_area = grid.row_col(0, 0);
let input_area = grid.row_col(0, 1).union(grid.row_col(0, 3));
let prompt_center = grid.row_col(0, 0).union(grid.row_col(0, 3)).center();
let prompt_size = self.prompt.inner().inner().max_size();
let prompt_area = Rect::snap(prompt_center, prompt_size, Alignment2D::CENTER);
let height_input_area: i16 = 30;
let space_top: i16 = 8;
let (remaining, keyboard_area) =
bounds.split_bottom(3 * theme::BUTTON_HEIGHT + 2 * theme::KEYBOARD_SPACING);
let prompt_area = remaining
.split_top(space_top)
.1
.split_top(height_input_area)
.0;
assert!(prompt_area.height() == height_input_area);
let (back_btn_area, input_area) = prompt_area.split_left(30);
let keyboard_grid = Grid::new(keyboard_area, 3, 3).with_spacing(theme::KEYBOARD_SPACING);
self.swipe.place(bounds);
self.prompt.place(prompt_area);
self.back.place(back_area);
self.back.place(back_btn_area);
self.input.place(input_area);
for (key, btn) in self.keys.iter_mut().enumerate() {
btn.place(grid.cell(key + grid.cols)); // Start in the second row.
btn.place(keyboard_grid.cell(key));
}
bounds
}
@ -185,9 +189,12 @@ where
}
fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
self.prompt.render(target);
self.input.render(target);
self.back.render(target);
if self.input.inner().inner().is_empty() {
self.prompt.render(target);
} else {
self.input.render(target);
self.back.render(target);
}
for btn in &self.keys {
btn.render(target);

@ -181,7 +181,7 @@ impl Component for Slip39Input {
icon.draw(
icon_center,
Alignment2D::CENTER,
style.text_color,
style.icon_color,
style.button_color,
);
}
@ -247,7 +247,7 @@ impl Component for Slip39Input {
let icon_center = area.top_right().center(area.bottom_right()) - Offset::new(16 + 8, 0);
shape::ToifImage::new(icon_center, icon.toif)
.with_align(Alignment2D::CENTER)
.with_fg(style.text_color)
.with_fg(style.icon_color)
.render(target);
}
}
@ -356,7 +356,7 @@ impl Slip39Input {
// Confirm button.
self.button.enable(ctx);
self.button
.set_content(ctx, ButtonContent::Icon(theme::ICON_LIST_CHECK));
.set_content(ctx, ButtonContent::Icon(theme::ICON_CONFIRM_INPUT));
} else {
// Disabled button.
self.button.disable(ctx);

@ -22,7 +22,6 @@ use super::super::{
pub enum ConfirmResetDevice {
Intro,
Menu,
Confirm,
}
impl FlowState for ConfirmResetDevice {
@ -34,12 +33,7 @@ impl FlowState for ConfirmResetDevice {
(ConfirmResetDevice::Menu, SwipeDirection::Right) => {
Decision::Goto(ConfirmResetDevice::Intro, direction)
}
(ConfirmResetDevice::Intro, SwipeDirection::Up) => {
Decision::Goto(ConfirmResetDevice::Confirm, direction)
}
(ConfirmResetDevice::Confirm, SwipeDirection::Down) => {
Decision::Goto(ConfirmResetDevice::Intro, direction)
}
(ConfirmResetDevice::Intro, SwipeDirection::Up) => Decision::Return(FlowMsg::Confirmed),
_ => Decision::Nothing,
}
}
@ -53,9 +47,6 @@ impl FlowState for ConfirmResetDevice {
Decision::Goto(ConfirmResetDevice::Intro, SwipeDirection::Right)
}
(ConfirmResetDevice::Menu, FlowMsg::Choice(0)) => Decision::Return(FlowMsg::Cancelled),
(ConfirmResetDevice::Confirm, FlowMsg::Confirmed) => {
Decision::Return(FlowMsg::Confirmed)
}
_ => Decision::Nothing,
}
}

@ -192,6 +192,15 @@ impl ComponentMsgObj for ShareWords<'_> {
}
}
impl ComponentMsgObj for SelectWordCount {
fn msg_try_into_obj(&self, msg: Self::Msg) -> Result<Obj, Error> {
match msg {
SelectWordCountMsg::Selected(n) => n.try_into(),
_ => Err(Error::TypeError),
}
}
}
impl ComponentMsgObj for VerticalMenu {
fn msg_try_into_obj(&self, msg: Self::Msg) -> Result<Obj, Error> {
match msg {
@ -758,6 +767,18 @@ extern "C" fn new_show_info_with_cancel(n_args: usize, args: *const Obj, kwargs:
unsafe { util::try_with_args_and_kwargs(n_args, args, kwargs, block) }
}
extern "C" fn new_confirm_create_wallet(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
let block = move |_args: &[Obj], _kwargs: &Map| {
let content = PromptScreen::new_hold_to_confirm();
let obj = LayoutObj::new(
Frame::left_aligned(TR::reset__title_create_wallet.into(), content)
.with_footer(TR::instructions__hold_to_confirm.into(), None),
)?;
Ok(obj.into())
};
unsafe { util::try_with_args_and_kwargs(n_args, args, kwargs, block) }
}
extern "C" fn new_confirm_value(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
let block = move |_args: &[Obj], kwargs: &Map| {
let title: TString = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
@ -1331,8 +1352,9 @@ extern "C" fn new_confirm_backup_written_down(
args: *const Obj,
kwargs: *mut Map,
) -> Obj {
let block = move |_args: &[Obj], kwargs: &Map| {
let block = move |_args: &[Obj], _kwargs: &Map| {
let content = PromptScreen::new_hold_to_confirm();
// TODO: use TR
let frame_with_hold_to_confirm =
Frame::left_aligned("I wrote down all words in order.".into(), content)
.with_footer(TR::instructions__hold_to_confirm.into(), None);
@ -1413,17 +1435,13 @@ extern "C" fn new_show_checklist(n_args: usize, args: *const Obj, kwargs: *mut M
extern "C" fn new_confirm_recovery(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
let block = move |_args: &[Obj], kwargs: &Map| {
let title: TString = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
let _title: TString = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
let description: TString = kwargs.get(Qstr::MP_QSTR_description)?.try_into()?;
let button: TString = kwargs.get(Qstr::MP_QSTR_button)?.try_into()?;
let _button: TString = kwargs.get(Qstr::MP_QSTR_button)?.try_into()?;
let dry_run: bool = kwargs.get(Qstr::MP_QSTR_dry_run)?.try_into()?;
let info_button: bool = kwargs.get_or(Qstr::MP_QSTR_info_button, false)?;
let _info_button: bool = kwargs.get_or(Qstr::MP_QSTR_info_button, false)?;
let paragraphs = Paragraphs::new([
Paragraph::new(&theme::TEXT_DEMIBOLD, title),
Paragraph::new(&theme::TEXT_NORMAL, description),
])
.with_spacing(theme::RECOVERY_SPACING);
let paragraphs = Paragraphs::new([Paragraph::new(&theme::TEXT_NORMAL, description)]);
let notification: TString = if dry_run {
TR::recovery__title_dry_run.try_into()?
@ -1431,23 +1449,12 @@ extern "C" fn new_confirm_recovery(n_args: usize, args: *const Obj, kwargs: *mut
TR::recovery__title.try_into()?
};
let obj = if info_button {
LayoutObj::new(Frame::left_aligned(
notification,
Dialog::new(
paragraphs,
Button::cancel_info_confirm(
TR::buttons__continue.into(),
TR::buttons__more_info.into(),
),
),
))?
} else {
LayoutObj::new(Frame::left_aligned(
notification,
Dialog::new(paragraphs, Button::cancel_confirm_text(None, Some(button))),
))?
};
let content = SwipeUpScreen::new(paragraphs);
let obj = LayoutObj::new(
Frame::left_aligned(notification, content)
.with_footer(TR::instructions__swipe_up.into(), None)
.with_subtitle("Instructions".into()), // FIXME: use TR
)?;
Ok(obj.into())
};
unsafe { util::try_with_args_and_kwargs(n_args, args, kwargs, block) }
@ -1455,21 +1462,11 @@ extern "C" fn new_confirm_recovery(n_args: usize, args: *const Obj, kwargs: *mut
extern "C" fn new_select_word_count(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
let block = move |_args: &[Obj], kwargs: &Map| {
let dry_run: bool = kwargs.get(Qstr::MP_QSTR_dry_run)?.try_into()?;
let title: TString = if dry_run {
TR::recovery__title_dry_run.try_into()?
} else {
TR::recovery__title.try_into()?
};
let paragraphs = Paragraphs::new(Paragraph::new(
&theme::TEXT_DEMIBOLD,
TR::recovery__select_num_of_words,
));
let _dry_run: bool = kwargs.get(Qstr::MP_QSTR_dry_run)?.try_into()?;
let obj = LayoutObj::new(Frame::left_aligned(
title,
Dialog::new(paragraphs, SelectWordCount::new()),
TR::recovery__select_num_of_words.into(),
SelectWordCount::new(),
))?;
Ok(obj.into())
};
@ -1825,6 +1822,10 @@ pub static mp_module_trezorui2: Module = obj_module! {
/// """Confirm TOS before device setup."""
Qstr::MP_QSTR_confirm_reset_device => obj_fn_kw!(0, flow::confirm_reset_device::new_confirm_reset_device).as_obj(),
/// def confirm_create_wallet() -> LayoutObj[UiResult]:
/// """Confirm creating wallet"""
Qstr::MP_QSTR_confirm_create_wallet => obj_fn_kw!(0, new_confirm_create_wallet).as_obj(),
/// def show_address_details(
/// *,
/// qr_title: str,

Binary file not shown.

Before

Width:  |  Height:  |  Size: 542 B

After

Width:  |  Height:  |  Size: 534 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 526 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 484 B

After

Width:  |  Height:  |  Size: 389 B

@ -88,6 +88,7 @@ include_icon!(ICON_WARNING, "model_mercury/res/warning24.toif");
// 30x30
include_icon!(ICON_AUTOFILL, "model_mercury/res/autofill30.toif");
include_icon!(ICON_CLOSE, "model_mercury/res/close30.toif");
include_icon!(ICON_CONFIRM_INPUT, "model_mercury/res/confirm_input30.toif");
include_icon!(ICON_DELETE, "model_mercury/res/delete30.toif");
include_icon!(ICON_MENU, "model_mercury/res/menu30.toif");
include_icon!(
@ -411,27 +412,29 @@ pub const fn button_pin() -> ButtonStyleSheet {
}
}
// TODO: will button_pin_xyz styles be the same for PIN and Mnemonic keyboard?
// Wait for Figma
pub const fn button_pin_confirm() -> ButtonStyleSheet {
ButtonStyleSheet {
normal: &ButtonStyle {
font: Font::MONO,
text_color: FG,
button_color: GREEN,
icon_color: GREY_LIGHT,
button_color: BG,
icon_color: GREEN_LIGHT,
background_color: BG,
},
active: &ButtonStyle {
font: Font::MONO,
text_color: FG,
button_color: GREEN_DARK,
icon_color: GREY_LIGHT,
button_color: GREY_DARK,
icon_color: GREEN_LIGHT,
background_color: BG,
},
disabled: &ButtonStyle {
font: Font::MONO,
text_color: GREY_LIGHT,
button_color: GREY_DARK,
icon_color: GREY_LIGHT,
text_color: FG,
button_color: BG,
icon_color: GREEN_LIGHT,
background_color: BG,
},
}
@ -442,20 +445,20 @@ pub const fn button_pin_autocomplete() -> ButtonStyleSheet {
normal: &ButtonStyle {
font: Font::MONO,
text_color: FG,
button_color: GREY_DARK, // same as PIN buttons
button_color: BG,
icon_color: GREY_LIGHT,
background_color: BG,
},
active: &ButtonStyle {
font: Font::MONO,
text_color: FG,
button_color: GREEN_DARK,
button_color: BG,
icon_color: GREY_LIGHT,
background_color: BG,
},
disabled: &ButtonStyle {
font: Font::MONO,
text_color: GREY_LIGHT,
text_color: FG,
button_color: BG,
icon_color: GREY_LIGHT,
background_color: BG,
@ -467,7 +470,7 @@ pub const fn button_suggestion_confirm() -> ButtonStyleSheet {
ButtonStyleSheet {
normal: &ButtonStyle {
font: Font::MONO,
text_color: GREEN_DARK,
text_color: GREY_LIGHT,
button_color: GREEN,
icon_color: GREY_LIGHT,
background_color: BG,

@ -154,6 +154,11 @@ def confirm_reset_device(
"""Confirm TOS before device setup."""
# rust/src/ui/model_mercury/layout.rs
def confirm_create_wallet() -> LayoutObj[UiResult]:
"""Confirm creating wallet"""
# rust/src/ui/model_mercury/layout.rs
def show_address_details(
*,

@ -228,11 +228,12 @@ def draw_simple(layout: Any) -> None:
ui.backlight_fade(ui.style.BACKLIGHT_NORMAL)
async def raise_if_not_confirmed(a: Awaitable[T], exc: Any = ActionCancelled) -> T:
async def raise_if_not_confirmed(
a: Awaitable[ui.UiResult], exc: Any = ActionCancelled
) -> None:
result = await a
if result is not CONFIRMED:
raise exc
return result
async def confirm_action(
@ -322,22 +323,36 @@ async def confirm_single(
async def confirm_reset_device(title: str, recovery: bool = False) -> None:
await raise_if_not_confirmed(
interact(
if recovery:
await raise_if_not_confirmed(
interact(
RustLayout(
trezorui2.confirm_reset_device(
title=title,
button="", # not used
)
),
"recover_device",
ButtonRequestType.ProtectCall,
)
)
else:
# creating wallet shows TOS first and then an extra screen confirms
await raise_if_not_confirmed(
RustLayout(
trezorui2.confirm_reset_device(
title=title,
button="", # not used
)
),
"recover_device" if recovery else "setup_device",
(
ButtonRequestType.ProtectCall
if recovery
else ButtonRequestType.ResetDevice
),
)
)
await raise_if_not_confirmed(
interact(
RustLayout(trezorui2.confirm_create_wallet()),
"setup_device",
ButtonRequestType.ResetDevice,
)
)
async def prompt_backup() -> bool:
@ -565,15 +580,12 @@ async def show_success(
subheader: str | None = None,
button: str | None = None,
) -> None:
button = button or TR.buttons__continue # def_arg
await raise_if_not_confirmed(
interact(
RustLayout(
trezorui2.show_success(
title=subheader or "",
title=content,
description="",
button=button.upper(),
allow_cancel=False,
)
),
br_type,

@ -160,9 +160,7 @@ async def show_recovery_warning(
RustLayout(
trezorui2.show_warning(
title=content,
description=subheader or "",
button=button.upper(),
allow_cancel=False,
value="Try again", # TODO: use TR
)
),
br_type,

@ -41,10 +41,7 @@ async def show_share_words(
result = await interact(
RustLayout(
trezorui2.confirm_backup_written_down(
title=title,
pages=share_words,
),
trezorui2.confirm_backup_written_down(),
),
"backup_words",
ButtonRequestType.ResetDevice,

Loading…
Cancel
Save