[FL-1371][FL-1502] Lfrfid app: fixes. (#555)

* Gui module byte-input: changed api
* Gui: changed font height in multiline text according to guideline
* Apps lrfid, nfc: changed send and receive icon
* App lfrfid: fix text, fix scene switсh
* Elements: multiline text framed, fix paddings
* Gui: remove duplicate definition of elements_multiline_text_framed
* App NFC: update byte_input callback signature
* App subghz: fix text lines in capture scene
* App subghz: position of the text is aligned with the guidelines and other scenes
* App subghz: removed mockup

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>

4 files changed, 15 insertions, 15 deletions

diff --git a/applications/subghz/views/subghz_capture.c b/applications/subghz/views/subghz_capture.c
index 91fab068..94ca5e28 100644
--- a/applications/subghz/views/subghz_capture.c
+++ b/applications/subghz/views/subghz_capture.c
@@ -39,10 +39,10 @@ void subghz_capture_draw(Canvas* canvas, SubghzCaptureModel* model) {
         model->real_frequency / 1000000 % 1000,
         model->real_frequency / 1000 % 1000,
         subghz_symbols[model->counter % 4]);
-    canvas_draw_str(canvas, 2, 12, buffer);
+    canvas_draw_str(canvas, 0, 8, buffer);
 
     canvas_set_font(canvas, FontSecondary);
-    elements_multiline_text(canvas, 0, 24, string_get_cstr(model->text));
+    elements_multiline_text(canvas, 0, 20, string_get_cstr(model->text));
 }
 
 bool subghz_capture_input(InputEvent* event, void* context) {
diff --git a/applications/subghz/views/subghz_static.c b/applications/subghz/views/subghz_static.c
index 18da91f6..4506b027 100644
--- a/applications/subghz/views/subghz_static.c
+++ b/applications/subghz/views/subghz_static.c
@@ -38,7 +38,7 @@ void subghz_static_draw(Canvas* canvas, SubghzStaticModel* model) {
 
     canvas_set_color(canvas, ColorBlack);
     canvas_set_font(canvas, FontPrimary);
-    canvas_draw_str(canvas, 2, 12, "CC1101 Static");
+    canvas_draw_str(canvas, 0, 8, "CC1101 Static");
 
     canvas_set_font(canvas, FontSecondary);
     // Frequency
@@ -49,9 +49,9 @@ void subghz_static_draw(Canvas* canvas, SubghzStaticModel* model) {
         model->real_frequency / 1000000 % 1000,
         model->real_frequency / 1000 % 1000,
         model->real_frequency % 1000);
-    canvas_draw_str(canvas, 2, 24, buffer);
+    canvas_draw_str(canvas, 0, 20, buffer);
     snprintf(buffer, sizeof(buffer), "Key: %d", model->button);
-    canvas_draw_str(canvas, 2, 36, buffer);
+    canvas_draw_str(canvas, 0, 31, buffer);
 }
 
 bool subghz_static_input(InputEvent* event, void* context) {
diff --git a/applications/subghz/views/subghz_test_basic.c b/applications/subghz/views/subghz_test_basic.c
index 26c74e3c..cdfe1f0c 100644
--- a/applications/subghz/views/subghz_test_basic.c
+++ b/applications/subghz/views/subghz_test_basic.c
@@ -29,7 +29,7 @@ void subghz_test_basic_draw(Canvas* canvas, SubghzTestBasicModel* model) {
 
     canvas_set_color(canvas, ColorBlack);
     canvas_set_font(canvas, FontPrimary);
-    canvas_draw_str(canvas, 2, 12, "CC1101 Basic Test");
+    canvas_draw_str(canvas, 0, 8, "CC1101 Basic Test");
 
     canvas_set_font(canvas, FontSecondary);
     // Frequency
@@ -40,7 +40,7 @@ void subghz_test_basic_draw(Canvas* canvas, SubghzTestBasicModel* model) {
         model->real_frequency / 1000000 % 1000,
         model->real_frequency / 1000 % 1000,
         model->real_frequency % 1000);
-    canvas_draw_str(canvas, 2, 24, buffer);
+    canvas_draw_str(canvas, 0, 20, buffer);
     // Path
     char* path_name = "Unknown";
     if(model->path == ApiHalSubGhzPathIsolate) {
@@ -53,7 +53,7 @@ void subghz_test_basic_draw(Canvas* canvas, SubghzTestBasicModel* model) {
         path_name = "868MHz";
     }
     snprintf(buffer, sizeof(buffer), "Path: %d - %s", model->path, path_name);
-    canvas_draw_str(canvas, 2, 36, buffer);
+    canvas_draw_str(canvas, 0, 31, buffer);
     if(model->status == SubghzTestBasicModelStatusRx) {
         snprintf(
             buffer,
@@ -61,9 +61,9 @@ void subghz_test_basic_draw(Canvas* canvas, SubghzTestBasicModel* model) {
             "RSSI: %ld.%ld dBm",
             (int32_t)(model->rssi),
             (int32_t)fabs(model->rssi * 10) % 10);
-        canvas_draw_str(canvas, 2, 48, buffer);
+        canvas_draw_str(canvas, 0, 42, buffer);
     } else {
-        canvas_draw_str(canvas, 2, 48, "TX");
+        canvas_draw_str(canvas, 0, 42, "TX");
     }
 }
 
diff --git a/applications/subghz/views/subghz_test_packet.c b/applications/subghz/views/subghz_test_packet.c
index 28c35c72..27aa264b 100644
--- a/applications/subghz/views/subghz_test_packet.c
+++ b/applications/subghz/views/subghz_test_packet.c
@@ -37,7 +37,7 @@ void subghz_test_packet_draw(Canvas* canvas, SubghzTestPacketModel* model) {
 
     canvas_set_color(canvas, ColorBlack);
     canvas_set_font(canvas, FontPrimary);
-    canvas_draw_str(canvas, 2, 12, "CC1101 Packet Test");
+    canvas_draw_str(canvas, 0, 8, "CC1101 Packet Test");
 
     canvas_set_font(canvas, FontSecondary);
     // Frequency
@@ -48,7 +48,7 @@ void subghz_test_packet_draw(Canvas* canvas, SubghzTestPacketModel* model) {
         model->real_frequency / 1000000 % 1000,
         model->real_frequency / 1000 % 1000,
         model->real_frequency % 1000);
-    canvas_draw_str(canvas, 2, 24, buffer);
+    canvas_draw_str(canvas, 0, 20, buffer);
     // Path
     char* path_name = "Unknown";
     if(model->path == ApiHalSubGhzPathIsolate) {
@@ -61,7 +61,7 @@ void subghz_test_packet_draw(Canvas* canvas, SubghzTestPacketModel* model) {
         path_name = "868MHz";
     }
     snprintf(buffer, sizeof(buffer), "Path: %d - %s", model->path, path_name);
-    canvas_draw_str(canvas, 2, 36, buffer);
+    canvas_draw_str(canvas, 0, 31, buffer);
     if(model->status == SubghzTestPacketModelStatusRx) {
         snprintf(
             buffer,
@@ -69,9 +69,9 @@ void subghz_test_packet_draw(Canvas* canvas, SubghzTestPacketModel* model) {
             "RSSI: %ld.%ld dBm",
             (int32_t)(model->rssi),
             (int32_t)fabs(model->rssi * 10) % 10);
-        canvas_draw_str(canvas, 2, 48, buffer);
+        canvas_draw_str(canvas, 0, 42, buffer);
     } else {
-        canvas_draw_str(canvas, 2, 48, "TX");
+        canvas_draw_str(canvas, 0, 42, "TX");
     }
 }