From 5ed1516cc4706b60d87df836a38150cd94e189fa Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Thu, 7 Mar 2024 00:40:58 +0100 Subject: [PATCH] feat(core): add icons for T3T1 --- .../src/ui/model_mercury/res/autofill30.png | Bin 0 -> 542 bytes .../src/ui/model_mercury/res/autofill30.toif | Bin 0 -> 150 bytes .../model_mercury/res/bullet_checkmark20.png | Bin 0 -> 433 bytes .../model_mercury/res/bullet_checkmark20.toif | Bin 0 -> 107 bytes .../src/ui/model_mercury/res/cancel24.png | Bin 0 -> 409 bytes .../src/ui/model_mercury/res/cancel24.toif | Bin 0 -> 101 bytes .../ui/model_mercury/res/chevron_right24.png | Bin 0 -> 320 bytes .../ui/model_mercury/res/chevron_right24.toif | Bin 0 -> 44 bytes .../rust/src/ui/model_mercury/res/close30.png | Bin 0 -> 367 bytes .../src/ui/model_mercury/res/close30.toif | Bin 0 -> 76 bytes .../src/ui/model_mercury/res/delete30.png | Bin 0 -> 484 bytes .../src/ui/model_mercury/res/delete30.toif | Bin 0 -> 139 bytes .../src/ui/model_mercury/res/download24.png | Bin 0 -> 390 bytes .../src/ui/model_mercury/res/download24.toif | Bin 0 -> 92 bytes .../model_mercury/res/exclamation_mark24.png | Bin 0 -> 502 bytes .../model_mercury/res/exclamation_mark24.toif | Bin 0 -> 153 bytes .../rust/src/ui/model_mercury/res/fire24.png | Bin 0 -> 472 bytes .../rust/src/ui/model_mercury/res/fire24.toif | Bin 0 -> 145 bytes .../rust/src/ui/model_mercury/res/menu30.png | Bin 0 -> 324 bytes .../rust/src/ui/model_mercury/res/menu30.toif | Bin 0 -> 57 bytes .../rust/src/ui/model_mercury/res/minus40.png | Bin 0 -> 275 bytes .../src/ui/model_mercury/res/minus40.toif | Bin 0 -> 33 bytes .../src/ui/model_mercury/res/page_down20.png | Bin 0 -> 379 bytes .../src/ui/model_mercury/res/page_down20.toif | Bin 0 -> 79 bytes .../src/ui/model_mercury/res/page_up20.png | Bin 0 -> 368 bytes .../src/ui/model_mercury/res/page_up20.toif | Bin 0 -> 79 bytes .../rust/src/ui/model_mercury/res/plus40.png | Bin 0 -> 333 bytes .../rust/src/ui/model_mercury/res/plus40.toif | Bin 0 -> 52 bytes .../src/ui/model_mercury/res/qr_code24.png | Bin 0 -> 476 bytes .../src/ui/model_mercury/res/qr_code24.toif | Bin 0 -> 152 bytes .../src/ui/model_mercury/res/reboot24.png | Bin 0 -> 430 bytes .../src/ui/model_mercury/res/reboot24.toif | Bin 0 -> 96 bytes .../model_mercury/res/simple_checkmark30.png | Bin 0 -> 397 bytes .../model_mercury/res/simple_checkmark30.toif | Bin 0 -> 78 bytes .../rust/src/ui/model_mercury/theme/mod.rs | 38 +++++++++++++++++- python/src/trezorlib/toif.py | 4 +- 36 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 core/embed/rust/src/ui/model_mercury/res/autofill30.png create mode 100644 core/embed/rust/src/ui/model_mercury/res/autofill30.toif create mode 100644 core/embed/rust/src/ui/model_mercury/res/bullet_checkmark20.png create mode 100644 core/embed/rust/src/ui/model_mercury/res/bullet_checkmark20.toif create mode 100644 core/embed/rust/src/ui/model_mercury/res/cancel24.png create mode 100644 core/embed/rust/src/ui/model_mercury/res/cancel24.toif create mode 100644 core/embed/rust/src/ui/model_mercury/res/chevron_right24.png create mode 100644 core/embed/rust/src/ui/model_mercury/res/chevron_right24.toif create mode 100644 core/embed/rust/src/ui/model_mercury/res/close30.png create mode 100644 core/embed/rust/src/ui/model_mercury/res/close30.toif create mode 100644 core/embed/rust/src/ui/model_mercury/res/delete30.png create mode 100644 core/embed/rust/src/ui/model_mercury/res/delete30.toif create mode 100644 core/embed/rust/src/ui/model_mercury/res/download24.png create mode 100644 core/embed/rust/src/ui/model_mercury/res/download24.toif create mode 100644 core/embed/rust/src/ui/model_mercury/res/exclamation_mark24.png create mode 100644 core/embed/rust/src/ui/model_mercury/res/exclamation_mark24.toif create mode 100644 core/embed/rust/src/ui/model_mercury/res/fire24.png create mode 100644 core/embed/rust/src/ui/model_mercury/res/fire24.toif create mode 100644 core/embed/rust/src/ui/model_mercury/res/menu30.png create mode 100644 core/embed/rust/src/ui/model_mercury/res/menu30.toif create mode 100644 core/embed/rust/src/ui/model_mercury/res/minus40.png create mode 100644 core/embed/rust/src/ui/model_mercury/res/minus40.toif create mode 100644 core/embed/rust/src/ui/model_mercury/res/page_down20.png create mode 100644 core/embed/rust/src/ui/model_mercury/res/page_down20.toif create mode 100644 core/embed/rust/src/ui/model_mercury/res/page_up20.png create mode 100644 core/embed/rust/src/ui/model_mercury/res/page_up20.toif create mode 100644 core/embed/rust/src/ui/model_mercury/res/plus40.png create mode 100644 core/embed/rust/src/ui/model_mercury/res/plus40.toif create mode 100644 core/embed/rust/src/ui/model_mercury/res/qr_code24.png create mode 100644 core/embed/rust/src/ui/model_mercury/res/qr_code24.toif create mode 100644 core/embed/rust/src/ui/model_mercury/res/reboot24.png create mode 100644 core/embed/rust/src/ui/model_mercury/res/reboot24.toif create mode 100644 core/embed/rust/src/ui/model_mercury/res/simple_checkmark30.png create mode 100644 core/embed/rust/src/ui/model_mercury/res/simple_checkmark30.toif diff --git a/core/embed/rust/src/ui/model_mercury/res/autofill30.png b/core/embed/rust/src/ui/model_mercury/res/autofill30.png new file mode 100644 index 0000000000000000000000000000000000000000..16cd93f3aad96f9335cac1ec45721598e13f22e5 GIT binary patch literal 542 zcmeAS@N?(olHy`uVBq!ia0vp^QXtF$Bp7-Wg@u3=QG*lJ~1#b>Up|2hG?8`owTs{kby|M{iP!Jqb|zZcKiA?I5Zr&Ce}DNA+PL@ zZNwRt$+I0w$~zRpIg^^WTqdmaIa)S5!`tXa-uWl7`=`FU(5V0b literal 0 HcmV?d00001 diff --git a/core/embed/rust/src/ui/model_mercury/res/autofill30.toif b/core/embed/rust/src/ui/model_mercury/res/autofill30.toif new file mode 100644 index 0000000000000000000000000000000000000000..5551d07fe6bcd8545ed1882ac51ff61596a80bc0 GIT binary patch literal 150 zcmV;H0BQeJPf14_02%;_0001EU_b*7WgQv9PrL!Z5`<>=;6lz E073jTQvd(} literal 0 HcmV?d00001 diff --git a/core/embed/rust/src/ui/model_mercury/res/bullet_checkmark20.png b/core/embed/rust/src/ui/model_mercury/res/bullet_checkmark20.png new file mode 100644 index 0000000000000000000000000000000000000000..0681bec6f3baae3e304d32f96b9a5405178d770b GIT binary patch literal 433 zcmeAS@N?(olHy`uVBq!ia0vp^LLkfmBp8a9UhD=^OiAAEE)4(M`_JqL^4Lo}eO=jK zFtds2bM4EL_yiO>=;`7ZB5^tQf@0Aj1_8H+{VZuxffGFhIFy7tdwW;DWUXRccThAd z`lhzZiAPxiAt6_UW}c96VO1$v_V@0-o3*<)|2fIB=9A5}Ij_nb0wZIj@4cSKc`?n7 z&-DD>3GHv5?VMlBsd6;Gd?MGBofiNA literal 0 HcmV?d00001 diff --git a/core/embed/rust/src/ui/model_mercury/res/bullet_checkmark20.toif b/core/embed/rust/src/ui/model_mercury/res/bullet_checkmark20.toif new file mode 100644 index 0000000000000000000000000000000000000000..3544814d6880a963d12627974ca85e66870af109 GIT binary patch literal 107 zcmV-x0F?h!Pf14-01^OS0001EV1NUK(vEOO5TmuDqay-H7j%FCJ465^B+vl?OaUO$ zqp^b(tc1O}gS`PrR|s}=a5QvCv{(RzISM*F99Ua`vOvWw3P5RAAmLF6WH7=FL|6g0 NltBRK3?_uD7yu@3BPIX< literal 0 HcmV?d00001 diff --git a/core/embed/rust/src/ui/model_mercury/res/cancel24.png b/core/embed/rust/src/ui/model_mercury/res/cancel24.png new file mode 100644 index 0000000000000000000000000000000000000000..0ab5220ca04cb63946432a44829491d77366d76b GIT binary patch literal 409 zcmeAS@N?(olHy`uVBq!ia0vp^A|T8GBp6maa=Hkln3BBRT^Rni_n+Ah{GWQRAQEH`@Z5O=c`E` zDkqY(Cd}wkatsMEFqrIf?a$BrwDNStMJ#KXQ`Rb^WVoEslW;bfG+`yfw)-_IoUyU-dv;hJ)evVnR(8&Z*`n&xOMu?#abD0 z(?$Ip7OG4!VpkKm;5WgGVdkMb2l?vWUoMosX>WJrD|^8Q&H5{TXS9KiRxNRjC`m~y zNwrEYN(E93Mg~SEx(3F&24*2fMpniaRwky}1_o9J2DSY;A5k>q=BH$)RpQpbbLomN rP=f~ChLX(O)Z&uF+yXQ`CgxU#1`tbT>d%S?>S6G7^>bP0l+XkKBI$`# literal 0 HcmV?d00001 diff --git a/core/embed/rust/src/ui/model_mercury/res/cancel24.toif b/core/embed/rust/src/ui/model_mercury/res/cancel24.toif new file mode 100644 index 0000000000000000000000000000000000000000..5344dea592b8419e8d09300eb3852ba95f10003d GIT binary patch literal 101 zcmV-r0Gj_)Pf14<02BaO0001EV1NOK4k%!0fU!6btO6K|UBCqj7#R?t1tRGIWwk?C z%q<=Y5EhFAivfgX!NAZARmUg*)qx;b4VVKUET(1)u-@j5^p1`)kT$4eBp4V3+ChvA HWCs8M@4z5y literal 0 HcmV?d00001 diff --git a/core/embed/rust/src/ui/model_mercury/res/chevron_right24.png b/core/embed/rust/src/ui/model_mercury/res/chevron_right24.png new file mode 100644 index 0000000000000000000000000000000000000000..5dea415fff50d75ed4edcc235f81e7b80ca32894 GIT binary patch literal 320 zcmeAS@N?(olHy`uVBq!ia0vp^oIuRS0VEi1{Ld@_QcOwS?k)`f+xyS#2lCiUJbhi+ zUof+Y>2vMNlK2D^3h;Ds4B@yQdS;>E0RtYEgPV^WN|_~f$Gxi1cAZv8>5Tvrg`%{g zjOPar`@Njb-Vm_%dim$Hv&>UGv}SvKn)cqc;Z|<1MyKaZ2ag4Fj?eg0#gNJ__xyQb zfH%-=)e_f;l9a@fRIB8oR3OD*WME{XYhbKvU>0IzWMyn*Wn`{xU|?lnU>*Bp8j6P8 z{FKbJO57T}7-F=58Z_WGlw{_n7MCRE7NF@dF}E@_fLJn9e^xwD4}+(xpUXO@geCw# CvtzRW literal 0 HcmV?d00001 diff --git a/core/embed/rust/src/ui/model_mercury/res/chevron_right24.toif b/core/embed/rust/src/ui/model_mercury/res/chevron_right24.toif new file mode 100644 index 0000000000000000000000000000000000000000..32666c3ecde88932b44b0501f851b3c7b756da19 GIT binary patch literal 44 zcmWIX_jKoE;A2o=U|>j2U}!ROV{2>TQV8tuGce%TvYC0Kg^Y1SL4yS|3j+fH*To7z literal 0 HcmV?d00001 diff --git a/core/embed/rust/src/ui/model_mercury/res/close30.png b/core/embed/rust/src/ui/model_mercury/res/close30.png new file mode 100644 index 0000000000000000000000000000000000000000..0e5b188bf9bffa062bcc2ceaa0d1a39695947a3e GIT binary patch literal 367 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx*Bp9q_EZ7UAn3BBRT^Rni_n+Aho>zOmq#5bq&lyjEt;|4XliewG9lc3=B>`7ubQKAvZrI zGp!O$gOP=mDO5v}nw=(4g9hA&lFZ!H;*!MN0yI4)=2nIV5KCt2&jPuM!PC{xWt~$( F699VqeG~uy literal 0 HcmV?d00001 diff --git a/core/embed/rust/src/ui/model_mercury/res/close30.toif b/core/embed/rust/src/ui/model_mercury/res/close30.toif new file mode 100644 index 0000000000000000000000000000000000000000..b9e2f3c4fb429603a96d086e374f0b100f3cc2be GIT binary patch literal 76 zcmV-S0JHy8Pf14*01yB`0000pU}gXU1?FZC5Zz+Y)WO2Q;Lu^=&;b-^0djyC%mxx5 iE=aHgtk$6e%!SiXahN)&KA1VpP;+7S7=Z0HU!A!G@)kIgMF$UVLn?v2~60+H?6_pOIhvlP4g=zpPu~v`@h{CdyjGMoh8-r$NBs* zkFEWzrxv$gWOVX>!XXozlGsmPsx?{~(?sxNi&t2zn;BQ&j zXqw4aC#9OD>e;D%;2vYZ@!*SXXMb@ViTWni%CKNt_~8aK%ZBXr*8X3AizV!2sSbWr zHa*sM-}CqLLKBQ)Sv;kp(HamwYVfPw*XC#iMf@b0mPD- T`m^GJdKf%i{an^LB{Ts5DgUyS literal 0 HcmV?d00001 diff --git a/core/embed/rust/src/ui/model_mercury/res/delete30.toif b/core/embed/rust/src/ui/model_mercury/res/delete30.toif new file mode 100644 index 0000000000000000000000000000000000000000..925396407b17a55886b1f3c832d5b2c3ae9b92d5 GIT binary patch literal 139 zcmV;60CfLUPf14`02Ba!0000@&#?*uF%SgMAtu`T34)-OK^tqU^jf5}yi%}9?V&fH z?ad}=rdb}dfh+)QP8J8{&YHdOXyBm-S3T$q=QoGvJPa9Q#*6f}w!{^YO!ZBGz#E%{ t^f6>$oQIzpqy%X|43al3BEwphR4(LhQf1x$zdsf9a-B-O`DpiVfiKp*K9>Lh literal 0 HcmV?d00001 diff --git a/core/embed/rust/src/ui/model_mercury/res/download24.png b/core/embed/rust/src/ui/model_mercury/res/download24.png new file mode 100644 index 0000000000000000000000000000000000000000..9a9233e4d68173662d4bc8e18ad03940480889f8 GIT binary patch literal 390 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#=`Bp4pvH+~MJn3BBRT^Rni_n+Ah;`=jZzy%*^Iod%?n;#*oIrV8{@D zvZ%=5PvIHfTcQjV$7fvI!hCMh-j&N@om{yeXvE#@GShjHH)mQKuYi)=i#=UM?l-2% z%kJ&oc_PiU`R~62;o>zOmq#5bq&ly zjEt;I46RIzv<(cb3=DGFa?DUP02TmH0001EU_b@s2xbQ@mA`&;e#Lw0Ly1ctBJ* ybaZsEfTV#kEgc>pMgs>(7%14l0b(*3Gr*Y)5T*r`+01Ux0Rt=yB~X?HvJU}DR30S& literal 0 HcmV?d00001 diff --git a/core/embed/rust/src/ui/model_mercury/res/exclamation_mark24.png b/core/embed/rust/src/ui/model_mercury/res/exclamation_mark24.png new file mode 100644 index 0000000000000000000000000000000000000000..5627767ba8a59f77024ec72b887cfd82acea5324 GIT binary patch literal 502 zcmeAS@N?(olHy`uVBq!ia0vp^5{-GatWYuI%Ms zEy_}n#6M%R3hVJk6XEU56K2)b?Z38)oxdfO{glLI#p{PEzx3tNHim@_kSdo0anXkMK52-0ermapvfDA*@{{VOn#R7+eVN>UO_QmvAU zQh^kMk%5tku7RU{QIpau=N j4JDbmsl_FUxdrHY%;A>I)Snd()WhKE>gTe~DWM4fr+v5x literal 0 HcmV?d00001 diff --git a/core/embed/rust/src/ui/model_mercury/res/exclamation_mark24.toif b/core/embed/rust/src/ui/model_mercury/res/exclamation_mark24.toif new file mode 100644 index 0000000000000000000000000000000000000000..8e9f4603692a0e114606309f51bcdf81147978fc GIT binary patch literal 153 zcmV;K0A~MGPf14@02Tm^00018k0B4jFc3zsrOPHKk(J0PQdu#9teBW2!5}LqS<1%! zY_4}L$@t9oa=E@-0siv1{?H?u%BxG4%6sFV1&2ieYT@VrQY-wXzTX&o)Umb59ArdSvMuvb HAHMwsmKsO0 literal 0 HcmV?d00001 diff --git a/core/embed/rust/src/ui/model_mercury/res/fire24.png b/core/embed/rust/src/ui/model_mercury/res/fire24.png new file mode 100644 index 0000000000000000000000000000000000000000..c075d37fbaf2895a37609fdec2de7f850a054631 GIT binary patch literal 472 zcmeAS@N?(olHy`uVBq!ia0vp^B0wz00VEinYCXOMq?nSt-CY>|xA&jf59G0zc>21s zzhGt))92ckCGiO;^up7{F+}2W?Zx$ehYJJ_d^~?k_n~_9&WR3(j<8I1<~#0TU~{;F zHLlV9f#kBn1dk1?@4R7YIu)kSCBeDq?hTeXJ9od2eW(Bb)EC9Ovp)9uR^MD@*YdK* zz_Ytb{#=km%Drd{$+hg}zB)Z?UK;JQeG#s6^bYIc$M5>)J)3>P;^4*nEF-ay^z zx;S%P-RVy|Uu(bUZV}t}VNctF+z(gyRmIX5to91n*C@m_F*TT-=Yewy>tvBjrMAywVn+gsbS@HROnn?Wm&;BL1r1{S`Z;H55zyCG+ zeP_$K*h;m7KtHRNxJHzuB$lLFB^RXvDF!10BNJT%V_gHY5F;Zi6B8?A3vB}fD+2@7 zSsztVH00)|WTsW()(~>sb0$!O2Hb{{%-q!ClEmBsbUo%)h6WHzX6nz12kK$)boFyt I=akR{0Q}*&Jpcdz literal 0 HcmV?d00001 diff --git a/core/embed/rust/src/ui/model_mercury/res/fire24.toif b/core/embed/rust/src/ui/model_mercury/res/fire24.toif new file mode 100644 index 0000000000000000000000000000000000000000..c7d1d9c6da2af617fb94027a98c9daaab997c67b GIT binary patch literal 145 zcmV;C0B-+OPf14<02Tm+00010k1-E|FcgFji^#|ZV@F4vTp1lrNC=~oGcKm1Mhy3} zz1L!*m$d!T+`C?ZUvTc`Jh8vmT&EWi^c}yv|R;Tz}Y}l<;q{DS^f4}(vi)%%Y literal 0 HcmV?d00001 diff --git a/core/embed/rust/src/ui/model_mercury/res/menu30.png b/core/embed/rust/src/ui/model_mercury/res/menu30.png new file mode 100644 index 0000000000000000000000000000000000000000..8c48673a9cdde9ee8188a2da080cfc5ee51453f7 GIT binary patch literal 324 zcmeAS@N?(olHy`uVBq!ia0vp^5|xA&jf59G0zc>21s zzhGt))92ckCGiO;6yoXP7$R{wIVC_W=>SXl{f!){#tF<em_CACF{YP?`J)PeC`)Ysj?V%Jv7>+#L##{ zNTPYcmFGb7RZCnWN>UO_QmvAUQh^kMk%5tku7R|xA&jf59G0zc>21s zzhGt))92ckB>_^P?CIhd!f`!0;Q*(EWQ)&6uQ_$cPXuUpgubdZ7LH_lbnOTO!&Nml zwtTPo6+q>xC9V-ADTyViR>?)FK#IZ0z{o_`z*yJ7EX2sj$^?Y84GgRd4B8B@o1$pQ z%}>cptHiD0drp2QP=f~ChLX(O)Z&uF+yZnx=2nIV5KCt2&x!}?VeoYIb6Mw<&;$Tq COiS$m literal 0 HcmV?d00001 diff --git a/core/embed/rust/src/ui/model_mercury/res/minus40.toif b/core/embed/rust/src/ui/model_mercury/res/minus40.toif new file mode 100644 index 0000000000000000000000000000000000000000..b284565c85a0914102cd4be309bdf0f3590bf1ce GIT binary patch literal 33 ocmWIX_jH$HU}F$vU|>j2aA0E6<2Vp;p^@Q@hKxw+iC>Zo0CeC8lK=n! literal 0 HcmV?d00001 diff --git a/core/embed/rust/src/ui/model_mercury/res/page_down20.png b/core/embed/rust/src/ui/model_mercury/res/page_down20.png new file mode 100644 index 0000000000000000000000000000000000000000..740ce632c57546da56680a7a35e6a94663ce0f25 GIT binary patch literal 379 zcmeAS@N?(olHy`uVBq!ia0vp^JU}eO0VEi_4kcUwQcOwS?k)`f+xyS#2lCiUJbhi+ zUof+Y>2vMNlK2D^>h^ST4B@z5du}1$Ap;S&hnGz|6uVsPA2J5}~DBnj#0@Ax7( z!?jGTQG%&ZU7(|{t)*r0yYzoCKfIFv1RLE+%>H$~B~YyFuJ43@yCQkFvrO1Mznp>9 z;mCxKFZs``^qOuzy|wVT)B*FdmF%f^5BFXY(Bt}MJz>&?MT%OddoC>FU$m*kEdQFQ z{a!|+WlF4@{fyj!&QdLLjVMV;EJ?LWE=mPb3`PbgTe~DWM4fUd4Rj literal 0 HcmV?d00001 diff --git a/core/embed/rust/src/ui/model_mercury/res/page_down20.toif b/core/embed/rust/src/ui/model_mercury/res/page_down20.toif new file mode 100644 index 0000000000000000000000000000000000000000..4beae7db0b8f3e7da0008c80083e1d5e667cfa26 GIT binary patch literal 79 zcmV-V0I>g5Pf14%01^O00001EU;qIDVGwE1!3tuRWPpX*nL$(&8;ERR$3`YHHLx47 lHCZ&UH)}X_G@Ey@Ftl`ZcrY+HbO4zQ3@sjDQ<)f`006Nh7}fv) literal 0 HcmV?d00001 diff --git a/core/embed/rust/src/ui/model_mercury/res/page_up20.png b/core/embed/rust/src/ui/model_mercury/res/page_up20.png new file mode 100644 index 0000000000000000000000000000000000000000..d8b1695bf8086d574874ec3220170c46143e92ce GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^JU}eO0VEi_4kcUwQcOwS?k)`f+xyS#2lCiUJbhi+ zUof+Y>2vMNlK2D^YVdS%4B@!m+OI8k$UwwJKT|-$MThC4diNT)b6hu_w;d2`(qR(5 zc}l6-Wr#}RQs&hYLT3a%-2C$_Up z@Us3@H1qXtzVDUq)+&%fBf>hNVNz1)~}VnR$$ToJ~H31NWoiA&?X+} z7S$5hh?11Vl2ohYqEsNoU}RuqqHAERYhV^)WMpMxU}a>fZD3$!VBoeUsuV>-ZhlH; yS|x4`<{uxO1ZvQL+fb63n_66wm|K9Z$K1-$0Ak5Z{aGMaF?hQAxvXg5Pf14%01^O00001EV1NJxW)Rup0VEtcI#__rjt&nXv)H18rOBdzqgf+? lxqw4KjDewm1Edm@Owa(41{I7Ts?8ll1$2N-HDrX?0RaB#8_@s& literal 0 HcmV?d00001 diff --git a/core/embed/rust/src/ui/model_mercury/res/plus40.png b/core/embed/rust/src/ui/model_mercury/res/plus40.png new file mode 100644 index 0000000000000000000000000000000000000000..78d98a494668080c7c7facc83a52887ce06f0c9e GIT binary patch literal 333 zcmeAS@N?(olHy`uVBq!ia0vp^QXtF$Bp7-Wg@u3=QG*lJ^_VdJzX3_G|nd{9N?6gc*E%?Pw;)k9X=jG%bJ>&@!VK?;lPAxNr?hY z)xoWej;wlxzhsr2*D8eBzMuV3;zUQz0;9ustvQ$@CGNd#Ssk3Vqxk{Pvj2aA0S8+QZT3%+4Ka$)x8n;nG94MH1Xr0u8dQ&5LpzWV$3n H3>X*yOS27( literal 0 HcmV?d00001 diff --git a/core/embed/rust/src/ui/model_mercury/res/qr_code24.png b/core/embed/rust/src/ui/model_mercury/res/qr_code24.png new file mode 100644 index 0000000000000000000000000000000000000000..44e5c765c1d90575c29bf545aa73a09af4fe5a6f GIT binary patch literal 476 zcmeAS@N?(olHy`uVBq!ia0vp^A|T8GBp6maa=Hkln3BBRT^Rni_n+AhNZ800!0v;&Mz!1oaEuR=a7rt-8A7jlaSAohv53 zQZn1RbA{mS^1|*lXB+e?FL6G%jQ`W@QYyQl{{7W(%WwRKrNRlQRkc=rf~Hd>sL z=(kvOg1sehQRacy!IiVirE~w5&fhg>&Z|`?RHt~&oO$&?kfF`A_g{aA*e{<~di7v? z_qEvn(RH)u*jfM4<@#97cQ$f+*Hhm&#qcAhNjvE237_J zx7Kp5M$wR)pOTqYiCe?!4;#gS8Z_WGlw{_n7MCRE7NF@dF}E@_fLJn9e^xwD4}+(x KpUXO@geCw5;IgX# literal 0 HcmV?d00001 diff --git a/core/embed/rust/src/ui/model_mercury/res/qr_code24.toif b/core/embed/rust/src/ui/model_mercury/res/qr_code24.toif new file mode 100644 index 0000000000000000000000000000000000000000..bbb31eedbb00328eb04cdf4d9c8f98eb2717d1b2 GIT binary patch literal 152 zcmV;J0B8SHPf14<02Ba>0000zj2Gc=5O>yKKHp@+^iXGPa GUmhRe*gLrZ literal 0 HcmV?d00001 diff --git a/core/embed/rust/src/ui/model_mercury/res/reboot24.png b/core/embed/rust/src/ui/model_mercury/res/reboot24.png new file mode 100644 index 0000000000000000000000000000000000000000..0532dcc52f8c3bd7c41c807c89e6e68f49e85767 GIT binary patch literal 430 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#=`Bp4pvH+~MJn3BBRT^Rni_n+AhIK&PkX!sm{B);{74x88vM84rZuk z6|!juHZwkowP8B=VBw$Q(`RcoZ?4{KKV!=0%BGfN@!iw9_TAnZvV8Fb1wpG&XB)>t zHBG+uxaiO{t`9eU#oEN5erC$ox#Y=|$BA7LM_M;Vi26y~lj>)DE~q~g#3Ja=FG zKKda%UxveJ_x2xR8-PAhEpd$~Nl7e8wMs5Z1yT$~21X{j2FAJuW+6sKRwl+)hL+j} z237_J$|BFEqG-s?PsvQH#H}I7GfoqzK?80>NoH02TmL0001EU_b_i>@b!2vMNlK2D^n(OJ}7$R}G_JX3&Ap-%ohwj`-sYR?4T#~xiJZ0g?(Q$vk)Dd;= z;1@2BB<&pz%E^Mh3-2aI{5-oy)c((oAm`F2p&FanH@h!xZ$EZR;5}C^FE5wvmc54* z=Oy)bKHg8Oap5s^6^+*hYnoIWq!@U<=D!6pAN zuY;W*IzN|aTKqirc%EiX*!3g#tC{nab%dJw&8mS8RV{IiC`m~yNwrEYN(E93Mg~SE zx(3F&24*2fMpniKRt6^820+rlCsorMMMG|WN@iLmZVk2;6TbsBXuxeK$;?eHE=kNS dK+|JlZe?fyv1F$HtazXv22WQ%mvv4FO#qf|hW7vf literal 0 HcmV?d00001 diff --git a/core/embed/rust/src/ui/model_mercury/res/simple_checkmark30.toif b/core/embed/rust/src/ui/model_mercury/res/simple_checkmark30.toif new file mode 100644 index 0000000000000000000000000000000000000000..1e4001c284b94df88849bbb42864a02d9dbd4caf GIT binary patch literal 78 zcmV-U0I~m6Pf14<022U00001EU_b}O%ut3v2RoEi(7^&_wN$_*B?w6h!z2?b7@?90 k9pX?)f%XbUsLsL;ai~t9Ak5gp4w$h(L73ADCD7ao0O08yu>b%7 literal 0 HcmV?d00001 diff --git a/core/embed/rust/src/ui/model_mercury/theme/mod.rs b/core/embed/rust/src/ui/model_mercury/theme/mod.rs index f444d39dc..c50aa3782 100644 --- a/core/embed/rust/src/ui/model_mercury/theme/mod.rs +++ b/core/embed/rust/src/ui/model_mercury/theme/mod.rs @@ -63,8 +63,44 @@ pub const RADIUS: u8 = 2; pub const QR_SIDE_MAX: u32 = 140; // UI icons (greyscale). + +// 20x20 +include_icon!( + ICON_BULLET_CHECKMARK, + "model_mercury/res/bullet_checkmark20.toif" +); +include_icon!(ICON_PAGE_DOWN, "model_mercury/res/page_down20.toif"); +include_icon!(ICON_PAGE_UP, "model_mercury/res/page_up20.toif"); + +// 24x24 +include_icon!(ICON_CANCEL, "model_mercury/res/cancel24.toif"); +include_icon!(ICON_CHEVRON_RIGHT, "model_mercury/res/chevron_right24.toif"); +include_icon!(ICON_DOWNLOAD, "model_mercury/res/download24.toif"); +include_icon!( + ICON_EXCLAMATION_MARK, + "model_mercury/res/exclamation_mark24.toif" +); +include_icon!(ICON_FIRE, "model_mercury/res/fire24.toif"); +include_icon!(ICON_QR_CODE, "model_mercury/res/qr_code24.toif"); +include_icon!(ICON_REBOOT, "model_mercury/res/reboot24.toif"); + +// 30x30 +include_icon!(ICON_AUTOFILL, "model_mercury/res/autofill30.toif"); +include_icon!(ICON_CLOSE, "model_mercury/res/close30.toif"); +include_icon!(ICON_DELETE, "model_mercury/res/delete30.toif"); +include_icon!(ICON_MENU, "model_mercury/res/menu30.toif"); +include_icon!( + ICON_SIMPLE_CHECKMARK, + "model_mercury/res/simple_checkmark30.toif" +); + +// 40x40 +include_icon!(ICON_MINUS, "model_mercury/res/minus40.toif"); +include_icon!(ICON_PLUS, "model_mercury/res/plus40.toif"); + +// TODO remove TT icons: + // Button icons. -include_icon!(ICON_CANCEL, "model_tt/res/x24.toif"); include_icon!(ICON_CONFIRM, "model_tt/res/check24.toif"); include_icon!(ICON_SPACE, "model_tt/res/space.toif"); include_icon!(ICON_BACK, "model_tt/res/caret-left24.toif"); diff --git a/python/src/trezorlib/toif.py b/python/src/trezorlib/toif.py index 9382c5d3a..138a9bdba 100644 --- a/python/src/trezorlib/toif.py +++ b/python/src/trezorlib/toif.py @@ -215,8 +215,8 @@ def from_image( image = image.convert("L") if image.mode == "L": - if image.size[0] % 2 != 0: - raise ValueError("Only even-width grayscale images are supported") + # if image.size[0] % 2 != 0: + # raise ValueError("Only even-width grayscale images are supported") if not legacy_format: toif_mode = ToifMode.grayscale_eh toif_data = _from_pil_grayscale(image.getdata(), right_hi=True)