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

GUI: Icons and IconsAnimation refactoring. Switch assets to new Icon Api (#566)

Browse Source 
* 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
This commit is contained in:
あく
2021-07-07 11:57:49 +03:00
committed by GitHub
parent 607e873404
commit a7283280ef
82 changed files with 1093 additions and 1053 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
applications/nfc/scenes/nfc_scene_read_card.c
View File

@@ -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() {