From 79d14b8907ce2a5f4dbcfe664d61d7987ef45311 Mon Sep 17 00:00:00 2001 From: tychovrahe Date: Thu, 13 Feb 2025 16:17:32 +0100 Subject: [PATCH] fix(core): fix TS5 bootloader font [no changelog] --- .../fonts/font_tthoves_bold_17.rs | 328 ++++++++++++++++++ .../rust/src/ui/layout_delizia/fonts/mod.rs | 8 +- .../src/ui/layout_delizia/theme/bootloader.rs | 36 +- core/tools/codegen/gen_font.py | 10 +- 4 files changed, 362 insertions(+), 20 deletions(-) create mode 100644 core/embed/rust/src/ui/layout_delizia/fonts/font_tthoves_bold_17.rs diff --git a/core/embed/rust/src/ui/layout_delizia/fonts/font_tthoves_bold_17.rs b/core/embed/rust/src/ui/layout_delizia/fonts/font_tthoves_bold_17.rs new file mode 100644 index 0000000000..aab3e04a1c --- /dev/null +++ b/core/embed/rust/src/ui/layout_delizia/fonts/font_tthoves_bold_17.rs @@ -0,0 +1,328 @@ +//! This file is generated by core/tools/codegen/gen_font.py +#![cfg_attr(any(), rustfmt::skip)] +#![allow(non_upper_case_globals)] +// Each glyph: +// - first two bytes: width, height +// - next three bytes: advance, bearingX, bearingY +// - rest is packed 4-bit glyph data + +use crate::ui::display::font::FontInfo; + +/// ' ' (ASCII 32) +const Font_TTHoves_Bold_17_glyph_32: [u8; 5] = [ 0, 0, 5, 0, 0 ]; + +/// '!' (ASCII 33) +const Font_TTHoves_Bold_17_glyph_33: [u8; 29] = [ 4, 12, 5, 1, 12, 250, 31, 250, 31, 250, 31, 250, 31, 250, 31, 248, 15, 247, 14, 245, 12, 16, 1, 200, 12, 250, 31, 250, 31 ]; + +/// '"' (ASCII 34) +const Font_TTHoves_Bold_17_glyph_34: [u8; 17] = [ 6, 4, 8, 1, 12, 255, 148, 191, 255, 148, 191, 255, 148, 191, 255, 148, 191 ]; + +/// '#' (ASCII 35) +const Font_TTHoves_Bold_17_glyph_35: [u8; 89] = [ 13, 12, 13, 0, 12, 0, 0, 254, 8, 251, 10, 0, 0, 16, 255, 4, 254, 7, 0, 16, 116, 255, 85, 255, 71, 1, 144, 255, 255, 255, 255, 255, 2, 192, 255, 255, 255, 255, 239, 0, 0, 224, 127, 192, 159, 0, 0, 0, 241, 79, 240, 95, 0, 0, 247, 255, 255, 255, 255, 79, 0, 250, 255, 255, 255, 255, 15, 0, 67, 253, 75, 251, 77, 4, 0, 0, 255, 6, 252, 8, 0, 0, 48, 255, 2, 255, 5, 0, 0 ]; + +/// '$' (ASCII 36) +const Font_TTHoves_Bold_17_glyph_36: [u8; 101] = [ 11, 16, 11, 0, 14, 0, 0, 254, 9, 0, 0, 0, 0, 254, 10, 0, 0, 0, 248, 255, 223, 5, 0, 144, 255, 255, 255, 95, 0, 241, 239, 54, 248, 223, 0, 243, 159, 0, 160, 238, 0, 241, 239, 72, 1, 0, 0, 144, 255, 255, 223, 7, 0, 0, 198, 255, 255, 159, 0, 0, 0, 32, 247, 255, 0, 230, 78, 0, 144, 255, 2, 243, 239, 53, 229, 255, 0, 160, 255, 255, 255, 143, 0, 0, 248, 255, 239, 7, 0, 0, 0, 254, 10, 0, 0, 0, 0, 254, 9, 0, 0 ]; + +/// '%' (ASCII 37) +const Font_TTHoves_Bold_17_glyph_37: [u8; 89] = [ 14, 12, 14, 0, 12, 48, 252, 43, 0, 176, 207, 0, 241, 239, 223, 0, 245, 47, 0, 245, 9, 252, 2, 254, 8, 0, 241, 223, 223, 144, 223, 0, 0, 64, 252, 43, 243, 79, 0, 0, 0, 0, 0, 252, 10, 0, 0, 0, 0, 96, 255, 81, 171, 3, 0, 0, 225, 127, 246, 255, 47, 0, 0, 250, 12, 253, 132, 143, 0, 64, 255, 3, 253, 64, 159, 0, 208, 159, 0, 248, 236, 79, 0, 247, 30, 0, 128, 222, 6 ]; + +/// '&' (ASCII 38) +const Font_TTHoves_Bold_17_glyph_38: [u8; 77] = [ 12, 12, 11, 0, 12, 0, 197, 223, 8, 0, 0, 80, 255, 255, 175, 0, 0, 176, 223, 165, 255, 0, 0, 176, 191, 80, 255, 0, 0, 80, 255, 250, 191, 0, 0, 0, 249, 255, 28, 0, 0, 64, 255, 255, 4, 135, 4, 242, 191, 249, 79, 255, 6, 245, 47, 144, 255, 255, 1, 244, 143, 66, 254, 159, 0, 192, 255, 255, 255, 239, 2, 16, 216, 223, 41, 252, 46 ]; + +/// ''' (ASCII 39) +const Font_TTHoves_Bold_17_glyph_39: [u8; 13] = [ 3, 4, 4, 1, 12, 255, 4, 255, 4, 255, 4, 255, 4 ]; + +/// '(' (ASCII 40) +const Font_TTHoves_Bold_17_glyph_40: [u8; 53] = [ 6, 16, 7, 1, 12, 0, 252, 13, 64, 255, 5, 176, 223, 0, 241, 143, 0, 245, 63, 0, 248, 15, 0, 250, 14, 0, 252, 12, 0, 252, 12, 0, 250, 14, 0, 248, 15, 0, 245, 63, 0, 241, 143, 0, 176, 223, 0, 64, 255, 5, 0, 252, 13 ]; + +/// ')' (ASCII 41) +const Font_TTHoves_Bold_17_glyph_41: [u8; 53] = [ 6, 16, 7, 0, 12, 245, 79, 0, 192, 223, 0, 80, 255, 4, 0, 255, 9, 0, 250, 14, 0, 247, 15, 0, 246, 47, 0, 244, 79, 0, 244, 79, 0, 246, 47, 0, 247, 15, 0, 250, 14, 0, 255, 9, 80, 255, 4, 192, 223, 0, 245, 79, 0 ]; + +/// '*' (ASCII 42) +const Font_TTHoves_Bold_17_glyph_42: [u8; 33] = [ 8, 7, 8, 0, 12, 0, 176, 15, 0, 48, 160, 15, 17, 242, 221, 191, 127, 162, 254, 255, 91, 0, 248, 207, 0, 80, 207, 248, 10, 16, 43, 176, 3 ]; + +/// '+' (ASCII 43) +const Font_TTHoves_Bold_17_glyph_43: [u8; 45] = [ 9, 8, 10, 0, 9, 0, 96, 239, 0, 0, 0, 96, 239, 0, 0, 0, 96, 239, 0, 0, 242, 255, 255, 255, 10, 242, 255, 255, 255, 10, 96, 166, 255, 102, 4, 0, 96, 239, 0, 0, 0, 96, 239, 0, 0 ]; + +/// ',' (ASCII 44) +const Font_TTHoves_Bold_17_glyph_44: [u8; 15] = [ 4, 5, 5, 0, 3, 240, 207, 240, 143, 241, 79, 243, 31, 244, 13 ]; + +/// '-' (ASCII 45) +const Font_TTHoves_Bold_17_glyph_45: [u8; 17] = [ 7, 3, 8, 0, 6, 242, 255, 255, 11, 242, 255, 255, 11, 96, 102, 102, 4 ]; + +/// '.' (ASCII 46) +const Font_TTHoves_Bold_17_glyph_46: [u8; 11] = [ 3, 3, 5, 1, 3, 204, 10, 255, 12, 255, 12 ]; + +/// '/' (ASCII 47) +const Font_TTHoves_Bold_17_glyph_47: [u8; 69] = [ 8, 16, 7, 0, 12, 0, 0, 247, 31, 0, 0, 252, 12, 0, 16, 255, 7, 0, 80, 255, 3, 0, 160, 239, 0, 0, 224, 159, 0, 0, 243, 95, 0, 0, 248, 15, 0, 0, 252, 11, 0, 16, 255, 7, 0, 96, 255, 2, 0, 176, 223, 0, 0, 240, 159, 0, 0, 244, 79, 0, 0, 249, 15, 0, 0, 253, 11, 0, 0 ]; + +/// '0' (ASCII 48) +const Font_TTHoves_Bold_17_glyph_48: [u8; 77] = [ 11, 12, 12, 0, 12, 0, 80, 235, 157, 1, 0, 0, 249, 255, 255, 62, 0, 80, 255, 191, 253, 223, 0, 208, 255, 3, 160, 255, 5, 240, 191, 0, 32, 255, 8, 242, 143, 0, 0, 255, 11, 242, 143, 0, 0, 255, 11, 240, 191, 0, 32, 255, 8, 208, 255, 3, 160, 255, 5, 80, 255, 191, 253, 223, 0, 0, 249, 255, 255, 62, 0, 0, 80, 235, 173, 1, 0 ]; + +/// '1' (ASCII 49) +const Font_TTHoves_Bold_17_glyph_49: [u8; 41] = [ 6, 12, 7, 0, 12, 0, 242, 159, 132, 251, 159, 247, 255, 159, 247, 255, 159, 0, 241, 159, 0, 241, 159, 0, 241, 159, 0, 241, 159, 0, 241, 159, 0, 241, 159, 0, 241, 159, 0, 241, 159 ]; + +/// '2' (ASCII 50) +const Font_TTHoves_Bold_17_glyph_50: [u8; 65] = [ 10, 12, 10, 0, 12, 0, 180, 238, 43, 0, 80, 255, 255, 255, 3, 224, 255, 253, 255, 12, 243, 175, 0, 254, 15, 49, 19, 0, 253, 15, 0, 0, 144, 255, 11, 0, 0, 250, 223, 1, 0, 193, 255, 29, 0, 32, 253, 207, 1, 0, 225, 255, 175, 153, 25, 242, 255, 255, 255, 47, 242, 255, 255, 255, 47 ]; + +/// '3' (ASCII 51) +const Font_TTHoves_Bold_17_glyph_51: [u8; 65] = [ 10, 12, 10, 0, 12, 0, 180, 238, 59, 0, 112, 255, 255, 255, 3, 241, 255, 202, 255, 12, 178, 107, 0, 253, 15, 0, 0, 99, 255, 11, 0, 0, 255, 223, 2, 0, 0, 255, 239, 3, 0, 0, 48, 254, 14, 197, 92, 0, 251, 31, 243, 255, 186, 255, 15, 144, 255, 255, 255, 6, 0, 197, 238, 75, 0 ]; + +/// '4' (ASCII 52) +const Font_TTHoves_Bold_17_glyph_52: [u8; 65] = [ 10, 12, 10, 0, 12, 0, 16, 255, 255, 5, 0, 144, 255, 255, 5, 0, 242, 255, 255, 5, 0, 251, 126, 255, 5, 64, 255, 103, 255, 5, 208, 239, 96, 255, 5, 246, 95, 96, 255, 5, 251, 255, 255, 255, 159, 251, 255, 255, 255, 159, 117, 119, 167, 255, 74, 0, 0, 96, 255, 5, 0, 0, 96, 255, 5 ]; + +/// '5' (ASCII 53) +const Font_TTHoves_Bold_17_glyph_53: [u8; 65] = [ 10, 12, 10, 0, 12, 112, 255, 255, 255, 13, 128, 255, 255, 255, 13, 160, 239, 119, 119, 6, 176, 207, 0, 0, 0, 208, 239, 253, 92, 0, 224, 255, 255, 255, 8, 240, 255, 169, 255, 31, 32, 18, 0, 247, 95, 145, 105, 0, 248, 95, 224, 255, 186, 255, 31, 64, 255, 255, 255, 7, 0, 180, 238, 92, 0 ]; + +/// '6' (ASCII 54) +const Font_TTHoves_Bold_17_glyph_54: [u8; 65] = [ 10, 12, 10, 0, 12, 0, 0, 249, 127, 0, 0, 48, 255, 13, 0, 0, 192, 255, 3, 0, 0, 246, 159, 0, 0, 16, 255, 255, 76, 0, 160, 255, 255, 255, 7, 242, 255, 170, 255, 31, 245, 143, 0, 247, 95, 244, 143, 0, 248, 79, 241, 255, 187, 255, 31, 80, 255, 255, 255, 6, 0, 179, 238, 59, 0 ]; + +/// '7' (ASCII 55) +const Font_TTHoves_Bold_17_glyph_55: [u8; 65] = [ 9, 12, 9, 0, 12, 247, 255, 255, 255, 10, 247, 255, 255, 255, 10, 165, 170, 218, 255, 9, 0, 0, 208, 255, 2, 0, 0, 244, 207, 0, 0, 0, 251, 95, 0, 0, 32, 255, 14, 0, 0, 128, 255, 7, 0, 0, 240, 255, 1, 0, 0, 246, 175, 0, 0, 0, 253, 63, 0, 0, 64, 255, 12, 0, 0 ]; + +/// '8' (ASCII 56) +const Font_TTHoves_Bold_17_glyph_56: [u8; 65] = [ 10, 12, 10, 0, 12, 0, 180, 238, 75, 0, 96, 255, 255, 255, 6, 224, 255, 136, 255, 15, 241, 175, 0, 250, 31, 224, 239, 85, 254, 14, 64, 255, 255, 255, 4, 80, 254, 255, 255, 5, 241, 207, 34, 252, 31, 244, 143, 0, 248, 79, 241, 239, 136, 254, 47, 128, 255, 255, 255, 8, 0, 197, 238, 92, 0 ]; + +/// '9' (ASCII 57) +const Font_TTHoves_Bold_17_glyph_57: [u8; 65] = [ 10, 12, 10, 0, 12, 0, 179, 238, 59, 0, 80, 255, 255, 255, 5, 241, 255, 187, 255, 31, 244, 143, 0, 248, 79, 245, 143, 0, 247, 95, 241, 255, 153, 255, 47, 112, 255, 255, 255, 10, 0, 196, 255, 255, 1, 0, 0, 249, 127, 0, 0, 48, 255, 12, 0, 0, 208, 255, 3, 0, 0, 247, 159, 0, 0 ]; + +/// ':' (ASCII 58) +const Font_TTHoves_Bold_17_glyph_58: [u8; 23] = [ 3, 9, 5, 1, 9, 255, 12, 255, 12, 204, 10, 0, 0, 0, 0, 0, 0, 204, 10, 255, 12, 255, 12 ]; + +/// ';' (ASCII 59) +const Font_TTHoves_Bold_17_glyph_59: [u8; 27] = [ 4, 11, 5, 0, 9, 224, 239, 224, 239, 176, 188, 0, 0, 0, 0, 0, 0, 160, 154, 240, 159, 241, 95, 243, 31, 244, 13 ]; + +/// '<' (ASCII 60) +const Font_TTHoves_Bold_17_glyph_60: [u8; 45] = [ 9, 8, 10, 0, 9, 0, 0, 0, 147, 8, 0, 32, 215, 255, 9, 96, 252, 255, 207, 4, 241, 255, 107, 1, 0, 241, 255, 107, 1, 0, 96, 252, 255, 191, 4, 0, 32, 216, 255, 9, 0, 0, 0, 147, 8 ]; + +/// '=' (ASCII 61) +const Font_TTHoves_Bold_17_glyph_61: [u8; 29] = [ 8, 6, 10, 1, 8, 252, 255, 255, 95, 252, 255, 255, 95, 50, 51, 51, 19, 50, 51, 51, 19, 252, 255, 255, 95, 252, 255, 255, 95 ]; + +/// '>' (ASCII 62) +const Font_TTHoves_Bold_17_glyph_62: [u8; 45] = [ 9, 8, 10, 0, 9, 193, 22, 0, 0, 0, 241, 255, 90, 0, 0, 144, 254, 255, 158, 2, 0, 64, 233, 255, 9, 0, 48, 233, 255, 9, 144, 254, 255, 158, 2, 241, 255, 91, 0, 0, 193, 22, 0, 0, 0 ]; + +/// '?' (ASCII 63) +const Font_TTHoves_Bold_17_glyph_63: [u8; 65] = [ 9, 12, 9, 0, 12, 0, 215, 223, 25, 0, 192, 255, 255, 239, 1, 245, 223, 216, 255, 7, 165, 42, 48, 255, 9, 0, 0, 160, 255, 6, 0, 32, 253, 159, 0, 0, 160, 255, 5, 0, 0, 208, 191, 0, 0, 0, 16, 17, 0, 0, 0, 192, 156, 0, 0, 0, 240, 207, 0, 0, 0, 240, 207, 0, 0 ]; + +/// '@' (ASCII 64) +const Font_TTHoves_Bold_17_glyph_64: [u8; 117] = [ 16, 14, 16, 0, 12, 0, 0, 112, 236, 223, 74, 0, 0, 0, 48, 253, 255, 255, 255, 25, 0, 0, 244, 223, 38, 65, 249, 207, 0, 0, 254, 10, 0, 0, 48, 254, 7, 128, 223, 32, 251, 156, 94, 245, 31, 224, 95, 224, 255, 255, 95, 224, 95, 241, 47, 246, 46, 226, 95, 176, 127, 242, 15, 248, 9, 160, 95, 144, 127, 240, 47, 246, 46, 226, 159, 227, 95, 208, 127, 225, 255, 255, 255, 255, 13, 80, 255, 35, 251, 126, 231, 190, 2, 0, 250, 159, 19, 0, 0, 0, 0, 0, 144, 255, 255, 255, 143, 0, 0, 0, 0, 146, 235, 255, 143, 0, 0 ]; + +/// 'A' (ASCII 65) +const Font_TTHoves_Bold_17_glyph_65: [u8; 89] = [ 13, 12, 13, 0, 12, 0, 0, 243, 255, 31, 0, 0, 0, 0, 248, 255, 111, 0, 0, 0, 0, 253, 255, 191, 0, 0, 0, 48, 255, 168, 255, 1, 0, 0, 128, 255, 83, 255, 6, 0, 0, 224, 239, 0, 255, 12, 0, 0, 243, 159, 0, 251, 31, 0, 0, 249, 255, 255, 255, 111, 0, 0, 254, 255, 255, 255, 207, 0, 48, 255, 107, 102, 198, 255, 1, 144, 255, 5, 0, 112, 255, 7, 224, 255, 0, 0, 32, 255, 12 ]; + +/// 'B' (ASCII 66) +const Font_TTHoves_Bold_17_glyph_66: [u8; 65] = [ 10, 12, 11, 1, 12, 252, 255, 255, 174, 1, 252, 255, 255, 255, 13, 252, 111, 102, 253, 79, 252, 14, 0, 246, 111, 252, 95, 101, 253, 47, 252, 255, 255, 255, 7, 252, 255, 255, 255, 13, 252, 14, 0, 248, 111, 252, 14, 0, 243, 143, 252, 95, 101, 252, 127, 252, 255, 255, 255, 30, 252, 255, 255, 190, 2 ]; + +/// 'C' (ASCII 67) +const Font_TTHoves_Bold_17_glyph_67: [u8; 77] = [ 12, 12, 12, 0, 12, 0, 32, 201, 223, 41, 0, 0, 245, 255, 255, 255, 4, 32, 255, 223, 235, 255, 30, 192, 255, 7, 0, 248, 143, 240, 191, 0, 0, 112, 104, 243, 127, 0, 0, 0, 0, 243, 127, 0, 0, 0, 0, 240, 191, 0, 0, 128, 121, 192, 255, 6, 0, 248, 143, 32, 255, 223, 218, 255, 30, 0, 245, 255, 255, 255, 4, 0, 32, 217, 223, 41, 0 ]; + +/// 'D' (ASCII 68) +const Font_TTHoves_Bold_17_glyph_68: [u8; 77] = [ 11, 12, 12, 1, 12, 252, 255, 223, 41, 0, 0, 252, 255, 255, 255, 6, 0, 252, 175, 218, 255, 63, 0, 252, 14, 0, 246, 223, 0, 252, 14, 0, 176, 255, 1, 252, 14, 0, 96, 255, 4, 252, 14, 0, 96, 255, 4, 252, 14, 0, 176, 255, 1, 252, 14, 0, 246, 223, 0, 252, 159, 218, 255, 63, 0, 252, 255, 255, 255, 6, 0, 252, 255, 223, 41, 0, 0 ]; + +/// 'E' (ASCII 69) +const Font_TTHoves_Bold_17_glyph_69: [u8; 65] = [ 9, 12, 10, 1, 12, 252, 255, 255, 255, 5, 252, 255, 255, 255, 5, 252, 127, 119, 119, 2, 252, 14, 0, 0, 0, 252, 14, 0, 0, 0, 252, 255, 255, 255, 0, 252, 255, 255, 255, 0, 252, 111, 102, 102, 0, 252, 14, 0, 0, 0, 252, 127, 119, 119, 2, 252, 255, 255, 255, 5, 252, 255, 255, 255, 5 ]; + +/// 'F' (ASCII 70) +const Font_TTHoves_Bold_17_glyph_70: [u8; 65] = [ 9, 12, 10, 1, 12, 252, 255, 255, 255, 3, 252, 255, 255, 255, 3, 252, 127, 119, 119, 1, 252, 14, 0, 0, 0, 252, 14, 0, 0, 0, 252, 255, 255, 223, 0, 252, 255, 255, 223, 0, 252, 111, 102, 86, 0, 252, 14, 0, 0, 0, 252, 14, 0, 0, 0, 252, 14, 0, 0, 0, 252, 14, 0, 0, 0 ]; + +/// 'G' (ASCII 71) +const Font_TTHoves_Bold_17_glyph_71: [u8; 77] = [ 12, 12, 13, 0, 12, 0, 16, 201, 223, 25, 0, 0, 245, 255, 255, 239, 2, 32, 255, 223, 235, 255, 30, 176, 255, 8, 0, 249, 143, 240, 207, 0, 0, 80, 69, 242, 143, 0, 0, 0, 0, 244, 127, 0, 245, 255, 255, 241, 175, 0, 213, 253, 255, 208, 255, 4, 0, 244, 255, 48, 255, 207, 202, 255, 255, 0, 246, 255, 255, 239, 255, 0, 32, 217, 223, 40, 255 ]; + +/// 'H' (ASCII 72) +const Font_TTHoves_Bold_17_glyph_72: [u8; 77] = [ 11, 12, 12, 1, 12, 252, 14, 0, 128, 255, 3, 252, 14, 0, 128, 255, 3, 252, 14, 0, 128, 255, 3, 252, 14, 0, 128, 255, 3, 252, 207, 204, 236, 255, 3, 252, 255, 255, 255, 255, 3, 252, 255, 255, 255, 255, 3, 252, 14, 0, 128, 255, 3, 252, 14, 0, 128, 255, 3, 252, 14, 0, 128, 255, 3, 252, 14, 0, 128, 255, 3, 252, 14, 0, 128, 255, 3 ]; + +/// 'I' (ASCII 73) +const Font_TTHoves_Bold_17_glyph_73: [u8; 29] = [ 3, 12, 5, 1, 12, 252, 14, 252, 14, 252, 14, 252, 14, 252, 14, 252, 14, 252, 14, 252, 14, 252, 14, 252, 14, 252, 14, 252, 14 ]; + +/// 'J' (ASCII 74) +const Font_TTHoves_Bold_17_glyph_74: [u8; 53] = [ 7, 12, 7, 0, 12, 0, 128, 255, 3, 0, 128, 255, 3, 0, 128, 255, 3, 0, 128, 255, 3, 0, 128, 255, 3, 0, 128, 255, 3, 0, 128, 255, 3, 0, 128, 255, 3, 0, 128, 255, 3, 152, 234, 255, 2, 253, 255, 239, 0, 253, 255, 77, 0 ]; + +/// 'K' (ASCII 75) +const Font_TTHoves_Bold_17_glyph_75: [u8; 77] = [ 11, 12, 11, 1, 12, 252, 14, 0, 254, 95, 0, 252, 14, 144, 255, 10, 0, 252, 14, 244, 239, 1, 0, 252, 30, 254, 79, 0, 0, 252, 174, 255, 9, 0, 0, 252, 255, 223, 0, 0, 0, 252, 255, 239, 1, 0, 0, 252, 126, 255, 12, 0, 0, 252, 14, 251, 127, 0, 0, 252, 14, 225, 255, 3, 0, 252, 14, 80, 255, 30, 0, 252, 14, 0, 250, 175, 0 ]; + +/// 'L' (ASCII 76) +const Font_TTHoves_Bold_17_glyph_76: [u8; 65] = [ 9, 12, 10, 1, 12, 252, 14, 0, 0, 0, 252, 14, 0, 0, 0, 252, 14, 0, 0, 0, 252, 14, 0, 0, 0, 252, 14, 0, 0, 0, 252, 14, 0, 0, 0, 252, 14, 0, 0, 0, 252, 14, 0, 0, 0, 252, 14, 0, 0, 0, 252, 159, 153, 153, 2, 252, 255, 255, 255, 3, 252, 255, 255, 255, 3 ]; + +/// 'M' (ASCII 77) +const Font_TTHoves_Bold_17_glyph_77: [u8; 89] = [ 14, 12, 16, 1, 12, 252, 255, 7, 0, 176, 255, 159, 252, 255, 12, 0, 240, 255, 159, 252, 255, 31, 0, 245, 255, 159, 252, 255, 111, 0, 250, 255, 159, 252, 255, 191, 0, 254, 255, 159, 252, 158, 255, 64, 255, 247, 159, 252, 78, 255, 149, 255, 242, 159, 252, 14, 254, 235, 191, 241, 159, 252, 14, 249, 255, 95, 241, 159, 252, 14, 243, 255, 15, 241, 159, 252, 14, 224, 255, 10, 241, 159, 252, 14, 128, 255, 5, 241, 159 ]; + +/// 'N' (ASCII 78) +const Font_TTHoves_Bold_17_glyph_78: [u8; 77] = [ 11, 12, 13, 1, 12, 252, 207, 0, 96, 255, 4, 252, 255, 4, 96, 255, 4, 252, 255, 12, 96, 255, 4, 252, 255, 79, 96, 255, 4, 252, 255, 207, 96, 255, 4, 252, 126, 255, 100, 255, 4, 252, 14, 254, 108, 255, 4, 252, 14, 246, 223, 255, 4, 252, 14, 208, 255, 255, 4, 252, 14, 80, 255, 255, 4, 252, 14, 0, 253, 255, 4, 252, 14, 0, 244, 255, 4 ]; + +/// 'O' (ASCII 79) +const Font_TTHoves_Bold_17_glyph_79: [u8; 89] = [ 13, 12, 13, 0, 12, 0, 32, 201, 207, 25, 0, 0, 0, 245, 255, 255, 239, 4, 0, 32, 255, 223, 219, 255, 31, 0, 192, 255, 7, 0, 248, 175, 0, 240, 191, 0, 0, 208, 255, 0, 243, 127, 0, 0, 144, 255, 2, 243, 127, 0, 0, 144, 255, 2, 240, 191, 0, 0, 208, 255, 0, 192, 255, 6, 0, 248, 175, 0, 32, 255, 223, 218, 255, 31, 0, 0, 245, 255, 255, 239, 4, 0, 0, 32, 217, 207, 25, 0, 0 ]; + +/// 'P' (ASCII 80) +const Font_TTHoves_Bold_17_glyph_80: [u8; 65] = [ 10, 12, 11, 1, 12, 252, 255, 255, 141, 0, 252, 255, 255, 255, 11, 252, 175, 186, 255, 79, 252, 14, 0, 246, 127, 252, 14, 0, 243, 159, 252, 14, 0, 249, 111, 252, 255, 255, 255, 47, 252, 255, 255, 255, 6, 252, 175, 170, 55, 0, 252, 14, 0, 0, 0, 252, 14, 0, 0, 0, 252, 14, 0, 0, 0 ]; + +/// 'Q' (ASCII 81) +const Font_TTHoves_Bold_17_glyph_81: [u8; 96] = [ 13, 13, 13, 0, 12, 0, 32, 201, 207, 25, 0, 0, 0, 245, 255, 255, 239, 4, 0, 32, 255, 223, 219, 255, 31, 0, 192, 255, 7, 0, 248, 175, 0, 240, 191, 0, 0, 208, 255, 0, 243, 127, 0, 0, 144, 255, 2, 243, 127, 0, 0, 128, 255, 2, 240, 191, 0, 0, 192, 255, 0, 192, 255, 102, 255, 253, 175, 0, 32, 255, 207, 255, 255, 63, 0, 0, 245, 255, 255, 255, 9, 0, 0, 32, 217, 223, 253, 63, 0, 0, 0, 0, 0, 225, 239, 2 ]; + +/// 'R' (ASCII 82) +const Font_TTHoves_Bold_17_glyph_82: [u8; 77] = [ 11, 12, 12, 1, 12, 252, 255, 255, 157, 0, 0, 252, 255, 255, 255, 12, 0, 252, 143, 152, 254, 95, 0, 252, 14, 0, 244, 159, 0, 252, 14, 0, 241, 175, 0, 252, 14, 0, 248, 143, 0, 252, 255, 255, 255, 47, 0, 252, 255, 255, 223, 3, 0, 252, 175, 255, 12, 0, 0, 252, 14, 250, 175, 0, 0, 252, 14, 176, 255, 9, 0, 252, 14, 0, 252, 159, 0 ]; + +/// 'S' (ASCII 83) +const Font_TTHoves_Bold_17_glyph_83: [u8; 77] = [ 11, 12, 11, 0, 12, 0, 180, 254, 157, 1, 0, 96, 255, 255, 255, 47, 0, 240, 255, 121, 252, 207, 0, 243, 159, 0, 192, 255, 0, 241, 239, 54, 0, 0, 0, 144, 255, 255, 207, 6, 0, 0, 181, 254, 255, 159, 0, 0, 0, 16, 229, 255, 0, 246, 95, 0, 144, 255, 2, 242, 255, 104, 248, 239, 0, 112, 255, 255, 255, 95, 0, 0, 179, 253, 173, 3, 0 ]; + +/// 'T' (ASCII 84) +const Font_TTHoves_Bold_17_glyph_84: [u8; 65] = [ 10, 12, 10, 0, 12, 250, 255, 255, 255, 175, 250, 255, 255, 255, 175, 166, 202, 255, 172, 122, 0, 80, 255, 5, 0, 0, 80, 255, 5, 0, 0, 80, 255, 5, 0, 0, 80, 255, 5, 0, 0, 80, 255, 5, 0, 0, 80, 255, 5, 0, 0, 80, 255, 5, 0, 0, 80, 255, 5, 0, 0, 80, 255, 5, 0 ]; + +/// 'U' (ASCII 85) +const Font_TTHoves_Bold_17_glyph_85: [u8; 77] = [ 11, 12, 12, 1, 12, 254, 12, 0, 144, 255, 1, 254, 12, 0, 144, 255, 1, 254, 12, 0, 144, 255, 1, 254, 12, 0, 144, 255, 1, 254, 12, 0, 144, 255, 1, 254, 12, 0, 144, 255, 1, 254, 13, 0, 144, 255, 1, 252, 14, 0, 176, 255, 0, 250, 111, 0, 243, 223, 0, 244, 255, 188, 255, 127, 0, 144, 255, 255, 255, 12, 0, 0, 180, 238, 124, 0, 0 ]; + +/// 'V' (ASCII 86) +const Font_TTHoves_Bold_17_glyph_86: [u8; 77] = [ 12, 12, 12, 0, 12, 253, 47, 0, 0, 246, 143, 248, 127, 0, 0, 251, 63, 243, 207, 0, 16, 255, 14, 208, 255, 1, 80, 255, 9, 128, 255, 6, 160, 255, 4, 48, 255, 11, 240, 239, 0, 0, 254, 15, 244, 159, 0, 0, 248, 95, 250, 79, 0, 0, 243, 207, 254, 14, 0, 0, 224, 255, 255, 9, 0, 0, 144, 255, 255, 4, 0, 0, 64, 255, 255, 0, 0 ]; + +/// 'W' (ASCII 87) +const Font_TTHoves_Bold_17_glyph_87: [u8; 113] = [ 17, 12, 17, 0, 12, 252, 47, 0, 242, 255, 0, 80, 255, 9, 248, 111, 0, 246, 255, 3, 144, 255, 5, 245, 159, 0, 250, 255, 7, 192, 255, 2, 241, 223, 0, 254, 255, 11, 240, 239, 0, 208, 255, 33, 255, 255, 15, 244, 175, 0, 144, 255, 100, 255, 246, 63, 247, 111, 0, 80, 255, 168, 223, 240, 127, 251, 47, 0, 16, 255, 253, 159, 192, 223, 255, 14, 0, 0, 254, 255, 95, 128, 255, 255, 10, 0, 0, 250, 255, 31, 64, 255, 255, 7, 0, 0, 246, 255, 13, 0, 255, 255, 3, 0, 0, 242, 255, 9, 0, 252, 255, 0, 0 ]; + +/// 'X' (ASCII 88) +const Font_TTHoves_Bold_17_glyph_88: [u8; 89] = [ 13, 12, 12, 0, 12, 160, 255, 8, 0, 247, 191, 0, 16, 255, 47, 16, 255, 47, 0, 0, 246, 191, 160, 255, 7, 0, 0, 192, 255, 249, 207, 0, 0, 0, 32, 255, 255, 47, 0, 0, 0, 0, 248, 255, 8, 0, 0, 0, 0, 251, 255, 11, 0, 0, 0, 80, 255, 255, 95, 0, 0, 0, 225, 255, 245, 239, 1, 0, 0, 250, 143, 112, 255, 10, 0, 64, 255, 13, 0, 253, 95, 0, 224, 255, 4, 0, 244, 239, 1 ]; + +/// 'Y' (ASCII 89) +const Font_TTHoves_Bold_17_glyph_89: [u8; 89] = [ 13, 12, 12, 0, 12, 225, 255, 1, 0, 242, 223, 0, 112, 255, 8, 0, 250, 95, 0, 0, 254, 31, 32, 255, 12, 0, 0, 246, 143, 160, 255, 4, 0, 0, 224, 255, 243, 207, 0, 0, 0, 96, 255, 255, 63, 0, 0, 0, 0, 253, 255, 11, 0, 0, 0, 0, 245, 255, 3, 0, 0, 0, 0, 224, 223, 0, 0, 0, 0, 0, 224, 207, 0, 0, 0, 0, 0, 224, 207, 0, 0, 0, 0, 0, 224, 207, 0, 0, 0 ]; + +/// 'Z' (ASCII 90) +const Font_TTHoves_Bold_17_glyph_90: [u8; 65] = [ 10, 12, 11, 0, 12, 243, 255, 255, 255, 207, 243, 255, 255, 255, 207, 162, 170, 170, 255, 175, 0, 0, 144, 255, 30, 0, 0, 245, 255, 3, 0, 32, 255, 111, 0, 0, 209, 255, 9, 0, 0, 251, 207, 0, 0, 128, 255, 30, 0, 0, 243, 255, 156, 153, 137, 245, 255, 255, 255, 223, 245, 255, 255, 255, 223 ]; + +/// '[' (ASCII 91) +const Font_TTHoves_Bold_17_glyph_91: [u8; 56] = [ 5, 17, 7, 1, 13, 83, 85, 5, 250, 255, 14, 250, 255, 14, 250, 14, 0, 250, 14, 0, 250, 14, 0, 250, 14, 0, 250, 14, 0, 250, 14, 0, 250, 14, 0, 250, 14, 0, 250, 14, 0, 250, 14, 0, 250, 14, 0, 250, 95, 5, 250, 255, 14, 250, 255, 14 ]; + +/// '\' (ASCII 92) +const Font_TTHoves_Bold_17_glyph_92: [u8; 69] = [ 8, 16, 7, 0, 12, 253, 11, 0, 0, 249, 15, 0, 0, 244, 79, 0, 0, 240, 159, 0, 0, 176, 223, 0, 0, 96, 255, 2, 0, 16, 255, 7, 0, 0, 252, 11, 0, 0, 248, 15, 0, 0, 243, 95, 0, 0, 224, 159, 0, 0, 160, 239, 0, 0, 80, 255, 3, 0, 16, 255, 7, 0, 0, 252, 12, 0, 0, 247, 31 ]; + +/// ']' (ASCII 93) +const Font_TTHoves_Bold_17_glyph_93: [u8; 56] = [ 6, 17, 7, 0, 13, 82, 85, 21, 246, 255, 47, 246, 255, 47, 0, 245, 47, 0, 245, 47, 0, 245, 47, 0, 245, 47, 0, 245, 47, 0, 245, 47, 0, 245, 47, 0, 245, 47, 0, 245, 47, 0, 245, 47, 0, 245, 47, 82, 249, 47, 246, 255, 47, 246, 255, 47 ]; + +/// '^' (ASCII 94) +const Font_TTHoves_Bold_17_glyph_94: [u8; 25] = [ 8, 5, 8, 0, 12, 0, 251, 159, 0, 16, 255, 255, 0, 112, 207, 253, 5, 192, 111, 248, 10, 242, 31, 242, 31 ]; + +/// '_' (ASCII 95) +const Font_TTHoves_Bold_17_glyph_95: [u8; 20] = [ 9, 3, 8, 0, 0, 82, 85, 85, 85, 0, 245, 255, 255, 255, 1, 245, 255, 255, 255, 1 ]; + +/// '`' (ASCII 96) +const Font_TTHoves_Bold_17_glyph_96: [u8; 14] = [ 5, 3, 5, 0, 13, 114, 23, 0, 176, 175, 0, 0, 253, 5 ]; + +/// '{' (ASCII 123) +const Font_TTHoves_Bold_17_glyph_123: [u8; 73] = [ 7, 17, 7, 0, 13, 0, 16, 67, 0, 0, 245, 255, 1, 0, 254, 255, 1, 16, 255, 10, 0, 32, 255, 6, 0, 32, 255, 6, 0, 48, 255, 6, 0, 211, 255, 3, 0, 245, 110, 0, 0, 245, 175, 0, 0, 177, 255, 4, 0, 32, 255, 6, 0, 32, 255, 6, 0, 32, 255, 6, 0, 16, 255, 76, 0, 0, 253, 255, 1, 0, 178, 255, 1 ]; + +/// '|' (ASCII 124) +const Font_TTHoves_Bold_17_glyph_124: [u8; 37] = [ 3, 16, 7, 2, 12, 255, 9, 255, 9, 255, 9, 255, 9, 255, 9, 255, 9, 255, 9, 255, 9, 255, 9, 255, 9, 255, 9, 255, 9, 255, 9, 255, 9, 255, 9, 255, 9 ]; + +/// '}' (ASCII 125) +const Font_TTHoves_Bold_17_glyph_125: [u8; 73] = [ 7, 17, 7, 0, 13, 65, 3, 0, 0, 246, 223, 1, 0, 246, 255, 10, 0, 16, 254, 13, 0, 0, 251, 13, 0, 0, 251, 13, 0, 0, 251, 14, 0, 0, 248, 207, 0, 0, 128, 255, 0, 0, 210, 255, 0, 0, 249, 127, 0, 0, 251, 14, 0, 0, 251, 13, 0, 0, 251, 13, 0, 81, 255, 12, 0, 246, 255, 8, 0, 246, 158, 0, 0 ]; + +/// '~' (ASCII 126) +const Font_TTHoves_Bold_17_glyph_126: [u8; 25] = [ 10, 4, 10, 0, 7, 0, 98, 2, 0, 0, 128, 255, 159, 246, 143, 242, 255, 255, 255, 79, 245, 63, 180, 239, 7 ]; + +/// Nonprintable glyph (inverse colors of '?') +const Font_TTHoves_Bold_17_glyph_nonprintable: [u8; 65] = [ 9, 12, 9, 0, 12, 255, 40, 32, 230, 255, 63, 0, 0, 16, 254, 10, 32, 39, 0, 248, 90, 213, 207, 0, 246, 255, 255, 95, 0, 249, 255, 223, 2, 96, 255, 255, 95, 0, 250, 255, 255, 47, 64, 255, 255, 255, 239, 238, 255, 255, 255, 63, 99, 255, 255, 255, 15, 48, 255, 255, 255, 15, 48, 255, 255 ]; + +/// Array of references for 'TTHoves_Bold_17' ASCII glyphs (forced uppercase) +const Font_TTHoves_Bold_17_upper: [&[u8]; 95] = [ + &Font_TTHoves_Bold_17_glyph_32, + &Font_TTHoves_Bold_17_glyph_33, + &Font_TTHoves_Bold_17_glyph_34, + &Font_TTHoves_Bold_17_glyph_35, + &Font_TTHoves_Bold_17_glyph_36, + &Font_TTHoves_Bold_17_glyph_37, + &Font_TTHoves_Bold_17_glyph_38, + &Font_TTHoves_Bold_17_glyph_39, + &Font_TTHoves_Bold_17_glyph_40, + &Font_TTHoves_Bold_17_glyph_41, + &Font_TTHoves_Bold_17_glyph_42, + &Font_TTHoves_Bold_17_glyph_43, + &Font_TTHoves_Bold_17_glyph_44, + &Font_TTHoves_Bold_17_glyph_45, + &Font_TTHoves_Bold_17_glyph_46, + &Font_TTHoves_Bold_17_glyph_47, + &Font_TTHoves_Bold_17_glyph_48, + &Font_TTHoves_Bold_17_glyph_49, + &Font_TTHoves_Bold_17_glyph_50, + &Font_TTHoves_Bold_17_glyph_51, + &Font_TTHoves_Bold_17_glyph_52, + &Font_TTHoves_Bold_17_glyph_53, + &Font_TTHoves_Bold_17_glyph_54, + &Font_TTHoves_Bold_17_glyph_55, + &Font_TTHoves_Bold_17_glyph_56, + &Font_TTHoves_Bold_17_glyph_57, + &Font_TTHoves_Bold_17_glyph_58, + &Font_TTHoves_Bold_17_glyph_59, + &Font_TTHoves_Bold_17_glyph_60, + &Font_TTHoves_Bold_17_glyph_61, + &Font_TTHoves_Bold_17_glyph_62, + &Font_TTHoves_Bold_17_glyph_63, + &Font_TTHoves_Bold_17_glyph_64, + &Font_TTHoves_Bold_17_glyph_65, + &Font_TTHoves_Bold_17_glyph_66, + &Font_TTHoves_Bold_17_glyph_67, + &Font_TTHoves_Bold_17_glyph_68, + &Font_TTHoves_Bold_17_glyph_69, + &Font_TTHoves_Bold_17_glyph_70, + &Font_TTHoves_Bold_17_glyph_71, + &Font_TTHoves_Bold_17_glyph_72, + &Font_TTHoves_Bold_17_glyph_73, + &Font_TTHoves_Bold_17_glyph_74, + &Font_TTHoves_Bold_17_glyph_75, + &Font_TTHoves_Bold_17_glyph_76, + &Font_TTHoves_Bold_17_glyph_77, + &Font_TTHoves_Bold_17_glyph_78, + &Font_TTHoves_Bold_17_glyph_79, + &Font_TTHoves_Bold_17_glyph_80, + &Font_TTHoves_Bold_17_glyph_81, + &Font_TTHoves_Bold_17_glyph_82, + &Font_TTHoves_Bold_17_glyph_83, + &Font_TTHoves_Bold_17_glyph_84, + &Font_TTHoves_Bold_17_glyph_85, + &Font_TTHoves_Bold_17_glyph_86, + &Font_TTHoves_Bold_17_glyph_87, + &Font_TTHoves_Bold_17_glyph_88, + &Font_TTHoves_Bold_17_glyph_89, + &Font_TTHoves_Bold_17_glyph_90, + &Font_TTHoves_Bold_17_glyph_91, + &Font_TTHoves_Bold_17_glyph_92, + &Font_TTHoves_Bold_17_glyph_93, + &Font_TTHoves_Bold_17_glyph_94, + &Font_TTHoves_Bold_17_glyph_95, + &Font_TTHoves_Bold_17_glyph_96, + &Font_TTHoves_Bold_17_glyph_65, // a -> A, + &Font_TTHoves_Bold_17_glyph_66, // b -> B, + &Font_TTHoves_Bold_17_glyph_67, // c -> C, + &Font_TTHoves_Bold_17_glyph_68, // d -> D, + &Font_TTHoves_Bold_17_glyph_69, // e -> E, + &Font_TTHoves_Bold_17_glyph_70, // f -> F, + &Font_TTHoves_Bold_17_glyph_71, // g -> G, + &Font_TTHoves_Bold_17_glyph_72, // h -> H, + &Font_TTHoves_Bold_17_glyph_73, // i -> I, + &Font_TTHoves_Bold_17_glyph_74, // j -> J, + &Font_TTHoves_Bold_17_glyph_75, // k -> K, + &Font_TTHoves_Bold_17_glyph_76, // l -> L, + &Font_TTHoves_Bold_17_glyph_77, // m -> M, + &Font_TTHoves_Bold_17_glyph_78, // n -> N, + &Font_TTHoves_Bold_17_glyph_79, // o -> O, + &Font_TTHoves_Bold_17_glyph_80, // p -> P, + &Font_TTHoves_Bold_17_glyph_81, // q -> Q, + &Font_TTHoves_Bold_17_glyph_82, // r -> R, + &Font_TTHoves_Bold_17_glyph_83, // s -> S, + &Font_TTHoves_Bold_17_glyph_84, // t -> T, + &Font_TTHoves_Bold_17_glyph_85, // u -> U, + &Font_TTHoves_Bold_17_glyph_86, // v -> V, + &Font_TTHoves_Bold_17_glyph_87, // w -> W, + &Font_TTHoves_Bold_17_glyph_88, // x -> X, + &Font_TTHoves_Bold_17_glyph_89, // y -> Y, + &Font_TTHoves_Bold_17_glyph_90, // z -> Z, + &Font_TTHoves_Bold_17_glyph_123, + &Font_TTHoves_Bold_17_glyph_124, + &Font_TTHoves_Bold_17_glyph_125, + &Font_TTHoves_Bold_17_glyph_126, +]; + +/// FontInfo struct for forced uppercase usage +pub const Font_TTHoves_Bold_17_upper_info: FontInfo = FontInfo { + translation_blob_idx: 7, + height: 17, + max_height: 18, + baseline: 4, + glyph_data: &Font_TTHoves_Bold_17_upper, + glyph_nonprintable: &Font_TTHoves_Bold_17_glyph_nonprintable, +}; diff --git a/core/embed/rust/src/ui/layout_delizia/fonts/mod.rs b/core/embed/rust/src/ui/layout_delizia/fonts/mod.rs index 5bf9fe2782..3142bd6bea 100644 --- a/core/embed/rust/src/ui/layout_delizia/fonts/mod.rs +++ b/core/embed/rust/src/ui/layout_delizia/fonts/mod.rs @@ -6,8 +6,13 @@ mod font_ttsatoshi_demibold_21; #[cfg(not(feature = "bootloader"))] mod font_ttsatoshi_demibold_42; +#[cfg(feature = "bootloader")] +mod font_tthoves_bold_17; + #[cfg(not(feature = "bootloader"))] use font_robotomono_medium_21::Font_RobotoMono_Medium_21_info; +#[cfg(feature = "bootloader")] +use font_tthoves_bold_17::Font_TTHoves_Bold_17_upper_info; #[cfg(not(feature = "bootloader"))] use font_ttsatoshi_demibold_18::Font_TTSatoshi_DemiBold_18_info; use font_ttsatoshi_demibold_21::Font_TTSatoshi_DemiBold_21_info; @@ -15,6 +20,7 @@ use font_ttsatoshi_demibold_21::Font_TTSatoshi_DemiBold_21_info; use font_ttsatoshi_demibold_42::Font_TTSatoshi_DemiBold_42_info; pub const FONT_DEMIBOLD: crate::ui::display::Font = &Font_TTSatoshi_DemiBold_21_info; + #[cfg(feature = "bootloader")] pub const FONT_MONO: crate::ui::display::Font = FONT_DEMIBOLD; #[cfg(not(feature = "bootloader"))] @@ -24,6 +30,6 @@ pub const FONT_BIG: crate::ui::display::Font = FONT_DEMIBOLD; #[cfg(not(feature = "bootloader"))] pub const FONT_BIG: crate::ui::display::Font = &Font_TTSatoshi_DemiBold_42_info; #[cfg(feature = "bootloader")] -pub const FONT_SUB: crate::ui::display::Font = FONT_DEMIBOLD; +pub const FONT_SUB: crate::ui::display::Font = &Font_TTHoves_Bold_17_upper_info; #[cfg(not(feature = "bootloader"))] pub const FONT_SUB: crate::ui::display::Font = &Font_TTSatoshi_DemiBold_18_info; diff --git a/core/embed/rust/src/ui/layout_delizia/theme/bootloader.rs b/core/embed/rust/src/ui/layout_delizia/theme/bootloader.rs index cfc5b5983d..ce1ab77c73 100644 --- a/core/embed/rust/src/ui/layout_delizia/theme/bootloader.rs +++ b/core/embed/rust/src/ui/layout_delizia/theme/bootloader.rs @@ -74,21 +74,21 @@ pub const CHECK40: &[u8] = include_res!("layout_delizia/res/check40.toif"); pub fn button_confirm() -> ButtonStyleSheet { ButtonStyleSheet { normal: &ButtonStyle { - font: fonts::FONT_DEMIBOLD, + font: fonts::FONT_SUB, text_color: BLD_BG, button_color: WHITE, icon_color: BLD_BG, background_color: BLD_BG, }, active: &ButtonStyle { - font: fonts::FONT_DEMIBOLD, + font: fonts::FONT_SUB, text_color: BLD_BG, button_color: BLD_INSTALL_BTN_COLOR_ACTIVE, icon_color: BLD_BG, background_color: BLD_BG, }, disabled: &ButtonStyle { - font: fonts::FONT_DEMIBOLD, + font: fonts::FONT_SUB, text_color: FG, button_color: GREY_DARK, icon_color: BLD_BG, @@ -100,21 +100,21 @@ pub fn button_confirm() -> ButtonStyleSheet { pub fn button_wipe_cancel() -> ButtonStyleSheet { ButtonStyleSheet { normal: &ButtonStyle { - font: fonts::FONT_DEMIBOLD, + font: fonts::FONT_SUB, text_color: WHITE, button_color: BLD_WIPE_CANCEL_BTN_COLOR, icon_color: WHITE, background_color: BLD_WIPE_COLOR, }, active: &ButtonStyle { - font: fonts::FONT_DEMIBOLD, + font: fonts::FONT_SUB, text_color: WHITE, button_color: BLD_WIPE_CANCEL_BTN_COLOR_ACTIVE, icon_color: WHITE, background_color: BLD_WIPE_COLOR, }, disabled: &ButtonStyle { - font: fonts::FONT_DEMIBOLD, + font: fonts::FONT_SUB, text_color: GREY_LIGHT, button_color: GREY_DARK, icon_color: GREY_LIGHT, @@ -126,21 +126,21 @@ pub fn button_wipe_cancel() -> ButtonStyleSheet { pub fn button_wipe_confirm() -> ButtonStyleSheet { ButtonStyleSheet { normal: &ButtonStyle { - font: fonts::FONT_DEMIBOLD, + font: fonts::FONT_SUB, text_color: BLD_WIPE_COLOR, button_color: BLD_WIPE_BTN_COLOR, icon_color: BLD_WIPE_COLOR, background_color: BLD_WIPE_COLOR, }, active: &ButtonStyle { - font: fonts::FONT_DEMIBOLD, + font: fonts::FONT_SUB, text_color: BLD_WIPE_COLOR, button_color: BLD_WIPE_BTN_COLOR_ACTIVE, icon_color: BLD_WIPE_COLOR, background_color: BLD_WIPE_COLOR, }, disabled: &ButtonStyle { - font: fonts::FONT_DEMIBOLD, + font: fonts::FONT_SUB, text_color: FG, button_color: GREY_DARK, icon_color: FG, @@ -152,21 +152,21 @@ pub fn button_wipe_confirm() -> ButtonStyleSheet { pub fn button_bld_menu() -> ButtonStyleSheet { ButtonStyleSheet { normal: &ButtonStyle { - font: fonts::FONT_DEMIBOLD, + font: fonts::FONT_SUB, text_color: BLD_FG, button_color: BLD_BG, icon_color: BLD_FG, background_color: BLD_BG, }, active: &ButtonStyle { - font: fonts::FONT_DEMIBOLD, + font: fonts::FONT_SUB, text_color: BLD_FG, button_color: BLD_BG, icon_color: BLD_FG, background_color: BLD_BG, }, disabled: &ButtonStyle { - font: fonts::FONT_DEMIBOLD, + font: fonts::FONT_SUB, text_color: GREY_LIGHT, button_color: BLD_BG, icon_color: GREY_LIGHT, @@ -178,21 +178,21 @@ pub fn button_bld_menu() -> ButtonStyleSheet { pub fn button_bld() -> ButtonStyleSheet { ButtonStyleSheet { normal: &ButtonStyle { - font: fonts::FONT_DEMIBOLD, + font: fonts::FONT_SUB, text_color: BLD_FG, button_color: BLD_BTN_COLOR, icon_color: BLD_FG, background_color: BLD_BG, }, active: &ButtonStyle { - font: fonts::FONT_DEMIBOLD, + font: fonts::FONT_SUB, text_color: BLD_FG, button_color: BLD_BTN_COLOR_ACTIVE, icon_color: BLD_FG, background_color: BLD_BG, }, disabled: &ButtonStyle { - font: fonts::FONT_DEMIBOLD, + font: fonts::FONT_SUB, text_color: GREY_LIGHT, button_color: BLD_BTN_COLOR, icon_color: GREY_LIGHT, @@ -203,7 +203,7 @@ pub fn button_bld() -> ButtonStyleSheet { pub const fn text_title(bg: Color) -> TextStyle { TextStyle::new( - fonts::FONT_DEMIBOLD, + fonts::FONT_SUB, BLD_TITLE_COLOR, bg, BLD_TITLE_COLOR, @@ -214,7 +214,7 @@ pub const fn text_title(bg: Color) -> TextStyle { pub const TEXT_NORMAL: TextStyle = TextStyle::new(fonts::FONT_DEMIBOLD, BLD_FG, BLD_BG, BLD_FG, BLD_FG); pub const TEXT_WARNING: TextStyle = TextStyle::new( - fonts::FONT_DEMIBOLD, + fonts::FONT_SUB, BLD_WARN_COLOR, BLD_BG, BLD_WARN_COLOR, @@ -227,7 +227,7 @@ pub const fn text_fingerprint(bg: Color) -> TextStyle { pub const TEXT_BOLD: TextStyle = TextStyle::new(fonts::FONT_DEMIBOLD, BLD_FG, BLD_BG, BLD_FG, BLD_FG); pub const TEXT_WIPE_BOLD: TextStyle = TextStyle::new( - fonts::FONT_DEMIBOLD, + fonts::FONT_SUB, BLD_WIPE_TEXT_COLOR, BLD_WIPE_COLOR, BLD_WIPE_TEXT_COLOR, diff --git a/core/tools/codegen/gen_font.py b/core/tools/codegen/gen_font.py index ad0a565f33..035054bd1c 100755 --- a/core/tools/codegen/gen_font.py +++ b/core/tools/codegen/gen_font.py @@ -533,7 +533,15 @@ def gen_layout_delizia(): FaceProcessor("TTSatoshi", "DemiBold", 21, ext="otf", font_idx=1).write_files() FaceProcessor("TTSatoshi", "DemiBold", 18, ext="otf", font_idx=8).write_files() FaceProcessor("RobotoMono", "Medium", 21, font_idx=3).write_files() - + FaceProcessor( + "TTHoves", + "Bold", + 17, + ext="otf", + gen_normal=False, + gen_upper=True, + font_idx_upper=7, + ).write_files() LAYOUTS = { "bolt": gen_layout_bolt,