diff options
author | あく <alleteam@gmail.com> | 2021-07-07 11:57:49 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-07 11:57:49 +0300 |
commit | a7283280eff93f22c8fc1b65573ae0a6447e94bf (patch) | |
tree | 89501b407baf96f3070de9e893ab1be467201d16 /applications/nfc | |
parent | 607e873404d746c692c38482f03c54ed3edce26c (diff) |
GUI: Icons and IconsAnimation refactoring. Switch assets to new Icon Api (#566)
* GUI: Icons and IconsAnimation refactoring. Switch assets to new Icon API.
* Gui: icon and animation draw now do not accept null pointer
* Format Sources
* Fix no debug build
* Furi: stricter checks in memmgr
Diffstat (limited to 'applications/nfc')
4 files changed, 8 insertions, 8 deletions
diff --git a/applications/nfc/scenes/nfc_scene_emulate_uid.c b/applications/nfc/scenes/nfc_scene_emulate_uid.c index 2f5d515b..bb36ffde 100644 --- a/applications/nfc/scenes/nfc_scene_emulate_uid.c +++ b/applications/nfc/scenes/nfc_scene_emulate_uid.c @@ -29,7 +29,7 @@ const void nfc_scene_emulate_uid_on_enter(void* context) { data->uid[6]); } - popup_set_icon(popup, 0, 3, I_RFIDDolphinSend_97x61); + 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); @@ -55,7 +55,7 @@ const void nfc_scene_emulate_uid_on_exit(void* context) { Popup* popup = nfc->popup; popup_set_header(popup, NULL, 0, 0, AlignCenter, AlignBottom); popup_set_text(popup, NULL, 0, 0, AlignCenter, AlignTop); - popup_set_icon(popup, 0, 0, I_Empty_1x1); + popup_set_icon(popup, 0, 0, NULL); } AppScene* nfc_scene_emulate_uid_alloc() { diff --git a/applications/nfc/scenes/nfc_scene_read_card.c b/applications/nfc/scenes/nfc_scene_read_card.c index 8b3f7a0f..ef477f5d 100755 --- a/applications/nfc/scenes/nfc_scene_read_card.c +++ b/applications/nfc/scenes/nfc_scene_read_card.c @@ -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, 3, I_RFIDDolphinReceive_97x61); + popup_set_icon(popup, 0, 3, &I_RFIDDolphinReceive_97x61); // Start worker nfc_worker_start( @@ -53,7 +53,7 @@ const void nfc_scene_read_card_on_exit(void* context) { Popup* popup = nfc->popup; popup_set_header(popup, NULL, 0, 0, AlignCenter, AlignBottom); popup_set_text(popup, NULL, 0, 0, AlignCenter, AlignTop); - popup_set_icon(popup, 0, 0, I_Empty_1x1); + popup_set_icon(popup, 0, 0, NULL); } AppScene* nfc_scene_read_card_alloc() { diff --git a/applications/nfc/scenes/nfc_scene_read_card_success.c b/applications/nfc/scenes/nfc_scene_read_card_success.c index 816ccc42..e885fb32 100755 --- a/applications/nfc/scenes/nfc_scene_read_card_success.c +++ b/applications/nfc/scenes/nfc_scene_read_card_success.c @@ -28,7 +28,7 @@ const void nfc_scene_read_card_success_on_enter(void* context) { dialog_ex_set_left_button_text(dialog_ex, "Retry"); dialog_ex_set_right_button_text(dialog_ex, "More"); dialog_ex_set_header(dialog_ex, nfc_get_dev_type(data->device), 36, 8, AlignLeft, AlignCenter); - dialog_ex_set_icon(dialog_ex, 8, 13, I_Medium_chip_22x21); + dialog_ex_set_icon(dialog_ex, 8, 13, &I_Medium_chip_22x21); // Display UID if(data->uid_len == 4) { nfc_set_text_store( @@ -90,7 +90,7 @@ const void nfc_scene_read_card_success_on_exit(void* context) { DialogEx* dialog_ex = nfc->dialog_ex; dialog_ex_set_header(dialog_ex, NULL, 0, 0, AlignCenter, AlignCenter); dialog_ex_set_text(dialog_ex, NULL, 0, 0, AlignCenter, AlignTop); - dialog_ex_set_icon(dialog_ex, 0, 0, I_Empty_1x1); + dialog_ex_set_icon(dialog_ex, 0, 0, NULL); dialog_ex_set_left_button_text(dialog_ex, NULL); dialog_ex_set_right_button_text(dialog_ex, NULL); dialog_ex_set_result_callback(dialog_ex, NULL); diff --git a/applications/nfc/scenes/nfc_scene_save_success.c b/applications/nfc/scenes/nfc_scene_save_success.c index fe9a7962..8ae7df3b 100755 --- a/applications/nfc/scenes/nfc_scene_save_success.c +++ b/applications/nfc/scenes/nfc_scene_save_success.c @@ -17,7 +17,7 @@ const void nfc_scene_save_success_on_enter(void* context) { // Setup view Popup* popup = nfc->popup; - popup_set_icon(popup, 32, 5, I_DolphinNice_96x59); + popup_set_icon(popup, 32, 5, &I_DolphinNice_96x59); popup_set_header(popup, "Saved!", 13, 22, AlignLeft, AlignBottom); popup_set_timeout(popup, 1500); popup_set_context(popup, nfc); @@ -44,7 +44,7 @@ const void nfc_scene_save_success_on_exit(void* context) { Popup* popup = nfc->popup; popup_set_header(popup, NULL, 0, 0, AlignCenter, AlignBottom); popup_set_text(popup, NULL, 0, 0, AlignCenter, AlignTop); - popup_set_icon(popup, 0, 0, I_Empty_1x1); + popup_set_icon(popup, 0, 0, NULL); popup_set_callback(popup, NULL); popup_set_context(popup, NULL); popup_set_timeout(popup, 0); |