Merge 593a2aa196 into fa8d6a4a60
Vít Obrusník
2 weeks ago
committed by
GitHub
commit
e5d288b1c7
@ -0,0 +1,210 @@
|
||||
use crate::{
|
||||
error,
|
||||
strutil::TString,
|
||||
translations::TR,
|
||||
ui::{
|
||||
component::{text::paragraphs::Paragraph, ComponentExt, SwipeDirection},
|
||||
flow::{base::Decision, flow_store, FlowMsg, FlowState, FlowStore, SwipeFlow, SwipePage},
|
||||
},
|
||||
};
|
||||
|
||||
use super::super::{
|
||||
component::{Frame, FrameMsg, PromptScreen, VerticalMenu, VerticalMenuChoiceMsg},
|
||||
theme,
|
||||
};
|
||||
|
||||
// TODO: merge with code from https://github.com/trezor/trezor-firmware/pull/3805
|
||||
// when ready
|
||||
|
||||
#[derive(Copy, Clone, PartialEq, Eq, ToPrimitive)]
|
||||
pub enum ConfirmAction {
|
||||
Intro,
|
||||
Menu,
|
||||
Confirm,
|
||||
}
|
||||
|
||||
/// ConfirmAction flow without a separate "Tap to confirm" or "Hold to confirm"
|
||||
/// screen. Swiping up directly from the intro screen confirms action.
|
||||
#[derive(Copy, Clone, PartialEq, Eq, ToPrimitive)]
|
||||
pub enum ConfirmActionSimple {
|
||||
Intro,
|
||||
Menu,
|
||||
}
|
||||
|
||||
impl FlowState for ConfirmAction {
|
||||
fn handle_swipe(&self, direction: SwipeDirection) -> Decision<Self> {
|
||||
match (self, direction) {
|
||||
(ConfirmAction::Intro, SwipeDirection::Left) => {
|
||||
Decision::Goto(ConfirmAction::Menu, direction)
|
||||
}
|
||||
(ConfirmAction::Menu, SwipeDirection::Right) => {
|
||||
Decision::Goto(ConfirmAction::Intro, direction)
|
||||
}
|
||||
(ConfirmAction::Intro, SwipeDirection::Up) => {
|
||||
Decision::Goto(ConfirmAction::Confirm, direction)
|
||||
}
|
||||
(ConfirmAction::Confirm, SwipeDirection::Down) => {
|
||||
Decision::Goto(ConfirmAction::Intro, direction)
|
||||
}
|
||||
(ConfirmAction::Confirm, SwipeDirection::Left) => {
|
||||
Decision::Goto(ConfirmAction::Menu, direction)
|
||||
}
|
||||
_ => Decision::Nothing,
|
||||
}
|
||||
}
|
||||
|
||||
fn handle_event(&self, msg: FlowMsg) -> Decision<Self> {
|
||||
match (self, msg) {
|
||||
(ConfirmAction::Intro, FlowMsg::Info) => {
|
||||
Decision::Goto(ConfirmAction::Menu, SwipeDirection::Left)
|
||||
}
|
||||
(ConfirmAction::Menu, FlowMsg::Cancelled) => {
|
||||
Decision::Goto(ConfirmAction::Intro, SwipeDirection::Right)
|
||||
}
|
||||
(ConfirmAction::Menu, FlowMsg::Choice(0)) => Decision::Return(FlowMsg::Cancelled),
|
||||
(ConfirmAction::Confirm, FlowMsg::Confirmed) => Decision::Return(FlowMsg::Confirmed),
|
||||
(ConfirmAction::Confirm, FlowMsg::Info) => {
|
||||
Decision::Goto(ConfirmAction::Menu, SwipeDirection::Left)
|
||||
}
|
||||
_ => Decision::Nothing,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl FlowState for ConfirmActionSimple {
|
||||
fn handle_swipe(&self, direction: SwipeDirection) -> Decision<Self> {
|
||||
match (self, direction) {
|
||||
(ConfirmActionSimple::Intro, SwipeDirection::Left) => {
|
||||
Decision::Goto(ConfirmActionSimple::Menu, direction)
|
||||
}
|
||||
(ConfirmActionSimple::Menu, SwipeDirection::Right) => {
|
||||
Decision::Goto(ConfirmActionSimple::Intro, direction)
|
||||
}
|
||||
(ConfirmActionSimple::Intro, SwipeDirection::Up) => {
|
||||
Decision::Return(FlowMsg::Confirmed)
|
||||
}
|
||||
_ => Decision::Nothing,
|
||||
}
|
||||
}
|
||||
|
||||
fn handle_event(&self, msg: FlowMsg) -> Decision<Self> {
|
||||
match (self, msg) {
|
||||
(ConfirmActionSimple::Intro, FlowMsg::Info) => {
|
||||
Decision::Goto(ConfirmActionSimple::Menu, SwipeDirection::Left)
|
||||
}
|
||||
(ConfirmActionSimple::Menu, FlowMsg::Cancelled) => {
|
||||
Decision::Goto(ConfirmActionSimple::Intro, SwipeDirection::Right)
|
||||
}
|
||||
(ConfirmActionSimple::Menu, FlowMsg::Choice(0)) => Decision::Return(FlowMsg::Cancelled),
|
||||
_ => Decision::Nothing,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
use crate::{
|
||||
micropython::{map::Map, obj::Obj, qstr::Qstr, util},
|
||||
ui::{
|
||||
component::text::paragraphs::{ParagraphSource, ParagraphVecShort, VecExt},
|
||||
layout::obj::LayoutObj,
|
||||
},
|
||||
};
|
||||
|
||||
#[allow(clippy::not_unsafe_ptr_arg_deref)]
|
||||
pub extern "C" fn new_confirm_action(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
|
||||
unsafe { util::try_with_args_and_kwargs(n_args, args, kwargs, new_confirm_action_obj) }
|
||||
}
|
||||
|
||||
fn new_confirm_action_obj(_args: &[Obj], kwargs: &Map) -> Result<Obj, error::Error> {
|
||||
let title: TString = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
|
||||
let action: Option<TString> = kwargs.get(Qstr::MP_QSTR_action)?.try_into_option()?;
|
||||
let description: Option<TString> = kwargs.get(Qstr::MP_QSTR_description)?.try_into_option()?;
|
||||
// let verb: Option<TString> = kwargs
|
||||
// .get(Qstr::MP_QSTR_verb)
|
||||
// .unwrap_or_else(|_| Obj::const_none())
|
||||
// .try_into_option()?;
|
||||
let verb_cancel: Option<TString> = kwargs
|
||||
.get(Qstr::MP_QSTR_verb_cancel)
|
||||
.unwrap_or_else(|_| Obj::const_none())
|
||||
.try_into_option()?;
|
||||
let reverse: bool = kwargs.get_or(Qstr::MP_QSTR_reverse, false)?;
|
||||
let hold: bool = kwargs.get_or(Qstr::MP_QSTR_hold, false)?;
|
||||
// let hold_danger: bool = kwargs.get_or(Qstr::MP_QSTR_hold_danger, false)?;
|
||||
let prompt_screen: bool = kwargs.get_or(Qstr::MP_QSTR_prompt_screen, false)?;
|
||||
|
||||
let paragraphs = {
|
||||
let action = action.unwrap_or("".into());
|
||||
let description = description.unwrap_or("".into());
|
||||
let mut paragraphs = ParagraphVecShort::new();
|
||||
if !reverse {
|
||||
paragraphs
|
||||
.add(Paragraph::new(&theme::TEXT_MAIN_GREY_LIGHT, action))
|
||||
.add(Paragraph::new(&theme::TEXT_MAIN_GREY_LIGHT, description));
|
||||
} else {
|
||||
paragraphs
|
||||
.add(Paragraph::new(&theme::TEXT_MAIN_GREY_LIGHT, description))
|
||||
.add(Paragraph::new(&theme::TEXT_MAIN_GREY_LIGHT, action));
|
||||
}
|
||||
paragraphs.into_paragraphs()
|
||||
};
|
||||
|
||||
let content_intro = Frame::left_aligned(title, SwipePage::vertical(paragraphs))
|
||||
.with_menu_button()
|
||||
.with_footer(TR::instructions__swipe_up.into(), None)
|
||||
.map(|msg| matches!(msg, FrameMsg::Button(_)).then_some(FlowMsg::Info));
|
||||
|
||||
let content_menu = if let Some(verb_cancel) = verb_cancel {
|
||||
Frame::left_aligned(
|
||||
"".into(),
|
||||
VerticalMenu::empty().danger(theme::ICON_CANCEL, verb_cancel.into()),
|
||||
)
|
||||
} else {
|
||||
Frame::left_aligned(
|
||||
"".into(),
|
||||
VerticalMenu::empty().danger(theme::ICON_CANCEL, TR::buttons__cancel.into()),
|
||||
)
|
||||
}
|
||||
.with_cancel_button()
|
||||
.map(move |msg| match msg {
|
||||
FrameMsg::Content(VerticalMenuChoiceMsg::Selected(_)) => Some(FlowMsg::Choice(0)),
|
||||
FrameMsg::Button(_) => Some(FlowMsg::Cancelled),
|
||||
});
|
||||
|
||||
if !prompt_screen {
|
||||
let store = flow_store().add(content_intro)?.add(content_menu)?;
|
||||
let res = SwipeFlow::new(ConfirmActionSimple::Intro, store)?;
|
||||
return Ok(LayoutObj::new(res)?.into());
|
||||
} else {
|
||||
let (prompt, prompt_action) = if hold {
|
||||
(
|
||||
PromptScreen::new_hold_to_confirm(),
|
||||
TR::instructions__hold_to_confirm.into(),
|
||||
)
|
||||
} else {
|
||||
(
|
||||
PromptScreen::new_tap_to_confirm(),
|
||||
TR::instructions__tap_to_confirm.into(),
|
||||
)
|
||||
};
|
||||
|
||||
let content_confirm = Frame::left_aligned(title, prompt)
|
||||
.with_footer(prompt_action, None)
|
||||
.with_menu_button();
|
||||
// .with_overlapping_content();
|
||||
|
||||
// if let Some(subtitle) = subtitle {
|
||||
// content_confirm = content_confirm.with_subtitle(subtitle);
|
||||
// }
|
||||
|
||||
let content_confirm = content_confirm.map(move |msg| match msg {
|
||||
FrameMsg::Content(()) => Some(FlowMsg::Confirmed),
|
||||
FrameMsg::Button(_) => Some(FlowMsg::Info),
|
||||
});
|
||||
|
||||
let store = flow_store()
|
||||
.add(content_intro)?
|
||||
.add(content_menu)?
|
||||
.add(content_confirm)?;
|
||||
let res = SwipeFlow::new(ConfirmAction::Intro, store)?;
|
||||
return Ok(LayoutObj::new(res)?.into());
|
||||
};
|
||||
}
|
||||
@ -0,0 +1,145 @@
|
||||
use crate::{
|
||||
error,
|
||||
micropython::qstr::Qstr,
|
||||
strutil::TString,
|
||||
translations::TR,
|
||||
ui::{
|
||||
component::{
|
||||
text::paragraphs::{Paragraph, Paragraphs},
|
||||
ComponentExt, SwipeDirection,
|
||||
},
|
||||
flow::{base::Decision, flow_store, FlowMsg, FlowState, FlowStore, SwipeFlow, SwipePage},
|
||||
},
|
||||
};
|
||||
|
||||
use super::super::{
|
||||
component::{
|
||||
CancelInfoConfirmMsg, Frame, FrameMsg, PromptScreen, VerticalMenu, VerticalMenuChoiceMsg,
|
||||
},
|
||||
theme,
|
||||
};
|
||||
|
||||
#[derive(Copy, Clone, PartialEq, Eq, ToPrimitive)]
|
||||
pub enum SetNewPin {
|
||||
Intro,
|
||||
Menu,
|
||||
CancelPinIntro,
|
||||
CancelPinConfirm,
|
||||
}
|
||||
|
||||
impl FlowState for SetNewPin {
|
||||
fn handle_swipe(&self, direction: SwipeDirection) -> Decision<Self> {
|
||||
match (self, direction) {
|
||||
(SetNewPin::Intro, SwipeDirection::Left) => Decision::Goto(SetNewPin::Menu, direction),
|
||||
(SetNewPin::CancelPinIntro, SwipeDirection::Up) => {
|
||||
Decision::Goto(SetNewPin::CancelPinConfirm, direction)
|
||||
}
|
||||
(SetNewPin::CancelPinConfirm, SwipeDirection::Down) => {
|
||||
Decision::Goto(SetNewPin::CancelPinIntro, direction)
|
||||
}
|
||||
(SetNewPin::Intro, SwipeDirection::Up) => Decision::Return(FlowMsg::Confirmed),
|
||||
_ => Decision::Nothing,
|
||||
}
|
||||
}
|
||||
|
||||
fn handle_event(&self, msg: FlowMsg) -> Decision<Self> {
|
||||
match (self, msg) {
|
||||
(SetNewPin::Intro, FlowMsg::Info) => {
|
||||
Decision::Goto(SetNewPin::Menu, SwipeDirection::Left)
|
||||
}
|
||||
(SetNewPin::Menu, FlowMsg::Choice(0)) => {
|
||||
Decision::Goto(SetNewPin::CancelPinIntro, SwipeDirection::Left)
|
||||
}
|
||||
(SetNewPin::Menu, FlowMsg::Cancelled) => {
|
||||
Decision::Goto(SetNewPin::Intro, SwipeDirection::Right)
|
||||
}
|
||||
(SetNewPin::CancelPinIntro, FlowMsg::Cancelled) => {
|
||||
Decision::Goto(SetNewPin::Menu, SwipeDirection::Right)
|
||||
}
|
||||
(SetNewPin::CancelPinConfirm, FlowMsg::Cancelled) => {
|
||||
Decision::Goto(SetNewPin::CancelPinIntro, SwipeDirection::Right)
|
||||
}
|
||||
(SetNewPin::CancelPinConfirm, FlowMsg::Confirmed) => {
|
||||
Decision::Return(FlowMsg::Cancelled)
|
||||
}
|
||||
_ => Decision::Nothing,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
use crate::{
|
||||
micropython::{map::Map, obj::Obj, util},
|
||||
ui::layout::obj::LayoutObj,
|
||||
};
|
||||
|
||||
#[allow(clippy::not_unsafe_ptr_arg_deref)]
|
||||
pub extern "C" fn new_set_new_pin(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
|
||||
unsafe { util::try_with_args_and_kwargs(n_args, args, kwargs, SetNewPin::new_obj) }
|
||||
}
|
||||
|
||||
impl SetNewPin {
|
||||
fn new_obj(_args: &[Obj], kwargs: &Map) -> Result<Obj, error::Error> {
|
||||
// TODO: supply more arguments for Wipe code setting when figma done
|
||||
let title: TString = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
|
||||
let description: TString = kwargs.get(Qstr::MP_QSTR_description)?.try_into()?;
|
||||
|
||||
let par_array: [Paragraph<'static>; 1] =
|
||||
[Paragraph::new(&theme::TEXT_MAIN_GREY_LIGHT, description)];
|
||||
let paragraphs = Paragraphs::new(par_array);
|
||||
let content_intro = Frame::left_aligned(title, SwipePage::vertical(paragraphs))
|
||||
.with_menu_button()
|
||||
.with_footer(TR::instructions__swipe_up.into(), None)
|
||||
.map(|msg| {
|
||||
matches!(msg, FrameMsg::Button(CancelInfoConfirmMsg::Info)).then_some(FlowMsg::Info)
|
||||
});
|
||||
|
||||
let content_menu = Frame::left_aligned(
|
||||
"".into(),
|
||||
VerticalMenu::empty().danger(theme::ICON_CANCEL, TR::pin__cancel_setup.into()),
|
||||
)
|
||||
.with_cancel_button()
|
||||
.map(|msg| match msg {
|
||||
FrameMsg::Content(VerticalMenuChoiceMsg::Selected(i)) => Some(FlowMsg::Choice(i)),
|
||||
FrameMsg::Button(CancelInfoConfirmMsg::Cancelled) => Some(FlowMsg::Cancelled),
|
||||
FrameMsg::Button(_) => None,
|
||||
});
|
||||
|
||||
let par_array_cancel_intro: [Paragraph<'static>; 2] = [
|
||||
Paragraph::new(&theme::TEXT_WARNING, TR::words__not_recommended),
|
||||
Paragraph::new(&theme::TEXT_MAIN_GREY_LIGHT, TR::pin__cancel_info),
|
||||
];
|
||||
let paragraphs_cancel_intro = Paragraphs::new(par_array_cancel_intro);
|
||||
let content_cancel_intro = Frame::left_aligned(
|
||||
TR::pin__cancel_setup.into(),
|
||||
SwipePage::vertical(paragraphs_cancel_intro),
|
||||
)
|
||||
.with_cancel_button()
|
||||
.with_footer(
|
||||
TR::instructions__swipe_up.into(),
|
||||
Some(TR::pin__cancel_description.into()),
|
||||
)
|
||||
.map(|msg| match msg {
|
||||
FrameMsg::Button(CancelInfoConfirmMsg::Cancelled) => Some(FlowMsg::Cancelled),
|
||||
_ => None,
|
||||
});
|
||||
|
||||
let content_cancel_confirm = Frame::left_aligned(
|
||||
TR::pin__cancel_setup.into(),
|
||||
PromptScreen::new_tap_to_cancel(),
|
||||
)
|
||||
.with_footer(TR::instructions__tap_to_confirm.into(), None)
|
||||
.map(|msg| match msg {
|
||||
FrameMsg::Content(()) => Some(FlowMsg::Confirmed),
|
||||
FrameMsg::Button(CancelInfoConfirmMsg::Cancelled) => Some(FlowMsg::Cancelled),
|
||||
_ => None,
|
||||
});
|
||||
|
||||
let store = flow_store()
|
||||
.add(content_intro)?
|
||||
.add(content_menu)?
|
||||
.add(content_cancel_intro)?
|
||||
.add(content_cancel_confirm)?;
|
||||
let res = SwipeFlow::new(SetNewPin::Intro, store)?;
|
||||
Ok(LayoutObj::new(res)?.into())
|
||||
}
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Loading…
Reference in new issue