From 702786078da00aeb33529f4e583b3b81f110f146 Mon Sep 17 00:00:00 2001 From: DerSkythe Date: Tue, 11 Oct 2022 22:38:36 +0400 Subject: [PATCH] in PNG waves down 2 px, MHZ in Read screen --- applications/main/subghz/views/receiver.c | 9 ++++++--- assets/icons/SubGhz/Scanning_123x52.png | Bin 1466 -> 1470 bytes 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/applications/main/subghz/views/receiver.c b/applications/main/subghz/views/receiver.c index 22c1a75ed..30372a51d 100644 --- a/applications/main/subghz/views/receiver.c +++ b/applications/main/subghz/views/receiver.c @@ -265,10 +265,13 @@ void subghz_view_receiver_draw(Canvas* canvas, SubGhzViewReceiverModel* model) { canvas_draw_icon(canvas, 64, 55, &I_Unlock_7x8); canvas_draw_str(canvas, 74, 62, "Unlocked"); break; - default: - canvas_draw_str(canvas, 44, 62, furi_string_get_cstr(model->frequency_str)); + default: { + const char* frequency_str = furi_string_get_cstr(model->frequency_str); + canvas_draw_str(canvas, 44, 62, frequency_str); #ifdef SUBGHZ_EXT_PRESET_NAME if(model->history_item == 0 && model->mode == SubGhzViewReceiverModeLive) { + canvas_draw_str( + canvas, 44 + canvas_string_width(canvas, frequency_str) + 1, 62, "MHz"); const char* str = furi_string_get_cstr(model->preset_str); const uint8_t vertical_offset = 7; const uint8_t horizontal_offset = 3; @@ -285,7 +288,7 @@ void subghz_view_receiver_draw(Canvas* canvas, SubGhzViewReceiverModel* model) { canvas_draw_str(canvas, 79, 62, furi_string_get_cstr(model->preset_str)); #endif canvas_draw_str(canvas, 96, 62, furi_string_get_cstr(model->history_stat_str)); - break; + } break; } } diff --git a/assets/icons/SubGhz/Scanning_123x52.png b/assets/icons/SubGhz/Scanning_123x52.png index 805b28d84d19ee6d99f93925fabc4f58c2245cef..485052c1457041d0c3d27cab462cbfd4cfe10fbf 100644 GIT binary patch delta 549 zcmV+=0^0q$3%(1GTMEJe01msU1}Izu6`O z5Cj#w|C*2YJeo@-WYF>-mgxEeZNJ<+IiUeF1Al{qy0$#Ei6Cr-q5 z6WPh%;7KG5C_8z@*8|Oa#x=0Pp-(OTX^-7CMI)GtC*k@dt9Zw&f%(sSJdPJ>2fL`M ze^p&Jp6zfZBTpNIZZMzq9X@RAnY9eJEqW<@j))=5WQa z#|`ogT4QAQ9aj^>k#S8nsi4JHUU0XS$b}!#JY_Pc5Udr(RYUYRIrtYey_AUWR&FZD6rw9c4GI1~W~OJ`SSF z?(lJMOn~7e2YxdvN4xjVf%ID#LkorFVYS#X@}>noW*#5$bqZ^-CLE9W@>bQUe~07O zb+&@d6^^m=zS_yz@@#vTKF54fM;d6wOP3$jgXR|;Lmge*UmG9PBY4t-=~MMk-R1k3 z6`XvPBz2c>!>+q=s_yTSp( n=)$Y~C;IY2pY!*&O8Ei0_8$4n558!L00000NkvXXu0mjfSu+o_ delta 545 zcmV++0^a?;3%U!CTMEMf01m?e$8V@)v1LvJfAUF0K~zY`-IiNo#UKbonH>!K-)seZ zU^Izo|LVu>t>I)q9$xtmOKtsu_D^n}oX~)qfxp2)TU#D@$7yC^hci5@xJ8whi#)gZ zv>8N1f0f_ki+I`6oxI`efo%Q(HaP65$DiMU{D!tqwFu_oNw|GzC%E9n!2Rbv-j8>P zfBUzhTGVy%o;w`b{YV>>VKATd9X{OmXWlY&Ys|RqHN3VJvik)n$~5;q)Ey4(>x$DI zE;#nML-7J8=V#nZ97o12*`$FUo4nv*t2GyasDHaXI>*Iv)V6Qg_d={MzDpbj<4%%e+8c_ z9AoKywUhG|*^VxKj`^aFG|(hUmmk$D%`Z5HI=XmV8z0nb@MHwjr|O}4$oDa;IQdnQ z)I+`vyY9xRdfX++6`rX#vplTyRD9dcrRERCw+(eJzWd>34R