arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-05-04 07:59:06 +00:00
Code Issues Releases Wiki Activity

chore(eckhart): update page count and add page limit for textscreen

Browse Source
This commit is contained in:
Lukas Bielesch 2025-04-04 12:33:06 +02:00
parent b5964185b7
commit 67c9614c4d
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
core/embed/rust/src/ui/layout_eckhart/firmware/text_screen.rs
View File

@ -33,6 +33,7 @@ pub struct TextScreen<T> {
content: T, content: T,
hint: Option<Hint<'static>>, hint: Option<Hint<'static>>,
action_bar: Option<ActionBar>, action_bar: Option<ActionBar>,
page_limit: Option<u16>,
// TODO: swipe handling // TODO: swipe handling
// TODO: animations // TODO: animations
} }
@ -57,6 +58,7 @@ where
content, content,
hint: None, hint: None,
action_bar: Some(ActionBar::new_paginate_only()), action_bar: Some(ActionBar::new_paginate_only()),
page_limit: None,
} }
} }
@ -83,9 +85,15 @@ where
self self
} }
pub fn with_page_limit(mut self, page_limit: u16) -> Self {
self.page_limit = Some(page_limit);
self
}
fn update_page(&mut self, page_idx: u16) { fn update_page(&mut self, page_idx: u16) {
self.content.change_page(page_idx); self.content.change_page(page_idx);
let pager = self.content.pager(); let pager = self.content_pager();
if let Some(hint) = self.hint.as_mut() { if let Some(hint) = self.hint.as_mut() {
hint.update(pager); hint.update(pager);
} }
@ -93,6 +101,14 @@ where
ab.update(pager) ab.update(pager)
}; };
} }
fn content_pager(&self) -> Pager {
if let Some(page_limit) = self.page_limit {
self.content.pager().with_limit(page_limit)
} else {
self.content.pager()
}
}
} }
impl<T> Component for TextScreen<T> impl<T> Component for TextScreen<T>
@ -128,6 +144,8 @@ where
} }
fn event(&mut self, ctx: &mut EventCtx, event: Event) -> Option<Self::Msg> { fn event(&mut self, ctx: &mut EventCtx, event: Event) -> Option<Self::Msg> {
// Update page count of the screen
ctx.set_page_count(self.content_pager().total() as usize);
if let Some(msg) = self.header.event(ctx, event) { if let Some(msg) = self.header.event(ctx, event) {
match msg { match msg {
HeaderMsg::Cancelled => return Some(TextScreenMsg::Cancelled), HeaderMsg::Cancelled => return Some(TextScreenMsg::Cancelled),
@ -140,11 +158,11 @@ where
ActionBarMsg::Cancelled => return Some(TextScreenMsg::Cancelled), ActionBarMsg::Cancelled => return Some(TextScreenMsg::Cancelled),
ActionBarMsg::Confirmed => return Some(TextScreenMsg::Confirmed), ActionBarMsg::Confirmed => return Some(TextScreenMsg::Confirmed),
ActionBarMsg::Prev => { ActionBarMsg::Prev => {
self.update_page(self.content.pager().prev()); self.update_page(self.content_pager().prev());
return None; return None;
} }
ActionBarMsg::Next => { ActionBarMsg::Next => {
self.update_page(self.content.pager().next()); self.update_page(self.content_pager().next());
return None; return None;
} }
} }
@ -166,7 +184,7 @@ where
T: AllowedTextContent, T: AllowedTextContent,
{ {
fn get_pager(&self) -> Pager { fn get_pager(&self) -> Pager {
self.content.pager() self.content_pager()
} }
fn get_swipe_config(&self) -> SwipeConfig { fn get_swipe_config(&self) -> SwipeConfig {
SwipeConfig::default() SwipeConfig::default()
@ -200,5 +218,9 @@ where
if let Some(ab) = self.action_bar.as_ref() { if let Some(ab) = self.action_bar.as_ref() {
t.child("ActionBar", ab); t.child("ActionBar", ab);
} }
if let Some(page_limit) = self.page_limit {
t.int("page_limit", page_limit as i64);
}
t.int("page_count", self.content.pager().total() as i64);
} }
} }