arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-03-12 14:16:06 +00:00
Code Issues Releases Wiki Activity

chore(eckhart): add new action bar mode

Browse Source
This commit is contained in:
Lukas Bielesch 2025-03-04 15:30:23 +01:00 committed by obrusvit
parent 9bec18733e
commit 0452c54556
1 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
core/embed/rust/src/ui/layout_eckhart/firmware/action_bar.rs
View File

@ -1,7 +1,7 @@
use crate::{ use crate::{
translations::TR, translations::TR,
ui::{ ui::{
component::{Component, Event, EventCtx}, component::{Component, Event, EventCtx, Timeout},
geometry::{Alignment2D, Insets, Offset, Rect}, geometry::{Alignment2D, Insets, Offset, Rect},
shape::{self, Renderer}, shape::{self, Renderer},
util::{animation_disabled, Pager}, util::{animation_disabled, Pager},
@ -29,6 +29,8 @@ pub struct ActionBar {
right_original: Option<(ButtonContent, ButtonStyleSheet)>, right_original: Option<(ButtonContent, ButtonStyleSheet)>,
/// Hold to confirm animation /// Hold to confirm animation
htc_anim: Option<HoldToConfirmAnim>, htc_anim: Option<HoldToConfirmAnim>,
/// Timeout
timeout: Option<Timeout>,
} }
pub enum ActionBarMsg { pub enum ActionBarMsg {
@ -48,6 +50,8 @@ enum Mode {
Single, Single,
/// Cancel and confirm button; Up/Down navigation for paginated content /// Cancel and confirm button; Up/Down navigation for paginated content
Double { pager: Pager }, Double { pager: Pager },
/// Automatic confirmation after a timeout
Timeout,
} }
impl ActionBar { impl ActionBar {
@ -68,6 +72,18 @@ impl ActionBar {
Mode::Single, Mode::Single,
None, None,
button.with_expanded_touch_area(Self::BUTTON_EXPAND_TOUCH), button.with_expanded_touch_area(Self::BUTTON_EXPAND_TOUCH),
None,
)
}
/// Create action bar with single button confirming the layout
pub fn new_timeout(button: Button, timeout_ms: u32) -> Self {
Self::new(
Mode::Timeout,
None,
button
.initially_enabled(false),
Some(Timeout::new(timeout_ms)),
) )
} }
@ -86,6 +102,7 @@ impl ActionBar {
right right
.with_expanded_touch_area(Self::BUTTON_EXPAND_TOUCH) .with_expanded_touch_area(Self::BUTTON_EXPAND_TOUCH)
.with_content_offset(Self::BUTTON_CONTENT_OFFSET.neg()), .with_content_offset(Self::BUTTON_CONTENT_OFFSET.neg()),
None,
) )
} }
@ -140,7 +157,12 @@ impl ActionBar {
} }
} }
fn new(mode: Mode, left_button: Option<Button>, right_button: Button) -> Self { fn new(
mode: Mode,
left_button: Option<Button>,
right_button: Button,
timeout: Option<Timeout>,
) -> Self {
let (left_original, right_original) = match mode { let (left_original, right_original) = match mode {
Mode::Double { .. } => ( Mode::Double { .. } => (
left_button left_button
@ -172,6 +194,7 @@ impl ActionBar {
left_original, left_original,
right_original, right_original,
htc_anim, htc_anim,
timeout,
} }
} }
@ -225,7 +248,7 @@ impl ActionBar {
fn place_buttons(&mut self, bounds: Rect) { fn place_buttons(&mut self, bounds: Rect) {
match &self.mode { match &self.mode {
Mode::Single => { Mode::Single | Mode::Timeout => {
self.right_button.place(bounds); self.right_button.place(bounds);
} }
Mode::Double { pager } => { Mode::Double { pager } => {
@ -259,6 +282,16 @@ impl Component for ActionBar {
fn event(&mut self, ctx: &mut EventCtx, event: Event) -> Option<Self::Msg> { fn event(&mut self, ctx: &mut EventCtx, event: Event) -> Option<Self::Msg> {
self.htc_anim.event(ctx, event); self.htc_anim.event(ctx, event);
match &self.mode { match &self.mode {
Mode::Timeout => {
if self
.timeout
.as_mut()
.and_then(|t| t.event(ctx, event))
.is_some()
{
return Some(ActionBarMsg::Confirmed);
}
}
Mode::Single => { Mode::Single => {
// Only handle confirm button // Only handle confirm button
if let Some(msg) = self.right_button.event(ctx, event) { if let Some(msg) = self.right_button.event(ctx, event) {