liz/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* 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>
This commit is contained in:
SG
2021-07-05 02:01:16 +10:00
committed by GitHub
parent f82a4a2260
commit 7734fb4018
33 changed files with 725 additions and 726 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
applications/gui/elements.c
View File

@@ -196,7 +196,7 @@ void elements_multiline_text_aligned(
furi_assert(canvas);
furi_assert(text);
uint8_t font_height = canvas_current_font_height(canvas) + 2;
uint8_t font_height = canvas_current_font_height(canvas);
string_t str;
string_init(str);
const char* start = text;
@@ -298,10 +298,10 @@ void elements_multiline_text_framed(Canvas* canvas, uint8_t x, uint8_t y, const
}
canvas_set_color(canvas, ColorWhite);
canvas_draw_box(canvas, x, y - font_y, str_width + 8, font_y * lines + 6);
canvas_draw_box(canvas, x, y - font_y, str_width + 8, font_y * lines + 4);
canvas_set_color(canvas, ColorBlack);
elements_multiline_text(canvas, x + 4, y + 1, text);
elements_frame(canvas, x, y - font_y, str_width + 8, font_y * lines + 6);
elements_multiline_text(canvas, x + 4, y - 1, text);
elements_frame(canvas, x, y - font_y, str_width + 8, font_y * lines + 4);
}
void elements_slightly_rounded_frame(