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

chore(eckhart): remove unused ButtonStyle field

Browse Source 
[no changelog]
This commit is contained in:
obrusvit 2025-07-12 00:36:31 +02:00 committed by Vít Obrusník
parent a9f25e9ebe
commit d3c4aeaa60
4 changed files with 2 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/embed/rust/src/ui/layout_eckhart/component/button.rs
View File

@ -386,10 +386,10 @@ impl Button {
match self.radius_or_gradient {
RadiusOrGradient::Radius(radius) => {
shape::Bar::new(self.area)
.with_bg(style.background_color)
.with_bg(style.button_color)
.with_fg(style.button_color)
.with_radius(radius as i16)
.with_thickness(2)
.with_fg(style.button_color)
.with_alpha(alpha)
.render(target);
}
@ -744,7 +744,6 @@ pub struct ButtonStyle {
pub text_color: Color,
pub button_color: Color,
pub icon_color: Color,
pub background_color: Color,
}
#[derive(PartialEq, Eq, Clone)]

21
core/embed/rust/src/ui/layout_eckhart/theme/bootloader.rs
View File

@ -33,21 +33,18 @@ pub fn button_confirm() -> ButtonStyleSheet {
text_color: GREY_EXTRA_LIGHT,
button_color: BLUE,
icon_color: GREY_EXTRA_LIGHT,
background_color: BLD_BG,
},
active: &ButtonStyle {
font: fonts::FONT_SATOSHI_MEDIUM_26,
text_color: GREY_EXTRA_LIGHT,
button_color: GREY_SUPER_DARK,
icon_color: GREY_EXTRA_LIGHT,
background_color: BLD_BG,
},
disabled: &ButtonStyle {
font: fonts::FONT_SATOSHI_MEDIUM_26,
text_color: BLD_FG,
button_color: GREY_DARK,
icon_color: BLD_BG,
background_color: BLD_FG,
},
}
}
@ -59,21 +56,18 @@ pub fn button_cancel() -> ButtonStyleSheet {
text_color: GREY_EXTRA_LIGHT,
button_color: GREY_SUPER_DARK,
icon_color: GREY_EXTRA_LIGHT,
background_color: BLD_BG,
},
active: &ButtonStyle {
font: fonts::FONT_SATOSHI_MEDIUM_26,
text_color: GREY_LIGHT,
button_color: GREY_DARK,
icon_color: GREY_LIGHT,
background_color: BLD_BG,
},
disabled: &ButtonStyle {
font: fonts::FONT_SATOSHI_MEDIUM_26,
text_color: BLD_FG,
button_color: GREY_DARK,
icon_color: BLD_BG,
background_color: BLD_FG,
},
}
}
@ -85,21 +79,18 @@ pub const fn button_header() -> ButtonStyleSheet {
text_color: GREY_LIGHT,
button_color: BLD_BG,
icon_color: GREY_LIGHT,
background_color: BLD_BG,
},
active: &ButtonStyle {
font: fonts::FONT_SATOSHI_MEDIUM_26,
text_color: GREY_LIGHT,
button_color: GREY_SUPER_DARK,
icon_color: GREY_LIGHT,
background_color: BLD_BG,
},
disabled: &ButtonStyle {
font: fonts::FONT_SATOSHI_MEDIUM_26,
text_color: GREY_LIGHT,
button_color: BLD_BG,
icon_color: GREY_LIGHT,
background_color: BLD_BG,
},
}
}
@ -111,21 +102,18 @@ pub fn button_wipe_confirm() -> ButtonStyleSheet {
text_color: GREY_EXTRA_LIGHT,
button_color: RED,
icon_color: GREY_EXTRA_LIGHT,
background_color: RED,
},
active: &ButtonStyle {
font: fonts::FONT_SATOSHI_MEDIUM_26,
text_color: RED,
button_color: GREY_EXTRA_LIGHT,
icon_color: RED,
background_color: GREY_EXTRA_LIGHT,
},
disabled: &ButtonStyle {
font: fonts::FONT_SATOSHI_MEDIUM_26,
text_color: BLD_FG,
button_color: GREY_DARK,
icon_color: BLD_FG,
background_color: BLD_FG,
},
}
}
@ -137,21 +125,18 @@ pub fn button_bld_menu() -> ButtonStyleSheet {
text_color: GREY_EXTRA_LIGHT,
button_color: BLD_BG,
icon_color: GREY_EXTRA_LIGHT,
background_color: BLD_BG,
},
active: &ButtonStyle {
font: fonts::FONT_SATOSHI_REGULAR_38,
text_color: GREY_DARK,
button_color: GREY_SUPER_DARK,
icon_color: GREY_DARK,
background_color: GREY_SUPER_DARK,
},
disabled: &ButtonStyle {
font: fonts::FONT_SATOSHI_REGULAR_38,
text_color: GREY_DARK,
button_color: BLD_BG,
icon_color: GREY_DARK,
background_color: BLD_BG,
},
}
}
@ -163,21 +148,18 @@ pub fn button_bld_menu_danger() -> ButtonStyleSheet {
text_color: ORANGE,
button_color: BLD_BG,
icon_color: ORANGE,
background_color: BLD_BG,
},
active: &ButtonStyle {
font: fonts::FONT_SATOSHI_REGULAR_38,
text_color: GREY_DARK,
button_color: GREY_SUPER_DARK,
icon_color: GREY_DARK,
background_color: GREY_SUPER_DARK,
},
disabled: &ButtonStyle {
font: fonts::FONT_SATOSHI_REGULAR_38,
text_color: GREY_DARK,
button_color: BLD_BG,
icon_color: GREY_DARK,
background_color: BLD_BG,
},
}
}
@ -190,21 +172,18 @@ pub fn button_welcome_screen() -> ButtonStyleSheet {
text_color: GREY_LIGHT,
button_color: BLD_BG,
icon_color: GREY_LIGHT,
background_color: BLD_BG,
},
active: &ButtonStyle {
font: fonts::FONT_SATOSHI_MEDIUM_26,
text_color: GREY_EXTRA_LIGHT,
button_color: GREY_SUPER_DARK,
icon_color: GREY_EXTRA_LIGHT,
background_color: BLD_BG,
},
disabled: &ButtonStyle {
font: fonts::FONT_SATOSHI_MEDIUM_26,
text_color: GREY,
button_color: BLD_BG,
icon_color: GREY,
background_color: BLD_FG,
},
}
}

46
core/embed/rust/src/ui/layout_eckhart/theme/firmware.rs
View File

@ -179,21 +179,18 @@ pub const fn button_confirm() -> ButtonStyleSheet {
text_color: GREEN_LIGHT,
button_color: GREEN_DARK,
icon_color: GREEN_LIGHT,
background_color: GREEN_DARK,
},
active: &ButtonStyle {
font: fonts::FONT_SATOSHI_MEDIUM_26,
text_color: GREEN,
button_color: GREEN_EXTRA_DARK,
icon_color: GREEN,
background_color: BG,
},
disabled: &ButtonStyle {
font: fonts::FONT_SATOSHI_MEDIUM_26,
text_color: GREY_LIGHT,
button_color: GREY_DARK,
icon_color: GREY_LIGHT,
background_color: GREY_DARK,
},
}
}
@ -205,21 +202,18 @@ pub const fn button_cancel() -> ButtonStyleSheet {
text_color: ORANGE,
button_color: BG,
icon_color: ORANGE,
background_color: BG,
},
active: &ButtonStyle {
font: fonts::FONT_SATOSHI_MEDIUM_26,
text_color: ORANGE_DIMMED,
button_color: ORANGE_EXTRA_DARK,
icon_color: ORANGE_DIMMED,
background_color: ORANGE_EXTRA_DARK,
},
disabled: &ButtonStyle {
font: fonts::FONT_SATOSHI_MEDIUM_26,
text_color: GREY_EXTRA_DARK,
button_color: BG,
icon_color: GREY_EXTRA_DARK,
background_color: BG,
},
}
}
@ -231,21 +225,18 @@ pub const fn button_actionbar_right_default() -> ButtonStyleSheet {
text_color: GREY_LIGHT,
button_color: GREY_EXTRA_DARK,
icon_color: GREY_LIGHT,
background_color: GREY_EXTRA_DARK,
},
active: &ButtonStyle {
font: fonts::FONT_SATOSHI_MEDIUM_26,
text_color: GREY_DARK,
button_color: GREY_SUPER_DARK,
icon_color: GREY_DARK,
background_color: BG,
},
disabled: &ButtonStyle {
font: fonts::FONT_SATOSHI_MEDIUM_26,
text_color: GREY_EXTRA_DARK,
button_color: BG,
icon_color: GREY_EXTRA_DARK,
background_color: BG,
},
}
}
@ -257,21 +248,18 @@ pub const fn button_actionbar_danger() -> ButtonStyleSheet {
text_color: ORANGE,
button_color: ORANGE_SUPER_DARK,
icon_color: ORANGE,
background_color: BG,
},
active: &ButtonStyle {
font: fonts::FONT_SATOSHI_MEDIUM_26,
text_color: ORANGE,
button_color: ORANGE_DARK,
icon_color: ORANGE,
background_color: BG,
},
disabled: &ButtonStyle {
font: fonts::FONT_SATOSHI_MEDIUM_26,
text_color: ORANGE,
button_color: GREY_DARK,
icon_color: GREY_LIGHT,
background_color: GREY_DARK,
},
}
}
@ -283,21 +271,18 @@ pub const fn button_header() -> ButtonStyleSheet {
text_color: GREY_LIGHT,
button_color: BG,
icon_color: GREY_LIGHT,
background_color: BG,
},
active: &ButtonStyle {
font: fonts::FONT_SATOSHI_MEDIUM_26,
text_color: GREY_LIGHT,
button_color: GREY_SUPER_DARK,
icon_color: GREY_LIGHT,
background_color: BG,
},
disabled: &ButtonStyle {
font: fonts::FONT_SATOSHI_MEDIUM_26,
text_color: GREY_LIGHT,
button_color: BG,
icon_color: GREY_LIGHT,
background_color: BG,
},
}
}
@ -311,21 +296,18 @@ macro_rules! menu_item_title {
text_color: $color,
button_color: BG,
icon_color: $color,
background_color: BG,
},
active: &ButtonStyle {
font: fonts::FONT_SATOSHI_REGULAR_38,
text_color: GREY_DARK,
button_color: GREY_SUPER_DARK,
icon_color: GREY_DARK,
background_color: GREY_SUPER_DARK,
},
disabled: &ButtonStyle {
font: fonts::FONT_SATOSHI_REGULAR_38,
text_color: GREY_DARK,
button_color: BG,
icon_color: GREY_DARK,
background_color: BG,
},
}
};
@ -355,14 +337,12 @@ macro_rules! button_homebar_style {
text_color: GREY_LIGHT,
button_color: $button_color,
icon_color: $icon_color,
background_color: BG,
},
active: &ButtonStyle {
font: fonts::FONT_SATOSHI_MEDIUM_26,
text_color: GREY_LIGHT,
button_color: GREY_SUPER_DARK,
icon_color: GREY_LIGHT,
background_color: GREY_SUPER_DARK,
},
// unused
disabled: &ButtonStyle {
@ -370,7 +350,6 @@ macro_rules! button_homebar_style {
text_color: GREY_LIGHT,
button_color: GREY_SUPER_DARK,
icon_color: GREY_LIGHT,
background_color: GREY_SUPER_DARK,
},
}
};
@ -393,14 +372,12 @@ pub const fn button_select_word() -> ButtonStyleSheet {
text_color: GREY_EXTRA_LIGHT,
button_color: BG,
icon_color: GREY_EXTRA_LIGHT,
background_color: BG,
},
active: &ButtonStyle {
font: fonts::FONT_SATOSHI_EXTRALIGHT_46,
text_color: GREY_DARK,
button_color: GREY_SUPER_DARK,
icon_color: GREY_DARK,
background_color: GREY_SUPER_DARK,
},
// unused
disabled: &ButtonStyle {
@ -408,7 +385,6 @@ pub const fn button_select_word() -> ButtonStyleSheet {
text_color: BG,
button_color: BG,
icon_color: BG,
background_color: BG,
},
}
}
@ -420,21 +396,18 @@ pub const fn button_keyboard() -> ButtonStyleSheet {
text_color: GREY_EXTRA_LIGHT,
button_color: BG,
icon_color: GREY_LIGHT,
background_color: BG,
},
active: &ButtonStyle {
font: fonts::FONT_SATOSHI_EXTRALIGHT_46,
text_color: GREY_DARK,
button_color: GREY_SUPER_DARK,
icon_color: GREY_DARK,
background_color: GREY_SUPER_DARK,
},
disabled: &ButtonStyle {
font: fonts::FONT_SATOSHI_EXTRALIGHT_46,
text_color: GREY_EXTRA_DARK,
button_color: BG,
icon_color: GREY_EXTRA_DARK,
background_color: BG,
},
}
}
@ -446,21 +419,18 @@ pub const fn button_keyboard_numeric() -> ButtonStyleSheet {
text_color: GREY_EXTRA_LIGHT,
button_color: BG,
icon_color: GREY_LIGHT,
background_color: BG,
},
active: &ButtonStyle {
font: fonts::FONT_SATOSHI_EXTRALIGHT_72,
text_color: GREY_DARK,
button_color: GREY_SUPER_DARK,
icon_color: GREY_DARK,
background_color: GREY_SUPER_DARK,
},
disabled: &ButtonStyle {
font: fonts::FONT_SATOSHI_EXTRALIGHT_72,
text_color: GREY_EXTRA_DARK,
button_color: BG,
icon_color: GREY_EXTRA_DARK,
background_color: BG,
},
}
}
@ -472,21 +442,18 @@ pub const fn button_keyboard_confirm() -> ButtonStyleSheet {
text_color: GREEN_LIGHT, // unused
button_color: BG,
icon_color: GREEN_LIGHT,
background_color: BG,
},
active: &ButtonStyle {
font: fonts::FONT_SATOSHI_REGULAR_22, // unused
text_color: GREEN, // unused
button_color: GREEN_EXTRA_DARK,
icon_color: GREEN,
background_color: GREEN_EXTRA_DARK,
},
disabled: &ButtonStyle {
font: fonts::FONT_SATOSHI_REGULAR_22, // unused
text_color: GREY_EXTRA_DARK, // unused
button_color: BG,
icon_color: GREY_EXTRA_DARK,
background_color: BG,
},
}
}
@ -498,14 +465,12 @@ pub const fn button_keyboard_next() -> ButtonStyleSheet {
text_color: GREY_EXTRA_LIGHT,
button_color: BG,
icon_color: GREY_EXTRA_LIGHT,
background_color: BG,
},
active: &ButtonStyle {
font: fonts::FONT_SATOSHI_MEDIUM_26,
text_color: GREY_DARK,
button_color: GREY_SUPER_DARK,
icon_color: GREY_DARK,
background_color: GREY_SUPER_DARK,
},
// not used
disabled: &ButtonStyle {
@ -513,7 +478,6 @@ pub const fn button_keyboard_next() -> ButtonStyleSheet {
text_color: BG,
button_color: BG,
icon_color: BG,
background_color: BG,
},
}
}
@ -525,7 +489,6 @@ pub const fn button_always_disabled() -> ButtonStyleSheet {
text_color: GREY,
button_color: BG,
icon_color: GREY,
background_color: BG,
};
ButtonStyleSheet {
normal: style,
@ -541,21 +504,18 @@ pub const fn input_mnemonic() -> ButtonStyleSheet {
text_color: GREY_LIGHT,
button_color: BG,
icon_color: GREY_LIGHT,
background_color: BG,
},
active: &ButtonStyle {
font: fonts::FONT_SATOSHI_REGULAR_38,
text_color: GREY_LIGHT,
button_color: GREY_SUPER_DARK,
icon_color: GREY_LIGHT,
background_color: GREY_SUPER_DARK,
},
disabled: &ButtonStyle {
font: fonts::FONT_SATOSHI_REGULAR_38,
text_color: GREY_LIGHT,
button_color: BG,
icon_color: GREY_LIGHT,
background_color: BG,
},
}
}
@ -567,21 +527,18 @@ pub const fn input_mnemonic_suggestion() -> ButtonStyleSheet {
text_color: GREY_DARK,
button_color: BG,
icon_color: GREY_DARK,
background_color: BG,
},
active: &ButtonStyle {
font: fonts::FONT_SATOSHI_REGULAR_38,
text_color: GREY_LIGHT,
button_color: BG,
icon_color: GREY_LIGHT,
background_color: BG,
},
disabled: &ButtonStyle {
font: fonts::FONT_SATOSHI_REGULAR_38,
text_color: BG,
button_color: BG,
icon_color: BG,
background_color: BG,
},
}
}
@ -593,14 +550,12 @@ pub const fn input_mnemonic_confirm() -> ButtonStyleSheet {
text_color: GREEN_LIGHT,
button_color: BG,
icon_color: GREEN_LIGHT,
background_color: BG,
},
active: &ButtonStyle {
font: fonts::FONT_SATOSHI_REGULAR_38,
text_color: GREEN_LIGHT,
button_color: GREEN_EXTRA_DARK,
icon_color: GREEN_LIGHT,
background_color: GREEN_EXTRA_DARK,
},
disabled: &ButtonStyle {
// unused
@ -608,7 +563,6 @@ pub const fn input_mnemonic_confirm() -> ButtonStyleSheet {
text_color: BG,
button_color: BG,
icon_color: BG,
background_color: BG,
},
}
}

3
core/embed/rust/src/ui/layout_eckhart/theme/mod.rs
View File

@ -170,21 +170,18 @@ pub const fn button_default() -> ButtonStyleSheet {
text_color: GREY_LIGHT,
button_color: BG,
icon_color: GREY_LIGHT,
background_color: BG,
},
active: &ButtonStyle {
font: fonts::FONT_SATOSHI_MEDIUM_26,
text_color: GREY_LIGHT,
button_color: GREY_SUPER_DARK,
icon_color: GREY_LIGHT,
background_color: BG,
},
disabled: &ButtonStyle {
font: fonts::FONT_SATOSHI_MEDIUM_26,
text_color: GREY,
button_color: BG,
icon_color: GREY,
background_color: BG,
},
}
}