From a1f4b8065a65cdaddfc998ea496cb8e6366713f6 Mon Sep 17 00:00:00 2001 From: MX <10697207+xMasterX@users.noreply.github.com> Date: Thu, 8 Sep 2022 23:33:34 +0300 Subject: [PATCH] fix lfrfid gui and add icon oops I forgot about multiline element --- .../lfrfid/scenes/lfrfid_scene_read_success.c | 15 +++++++-------- .../lfrfid/scenes/lfrfid_scene_saved_info.c | 2 +- assets/icons/RFID/RFIDBigChip_37x36.png | Bin 2372 -> 0 bytes assets/icons/RFID/RFIDSmallChip_14x14.png | Bin 0 -> 2094 bytes 4 files changed, 8 insertions(+), 9 deletions(-) delete mode 100644 assets/icons/RFID/RFIDBigChip_37x36.png create mode 100644 assets/icons/RFID/RFIDSmallChip_14x14.png diff --git a/applications/lfrfid/scenes/lfrfid_scene_read_success.c b/applications/lfrfid/scenes/lfrfid_scene_read_success.c index 550878a8d..659371520 100644 --- a/applications/lfrfid/scenes/lfrfid_scene_read_success.c +++ b/applications/lfrfid/scenes/lfrfid_scene_read_success.c @@ -17,7 +17,7 @@ void lfrfid_scene_read_success_on_enter(void* context) { protocol_dict_get_manufacturer(app->dict, app->protocol_id)); widget_add_string_element( - widget, 0, 2, AlignLeft, AlignTop, FontPrimary, string_get_cstr(tmp_string)); + widget, 16, 3, AlignLeft, AlignTop, FontPrimary, string_get_cstr(tmp_string)); string_reset(tmp_string); size_t size = protocol_dict_get_data_size(app->dict, app->protocol_id); @@ -25,10 +25,10 @@ void lfrfid_scene_read_success_on_enter(void* context) { protocol_dict_get_data(app->dict, app->protocol_id, data, size); for(uint8_t i = 0; i < size; i++) { if(i != 0) { - string_cat_printf(tmp_string, " "); + string_cat_printf(tmp_string, ":"); } - if(i >= 9) { + if(i >= 8) { string_cat_printf(tmp_string, "..."); break; } else { @@ -40,19 +40,18 @@ void lfrfid_scene_read_success_on_enter(void* context) { string_t render_data; string_init(render_data); protocol_dict_render_brief_data(app->dict, render_data, app->protocol_id); - //string_cat_printf(tmp_string, "\r\n%s", string_get_cstr(render_data)); + string_cat_printf(tmp_string, "\r\n%s", string_get_cstr(render_data)); + string_clear(render_data); - widget_add_string_element( + widget_add_string_multiline_element( widget, 0, 16, AlignLeft, AlignTop, FontSecondary, string_get_cstr(tmp_string)); - widget_add_string_element( - widget, 0, 28, AlignLeft, AlignTop, FontSecondary, string_get_cstr(render_data)); + widget_add_icon_element(app->widget, 0, 0, &I_RFIDSmallChip_14x14); notification_message_block(app->notifications, &sequence_set_green_255); view_dispatcher_switch_to_view(app->view_dispatcher, LfRfidViewWidget); string_clear(tmp_string); - string_clear(render_data); } bool lfrfid_scene_read_success_on_event(void* context, SceneManagerEvent event) { diff --git a/applications/lfrfid/scenes/lfrfid_scene_saved_info.c b/applications/lfrfid/scenes/lfrfid_scene_saved_info.c index 1496c6b4b..7e376ca01 100644 --- a/applications/lfrfid/scenes/lfrfid_scene_saved_info.c +++ b/applications/lfrfid/scenes/lfrfid_scene_saved_info.c @@ -18,7 +18,7 @@ void lfrfid_scene_saved_info_on_enter(void* context) { protocol_dict_get_data(app->dict, app->protocol_id, data, size); for(uint8_t i = 0; i < size; i++) { if(i != 0) { - string_cat_printf(tmp_string, " "); + string_cat_printf(tmp_string, ":"); } string_cat_printf(tmp_string, "%02X", data[i]); diff --git a/assets/icons/RFID/RFIDBigChip_37x36.png b/assets/icons/RFID/RFIDBigChip_37x36.png deleted file mode 100644 index a60d51d585e712dc76aa850a394b5bdf16244786..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2372 zcmcIlYfuwc7!7I>Q9IN}OY3W0eCuW(B%5R<3MN$I7>$yOC^N9xy@Ayv8+R8$v=!7D zKrM_`YN@tptF6{zt&We;sT8Sbk&4nnwd1QktB#_gQ>Qx8yCgx|sg8e|na$qa{qFhB zcfND)Ep|+q*fa92NR39*)0SkN4(~(ZH6)@F{4dzR-_>Zs^n%6WNZ>^mK&DTefQ%qb zCgVtrX2hzp(yB={jy{D|{SpsvoDp&Hf`9llho`A}rET_dWac)@>PnlXtZ~Shw6^<$ z`=4d@?R(T^O39L?7kfVpU!L5xFrs?v{dEUhFZqq*iBa><3eh0?hgrMVl_=))<5kp= z9vbD)nBB80WAcr~F;8MHT9vt?Fu_0=`s4ZoOou>RJ~ zE@4GwYthjWcvDkFBq!cWI}=@b=x*owk`MC?fD?G(~SG?0yT#5|Z*HkeoNg$>q)EOguV%91@qyKmadLSR~i$@ySfC z8Ewa9;8=Z)qey#*GS`d-+BwtiKrEsJ5L!!M96?Zs!K5W=osK5PAQV9nIHAW$3L|NT z&@rR|3I0%+P2%0mbnDx}T=2<^W+{rF!SS4&9BodlR+KVvXcZGqP&h?lFanbo_!Kr5 z^T{zG1S^m^N$@Lz=tERQ)+J^uW)w0Fl;HJu!20B%Oi(a9m-XYMmQYIy1={T|4)uCF zqGcs~kt(C$1Yl(qU`Aor zNQ|H{O6Q~~Mn^EDaWqLV1Q7_eLm%+0!oFOv$P4ZTFB59FGd7>Bus#mhtY#FF(h364 z#L{jTWzZ8CsW<2_p4PcAmgNnY-r#24Jmrq1IbAz1INvIA*{Txi{D5tFk%Jf=YBC1k zHkn)mftmCifzd`?EXLBD3!_~ok~Zi}v>vb_w5gH+R}SlW7FA`%LqtIFtV?I$Fdav@ zFp7gXMx%+vj4n6n*1L>sY^)nap60cP9#OK3JXAOK+4nZMElQ$W@W2m&_4IUmL=m22 z+@j=Vq0a;_n+b5gFH?0rWC5#95@guo1;KTc4CVz#9sy}LC&O~;nlPiBY6ifg!Pmln zsQhyE1YmQr00e!3NdjTA=vH!A2_$5~j)bavt_ktyk(b%|FQ)!-2KgVU2W925SYIZ9 z8!V2h#o+2z6leagQbfDawV3h=>FC3tA8NFId3 z6Mm%4n&3<-zLk>Ds|JZ!R?^l+nLirbCv4-Y@`3xi4j)#K{Z9Onhvc1>oTg3T1THe%Z@NvVgI9k@8YP>(Np|J5zUF(2^ z_e=Md%{lP!>Z0x5H_pp_9>&cZT3q`?_qnUzC|hsK`TZ?`&hQ)PX*(`8^tk4|F|Awm z<0B`AA4^_8ttq9vusSuxQt@?BV{OcbyDICG7u`#_o;9|ju5Q^+DUH`s!2{cXsrUO{ zOpq?uq}Fy@(_C7($G1%XOEc&`0WC{Eb#7a?f*(I^=%12SXa3*;7@WTF@Hfs*i}wwz zt~xmAO6#V$%9er7w8eYh8?>mrRqDI0HTzHO&cV_LXCKEOjmJ+8I8t_V>8{$;$)6cc XT$mAK7+<@!3WGwj`RwPpe diff --git a/assets/icons/RFID/RFIDSmallChip_14x14.png b/assets/icons/RFID/RFIDSmallChip_14x14.png new file mode 100644 index 0000000000000000000000000000000000000000..24219a548e93ad1512ca01fd0cf89b4fd9aea789 GIT binary patch literal 2094 zcmcIlJ!~9B6kedf2?`*A1OkDUb(1K}?#%4m{wbHp_Y-W1GsZq-LzUT?*}IkRcGkOV z-`S!-hyr&>5sHYG7CH(L0wF4BkcB9y=+Yn=Dk@}V?=Jxy=NeAh+rKy8`{sS$+jqFO z`r3u_FPzsj?ZV1(W4%0=$HJrP|F6URvO1khm*37c?TKf~;}Px7$Iolp;~&KBtzxV7 zdcb7gq+Eu=9QIQct!Y=T4O7atMWKhH6DL*U_{*;iJ?2$ov(kdCv@W{w@)G7JI696~(rRUJbNE$CVZ0*nLb1QlDK{0x;X<595QxIW3H?y5$&DAK^P27`e)uuYkD zEadyX1+j%OP!S;CPYOB&NxnEmXo#F;aazPO(Mv=c%H5)BD5m2r^wSw^l26K{3T6#y zY9SMrTbc&8T4#s$`?Ki0Xzr;j6TYVc=k5JeSnDE}yBQPBJ&_cP(`0E^7BcV32XLFc z{s%+OW(m{XtT!qTXO`%RzQWE`EE@4kgL)=tA+xrWy{S-Z(~LUCCe$x(#tD~${8Gti zvOqLwA*zN_4Fl){=(VvOU=kpB8QKAaFIe(8+Mg%1)e2UUyr2maD~+n5 zNSSfW1D|@xB^4jw3iJSU2m+x)eBgQnA=kwoC2Yh?t#3%STUMf6KejEGOkvEb89?s& z)MgOa73Kqhhzq<5bbtpjg^2r3Xji6aZ)CCR9NN1dwPeK=q8+-CvecBOLnsiDxD|EGsyRfeaO5)cxf2#A#Fkr=b+#Sg=xE+UmELcnp52OLa1;KPssCyYqs zb4)@P&yD4ykRV7vB(OrjWh4560o%15TR;~R$DJ38F&cR|jMN@g8!}87po9w5kb(;j zRzgUe|6)y>uL*0-2DbgWyHrD{S*toQ_ zDlcb)QQgc&t4NeBGBr5A{pjW&YUr-5G?v;IZ{2?LhbJ|C;ppd+6a3OI@7_vwHlFUD z)8ZTLqu-sQ@4r}h>$!#Z%&*o5zdrWj=AR$F^NqQF`?tG4{djB*o{BErSu|e$