arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-26 09:28:13 +00:00
Code Issues Releases Wiki Activity

feat(core/ui): T3T1 word count choice

Browse Source
This commit is contained in:
obrusvit 2024-04-24 23:46:02 +02:00 committed by Martin Milata
parent 8f4e0cc885
commit 0566f0b7c3
2 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
core/embed/rust/src/ui/model_mercury/component/keyboard/word_count.rs
View File

@ -1,6 +1,6 @@
use crate::ui::{ use crate::ui::{
component::{Component, Event, EventCtx}, component::{Component, Event, EventCtx},
geometry::{Grid, GridCellSpan, Rect}, geometry::{Alignment, Grid, GridCellSpan, Rect},
model_mercury::{ model_mercury::{
component::button::{Button, ButtonMsg}, component::button::{Button, ButtonMsg},
theme, theme,
@ -10,7 +10,7 @@ use crate::ui::{
const NUMBERS: [u32; 5] = [12, 18, 20, 24, 33]; const NUMBERS: [u32; 5] = [12, 18, 20, 24, 33];
const LABELS: [&str; 5] = ["12", "18", "20", "24", "33"]; const LABELS: [&str; 5] = ["12", "18", "20", "24", "33"];
const CELLS: [(usize, usize); 5] = [(0, 0), (0, 2), (0, 4), (1, 0), (1, 2)]; const CELLS: [(usize, usize); 5] = [(0, 0), (0, 2), (1, 0), (1, 2), (2, 1)];
pub struct SelectWordCount { pub struct SelectWordCount {
button: [Button; NUMBERS.len()], button: [Button; NUMBERS.len()],
@ -23,7 +23,11 @@ pub enum SelectWordCountMsg {
impl SelectWordCount { impl SelectWordCount {
pub fn new() -> Self { pub fn new() -> Self {
SelectWordCount { SelectWordCount {
button: LABELS.map(|t| Button::with_text(t.into()).styled(theme::button_pin())), button: LABELS.map(|t| {
Button::with_text(t.into())
.styled(theme::button_pin())
.with_text_align(Alignment::Center)
}),
} }
} }
} }
@ -32,8 +36,13 @@ impl Component for SelectWordCount {
type Msg = SelectWordCountMsg; type Msg = SelectWordCountMsg;
fn place(&mut self, bounds: Rect) -> Rect { fn place(&mut self, bounds: Rect) -> Rect {
let (_, bounds) = bounds.split_bottom(2 * theme::BUTTON_HEIGHT + theme::BUTTON_SPACING); let n_rows: usize = 3;
let grid = Grid::new(bounds, 2, 6).with_spacing(theme::BUTTON_SPACING); let n_cols: usize = 4;
let (_, bounds) = bounds.split_bottom(
n_rows as i16 * theme::BUTTON_HEIGHT + (n_rows as i16 - 1) * theme::BUTTON_SPACING,
);
let grid = Grid::new(bounds, n_rows, n_cols).with_spacing(theme::BUTTON_SPACING);
for (btn, (x, y)) in self.button.iter_mut().zip(CELLS) { for (btn, (x, y)) in self.button.iter_mut().zip(CELLS) {
btn.place(grid.cells(GridCellSpan { btn.place(grid.cells(GridCellSpan {
from: (x, y), from: (x, y),

22
core/embed/rust/src/ui/model_mercury/theme/mod.rs
View File

@ -388,22 +388,22 @@ pub const fn button_reset() -> ButtonStyleSheet {
pub const fn button_pin() -> ButtonStyleSheet { pub const fn button_pin() -> ButtonStyleSheet {
ButtonStyleSheet { ButtonStyleSheet {
normal: &ButtonStyle { normal: &ButtonStyle {
font: Font::MONO, font: Font::NORMAL,
text_color: FG, text_color: GREY_LIGHT,
button_color: GREY_DARK, button_color: GREY_EXTRA_DARK,
icon_color: GREY_LIGHT, icon_color: GREY_LIGHT,
background_color: BG, background_color: BG,
}, },
active: &ButtonStyle { active: &ButtonStyle {
font: Font::MONO, font: Font::NORMAL,
text_color: FG, text_color: GREY_LIGHT,
button_color: GREY_MEDIUM, button_color: GREY_EXTRA_DARK,
icon_color: GREY_LIGHT, icon_color: GREY_LIGHT,
background_color: BG, background_color: BG,
}, },
disabled: &ButtonStyle { disabled: &ButtonStyle {
font: Font::MONO, font: Font::NORMAL,
text_color: GREY_LIGHT, text_color: GREY_DARK,
button_color: BG, // so there is no "button" itself, just the text button_color: BG, // so there is no "button" itself, just the text
icon_color: GREY_LIGHT, icon_color: GREY_LIGHT,
background_color: BG, background_color: BG,
@ -639,9 +639,9 @@ pub const TEXT_CHECKLIST_DONE: TextStyle =
TextStyle::new(Font::NORMAL, GREEN_DARK, BG, GREY_LIGHT, GREY_LIGHT); TextStyle::new(Font::NORMAL, GREEN_DARK, BG, GREY_LIGHT, GREY_LIGHT);
pub const CONTENT_BORDER: i16 = 0; pub const CONTENT_BORDER: i16 = 0;
pub const BUTTON_HEIGHT: i16 = 50; pub const BUTTON_HEIGHT: i16 = 62;
pub const BUTTON_WIDTH: i16 = 56; pub const BUTTON_WIDTH: i16 = 78;
pub const BUTTON_SPACING: i16 = 6; pub const BUTTON_SPACING: i16 = 2;
pub const KEYBOARD_SPACING: i16 = BUTTON_SPACING; pub const KEYBOARD_SPACING: i16 = BUTTON_SPACING;
pub const CHECKLIST_SPACING: i16 = 10; pub const CHECKLIST_SPACING: i16 = 10;
pub const RECOVERY_SPACING: i16 = 18; pub const RECOVERY_SPACING: i16 = 18;