[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>
This commit is contained in:
		@@ -29,7 +29,7 @@ const void nfc_scene_emulate_uid_on_enter(void* context) {
 | 
			
		||||
            data->uid[6]);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    popup_set_icon(popup, 0, 4, I_RFIDDolphinSend_98x60);
 | 
			
		||||
    popup_set_icon(popup, 0, 3, I_RFIDDolphinSend_97x61);
 | 
			
		||||
    popup_set_header(popup, "Emulating UID", 56, 31, AlignLeft, AlignTop);
 | 
			
		||||
    popup_set_text(popup, nfc->text_store, 56, 43, AlignLeft, AlignTop);
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -18,7 +18,7 @@ const void nfc_scene_read_card_on_enter(void* context) {
 | 
			
		||||
    // Setup view
 | 
			
		||||
    Popup* popup = nfc->popup;
 | 
			
		||||
    popup_set_header(popup, "Detecting\nNFC card", 70, 34, AlignLeft, AlignTop);
 | 
			
		||||
    popup_set_icon(popup, 0, 4, I_RFIDDolphinReceive_98x60);
 | 
			
		||||
    popup_set_icon(popup, 0, 3, I_RFIDDolphinReceive_97x61);
 | 
			
		||||
 | 
			
		||||
    // Start worker
 | 
			
		||||
    nfc_worker_start(
 | 
			
		||||
 
 | 
			
		||||
@@ -8,7 +8,7 @@
 | 
			
		||||
 | 
			
		||||
#define SCENE_SET_ATQA_CUSTOM_EVENT (0UL)
 | 
			
		||||
 | 
			
		||||
void nfc_scene_set_atqa_byte_input_callback(void* context, uint8_t* bytes, uint8_t bytes_count) {
 | 
			
		||||
void nfc_scene_set_atqa_byte_input_callback(void* context) {
 | 
			
		||||
    Nfc* nfc = (Nfc*)context;
 | 
			
		||||
 | 
			
		||||
    view_dispatcher_send_custom_event(
 | 
			
		||||
 
 | 
			
		||||
@@ -8,7 +8,7 @@
 | 
			
		||||
 | 
			
		||||
#define SCENE_SET_SAK_CUSTOM_EVENT (0UL)
 | 
			
		||||
 | 
			
		||||
void nfc_scene_set_sak_byte_input_callback(void* context, uint8_t* bytes, uint8_t bytes_count) {
 | 
			
		||||
void nfc_scene_set_sak_byte_input_callback(void* context) {
 | 
			
		||||
    Nfc* nfc = (Nfc*)context;
 | 
			
		||||
 | 
			
		||||
    view_dispatcher_send_custom_event(nfc->nfc_common.view_dispatcher, SCENE_SET_SAK_CUSTOM_EVENT);
 | 
			
		||||
 
 | 
			
		||||
@@ -8,7 +8,7 @@
 | 
			
		||||
 | 
			
		||||
#define SCENE_SET_UID_CUSTOM_EVENT (0UL)
 | 
			
		||||
 | 
			
		||||
void nfc_scene_set_uid_byte_input_callback(void* context, uint8_t* bytes, uint8_t bytes_count) {
 | 
			
		||||
void nfc_scene_set_uid_byte_input_callback(void* context) {
 | 
			
		||||
    Nfc* nfc = (Nfc*)context;
 | 
			
		||||
 | 
			
		||||
    view_dispatcher_send_custom_event(nfc->nfc_common.view_dispatcher, SCENE_SET_UID_CUSTOM_EVENT);
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user