arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-05-27 11:18:51 +00:00
Code Issues Releases Wiki Activity

chore(eckhart): text screen subtitle

Browse Source
This commit is contained in:
Lukas Bielesch 2025-03-26 09:39:36 +01:00 committed by obrusvit
parent 3263abe5fb
commit 4f5f5449a3
1 changed files with 40 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,16 +1,23 @@
use crate::ui::{ use crate::{
component::{ strutil::TString,
swipe_detect::SwipeConfig, ui::{
text::paragraphs::{Checklist, ParagraphSource, Paragraphs}, component::{
Component, Event, EventCtx, FormattedText, PaginateFull, swipe_detect::SwipeConfig,
text::paragraphs::{Checklist, ParagraphSource, Paragraphs},
Component, Event, EventCtx, FormattedText, Label, PaginateFull,
},
flow::Swipable,
geometry::{Insets, Rect},
shape::Renderer,
util::Pager,
}, },
flow::Swipable,
geometry::{Insets, Rect},
shape::Renderer,
util::Pager,
}; };
use super::{action_bar::ActionBarMsg, theme::SIDE_INSETS, ActionBar, Header, HeaderMsg, Hint}; use super::{
action_bar::ActionBarMsg,
theme::{self, SIDE_INSETS},
ActionBar, Header, HeaderMsg, Hint,
};
/// Full-screen component for rendering text. /// Full-screen component for rendering text.
/// ///
@ -22,6 +29,7 @@ use super::{action_bar::ActionBarMsg, theme::SIDE_INSETS, ActionBar, Header, Hea
/// - Action bar (Optional) /// - Action bar (Optional)
pub struct TextScreen<T> { pub struct TextScreen<T> {
header: Option<Header>, header: Option<Header>,
subtitle: Option<Label<'static>>,
content: T, content: T,
hint: Option<Hint<'static>>, hint: Option<Hint<'static>>,
action_bar: Option<ActionBar>, action_bar: Option<ActionBar>,
@ -40,10 +48,12 @@ where
T: AllowedTextContent, T: AllowedTextContent,
{ {
const CONTENT_INSETS: Insets = SIDE_INSETS; const CONTENT_INSETS: Insets = SIDE_INSETS;
const SUBTITLE_HEIGHT: i16 = 44;
pub fn new(content: T) -> Self { pub fn new(content: T) -> Self {
Self { Self {
header: None, header: None,
subtitle: None,
content, content,
hint: None, hint: None,
action_bar: None, action_bar: None,
@ -55,6 +65,14 @@ where
self self
} }
pub fn with_subtitle(mut self, subtitle: TString<'static>) -> Self {
if !subtitle.is_empty() {
self.subtitle =
Some(Label::left_aligned(subtitle, theme::TEXT_MEDIUM_EXTRA_LIGHT).top_aligned());
}
self
}
pub fn with_hint(mut self, hint: Hint<'static>) -> Self { pub fn with_hint(mut self, hint: Hint<'static>) -> Self {
self.hint = Some(hint); self.hint = Some(hint);
self self
@ -86,6 +104,14 @@ where
fn place(&mut self, bounds: Rect) -> Rect { fn place(&mut self, bounds: Rect) -> Rect {
let (header_area, rest) = bounds.split_top(Header::HEADER_HEIGHT); let (header_area, rest) = bounds.split_top(Header::HEADER_HEIGHT);
let (rest, action_bar_area) = rest.split_bottom(ActionBar::ACTION_BAR_HEIGHT); let (rest, action_bar_area) = rest.split_bottom(ActionBar::ACTION_BAR_HEIGHT);
let rest = if let Some(subtitle) = &mut self.subtitle {
let (subtitle_area, rest) = rest.split_top(Self::SUBTITLE_HEIGHT);
subtitle.place(subtitle_area.inset(SIDE_INSETS));
rest
} else {
rest
};
let content_area = if let Some(hint) = &mut self.hint { let content_area = if let Some(hint) = &mut self.hint {
let (rest, hint_area) = rest.split_bottom(hint.height()); let (rest, hint_area) = rest.split_bottom(hint.height());
hint.place(hint_area); hint.place(hint_area);
@ -128,6 +154,7 @@ where
fn render<'s>(&'s self, target: &mut impl Renderer<'s>) { fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
self.header.render(target); self.header.render(target);
self.subtitle.render(target);
self.hint.render(target); self.hint.render(target);
self.action_bar.render(target); self.action_bar.render(target);
self.content.render(target); self.content.render(target);
@ -163,6 +190,9 @@ where
if let Some(header) = self.header.as_ref() { if let Some(header) = self.header.as_ref() {
header.trace(t); header.trace(t);
} }
if let Some(subtitle) = self.subtitle.as_ref() {
subtitle.trace(t);
}
self.content.trace(t); self.content.trace(t);
if let Some(hint) = self.hint.as_ref() { if let Some(hint) = self.hint.as_ref() {
hint.trace(t); hint.trace(t);