diff --git a/applications/main/archive/views/archive_browser_view.c b/applications/main/archive/views/archive_browser_view.c index cc2ed6263..6e42cb40b 100644 --- a/applications/main/archive/views/archive_browser_view.c +++ b/applications/main/archive/views/archive_browser_view.c @@ -324,7 +324,7 @@ static void archive_render_status_bar(Canvas* canvas, ArchiveBrowserViewModel* m const char* tab_name = ArchiveTabNames[model->tab_idx]; - canvas_draw_icon(canvas, 0, 0, XTREME_ASSETS()->I_Background_128x11); + canvas_draw_icon(canvas, 0, 0, &I_Background_128x11); canvas_set_color(canvas, ColorWhite); canvas_draw_box(canvas, 0, 0, 50, 13); diff --git a/applications/main/ibutton/scenes/ibutton_scene_delete_success.c b/applications/main/ibutton/scenes/ibutton_scene_delete_success.c index 639ddbc16..9ff165e4a 100644 --- a/applications/main/ibutton/scenes/ibutton_scene_delete_success.c +++ b/applications/main/ibutton/scenes/ibutton_scene_delete_success.c @@ -1,5 +1,4 @@ #include "../ibutton_i.h" -#include static void ibutton_scene_delete_success_popup_callback(void* context) { iButton* ibutton = context; @@ -10,7 +9,7 @@ void ibutton_scene_delete_success_on_enter(void* context) { iButton* ibutton = context; Popup* popup = ibutton->popup; - popup_set_icon(popup, 0, 2, XTREME_ASSETS()->I_DolphinMafia_115x62); + popup_set_icon(popup, 0, 2, &I_DolphinMafia_115x62); popup_set_header(popup, "Deleted", 83, 19, AlignLeft, AlignBottom); popup_set_callback(popup, ibutton_scene_delete_success_popup_callback); diff --git a/applications/main/ibutton/scenes/ibutton_scene_read.c b/applications/main/ibutton/scenes/ibutton_scene_read.c index 069ce6ae1..a840fb7b7 100644 --- a/applications/main/ibutton/scenes/ibutton_scene_read.c +++ b/applications/main/ibutton/scenes/ibutton_scene_read.c @@ -1,6 +1,5 @@ #include "../ibutton_i.h" #include -#include static void ibutton_scene_read_callback(void* context) { iButton* ibutton = context; @@ -15,7 +14,7 @@ void ibutton_scene_read_on_enter(void* context) { popup_set_header(popup, "iButton", 95, 26, AlignCenter, AlignBottom); popup_set_text(popup, "Apply key to\nFlipper's back", 95, 30, AlignCenter, AlignTop); - popup_set_icon(popup, 0, 5, XTREME_ASSETS()->I_DolphinWait_61x59); + popup_set_icon(popup, 0, 5, &I_DolphinWait_61x59); view_dispatcher_switch_to_view(ibutton->view_dispatcher, iButtonViewPopup); diff --git a/applications/main/ibutton/scenes/ibutton_scene_save_success.c b/applications/main/ibutton/scenes/ibutton_scene_save_success.c index 81ae03059..8b16d2929 100644 --- a/applications/main/ibutton/scenes/ibutton_scene_save_success.c +++ b/applications/main/ibutton/scenes/ibutton_scene_save_success.c @@ -1,5 +1,4 @@ #include "../ibutton_i.h" -#include static void ibutton_scene_save_success_popup_callback(void* context) { iButton* ibutton = context; @@ -10,7 +9,7 @@ void ibutton_scene_save_success_on_enter(void* context) { iButton* ibutton = context; Popup* popup = ibutton->popup; - popup_set_icon(popup, 32, 5, XTREME_ASSETS()->I_DolphinNice_96x59); + popup_set_icon(popup, 32, 5, &I_DolphinNice_96x59); popup_set_header(popup, "Saved!", 5, 7, AlignLeft, AlignTop); popup_set_callback(popup, ibutton_scene_save_success_popup_callback); diff --git a/applications/main/ibutton/scenes/ibutton_scene_write_success.c b/applications/main/ibutton/scenes/ibutton_scene_write_success.c index cef700fe7..17cd53d08 100644 --- a/applications/main/ibutton/scenes/ibutton_scene_write_success.c +++ b/applications/main/ibutton/scenes/ibutton_scene_write_success.c @@ -1,5 +1,4 @@ #include "../ibutton_i.h" -#include static void ibutton_scene_write_success_popup_callback(void* context) { iButton* ibutton = context; @@ -11,7 +10,7 @@ void ibutton_scene_write_success_on_enter(void* context) { iButton* ibutton = context; Popup* popup = ibutton->popup; - popup_set_icon(popup, 0, 12, XTREME_ASSETS()->I_iButtonDolphinVerySuccess_108x52); + popup_set_icon(popup, 0, 12, &I_iButtonDolphinVerySuccess_108x52); popup_set_text(popup, "Successfully written!", 40, 12, AlignLeft, AlignBottom); popup_set_callback(popup, ibutton_scene_write_success_popup_callback); diff --git a/applications/main/infrared/scenes/infrared_scene_edit_rename_done.c b/applications/main/infrared/scenes/infrared_scene_edit_rename_done.c index 76e555c7d..6c7096e17 100644 --- a/applications/main/infrared/scenes/infrared_scene_edit_rename_done.c +++ b/applications/main/infrared/scenes/infrared_scene_edit_rename_done.c @@ -1,11 +1,10 @@ #include "../infrared_i.h" -#include void infrared_scene_edit_rename_done_on_enter(void* context) { Infrared* infrared = context; Popup* popup = infrared->popup; - popup_set_icon(popup, 32, 5, XTREME_ASSETS()->I_DolphinNice_96x59); + popup_set_icon(popup, 32, 5, &I_DolphinNice_96x59); popup_set_header(popup, "Saved!", 5, 7, AlignLeft, AlignTop); popup_set_callback(popup, infrared_popup_closed_callback); diff --git a/applications/main/infrared/scenes/infrared_scene_learn_done.c b/applications/main/infrared/scenes/infrared_scene_learn_done.c index 97caa20db..48431c5db 100644 --- a/applications/main/infrared/scenes/infrared_scene_learn_done.c +++ b/applications/main/infrared/scenes/infrared_scene_learn_done.c @@ -1,11 +1,10 @@ #include "../infrared_i.h" -#include void infrared_scene_learn_done_on_enter(void* context) { Infrared* infrared = context; Popup* popup = infrared->popup; - popup_set_icon(popup, 32, 5, XTREME_ASSETS()->I_DolphinNice_96x59); + popup_set_icon(popup, 32, 5, &I_DolphinNice_96x59); if(infrared->app_state.is_learning_new_remote) { popup_set_header(popup, "New remote\ncreated!", 0, 0, AlignLeft, AlignTop); } else { diff --git a/applications/main/infrared/scenes/infrared_scene_learn_success.c b/applications/main/infrared/scenes/infrared_scene_learn_success.c index e646e7677..469d4de9e 100644 --- a/applications/main/infrared/scenes/infrared_scene_learn_success.c +++ b/applications/main/infrared/scenes/infrared_scene_learn_success.c @@ -1,5 +1,4 @@ #include "../infrared_i.h" -#include static void infrared_scene_learn_success_dialog_result_callback(DialogExResult result, void* context) { @@ -48,7 +47,7 @@ void infrared_scene_learn_success_on_enter(void* context) { dialog_ex_set_left_button_text(dialog_ex, "Retry"); dialog_ex_set_right_button_text(dialog_ex, "Save"); dialog_ex_set_center_button_text(dialog_ex, "Send"); - dialog_ex_set_icon(dialog_ex, 0, 1, XTREME_ASSETS()->I_DolphinReadingSuccess_59x63); + dialog_ex_set_icon(dialog_ex, 0, 1, &I_DolphinReadingSuccess_59x63); dialog_ex_set_result_callback(dialog_ex, infrared_scene_learn_success_dialog_result_callback); dialog_ex_set_context(dialog_ex, context); dialog_ex_enable_extended_events(dialog_ex); diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c b/applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c index 6d960f331..1c4cae3c6 100644 --- a/applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c +++ b/applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c @@ -1,6 +1,5 @@ #include "../lfrfid_i.h" #include "../helpers/rfid_writer.h" -#include static void writer_initialize(T55xxTiming* t55xxtiming) { t55xxtiming->wait_time = 400; @@ -43,7 +42,7 @@ static void lfrfid_clear_t5577_password_and_config_to_EM(LfRfid* app) { writer_initialize(t55xxtiming); popup_set_header(popup, "Removing\npassword", 90, 36, AlignCenter, AlignCenter); - popup_set_icon(popup, 0, 3, XTREME_ASSETS()->I_RFIDDolphinSend_97x61); + popup_set_icon(popup, 0, 3, &I_RFIDDolphinSend_97x61); popup_set_text(popup, curr_buf, 90, 56, AlignCenter, AlignCenter); notification_message(app->notifications, &sequence_blink_start_magenta); @@ -71,7 +70,7 @@ void lfrfid_scene_clear_t5577_on_enter(void* context) { notification_message(app->notifications, &sequence_success); popup_set_header(popup, "Done!", 94, 10, AlignCenter, AlignTop); - popup_set_icon(popup, 0, 7, XTREME_ASSETS()->I_RFIDDolphinSuccess_108x57); + popup_set_icon(popup, 0, 7, &I_RFIDDolphinSuccess_108x57); popup_set_context(popup, app); popup_set_callback(popup, lfrfid_popup_timeout_callback); popup_set_timeout(popup, 1500); diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_delete_success.c b/applications/main/lfrfid/scenes/lfrfid_scene_delete_success.c index d3952c08c..f940b9bd4 100644 --- a/applications/main/lfrfid/scenes/lfrfid_scene_delete_success.c +++ b/applications/main/lfrfid/scenes/lfrfid_scene_delete_success.c @@ -1,11 +1,10 @@ #include "../lfrfid_i.h" -#include void lfrfid_scene_delete_success_on_enter(void* context) { LfRfid* app = context; Popup* popup = app->popup; - popup_set_icon(popup, 0, 2, XTREME_ASSETS()->I_DolphinMafia_115x62); + popup_set_icon(popup, 0, 2, &I_DolphinMafia_115x62); popup_set_header(popup, "Deleted", 83, 19, AlignLeft, AlignBottom); popup_set_context(popup, app); popup_set_callback(popup, lfrfid_popup_timeout_callback); diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_emulate.c b/applications/main/lfrfid/scenes/lfrfid_scene_emulate.c index b2a8be4b8..dc3918994 100644 --- a/applications/main/lfrfid/scenes/lfrfid_scene_emulate.c +++ b/applications/main/lfrfid/scenes/lfrfid_scene_emulate.c @@ -1,5 +1,4 @@ #include "../lfrfid_i.h" -#include void lfrfid_scene_emulate_on_enter(void* context) { LfRfid* app = context; @@ -17,7 +16,7 @@ void lfrfid_scene_emulate_on_enter(void* context) { AlignCenter, AlignTop); } - popup_set_icon(popup, 0, 3, XTREME_ASSETS()->I_RFIDDolphinSend_97x61); + popup_set_icon(popup, 0, 3, &I_RFIDDolphinSend_97x61); lfrfid_worker_start_thread(app->lfworker); lfrfid_worker_emulate_start(app->lfworker, (LFRFIDProtocol)app->protocol_id); diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_raw_read.c b/applications/main/lfrfid/scenes/lfrfid_scene_raw_read.c index b9615f39c..cde3d41b6 100644 --- a/applications/main/lfrfid/scenes/lfrfid_scene_raw_read.c +++ b/applications/main/lfrfid/scenes/lfrfid_scene_raw_read.c @@ -1,5 +1,4 @@ #include "../lfrfid_i.h" -#include #define RAW_READ_TIME 5000 @@ -33,7 +32,7 @@ void lfrfid_scene_raw_read_on_enter(void* context) { LfRfidReadRawState* state = malloc(sizeof(LfRfidReadRawState)); scene_manager_set_scene_state(app->scene_manager, LfRfidSceneRawRead, (uint32_t)state); state->string_file_name = furi_string_alloc(); - popup_set_icon(popup, 0, 3, XTREME_ASSETS()->I_RFIDDolphinReceive_97x61); + popup_set_icon(popup, 0, 3, &I_RFIDDolphinReceive_97x61); view_dispatcher_switch_to_view(app->view_dispatcher, LfRfidViewPopup); lfrfid_worker_start_thread(app->lfworker); lfrfid_make_app_folder(app); diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_rpc.c b/applications/main/lfrfid/scenes/lfrfid_scene_rpc.c index 1555154fb..156dd97af 100644 --- a/applications/main/lfrfid/scenes/lfrfid_scene_rpc.c +++ b/applications/main/lfrfid/scenes/lfrfid_scene_rpc.c @@ -1,5 +1,4 @@ #include "../lfrfid_i.h" -#include void lfrfid_scene_rpc_on_enter(void* context) { LfRfid* app = context; @@ -7,7 +6,7 @@ void lfrfid_scene_rpc_on_enter(void* context) { popup_set_header(popup, "LF RFID", 89, 42, AlignCenter, AlignBottom); popup_set_text(popup, "RPC mode", 89, 44, AlignCenter, AlignTop); - popup_set_icon(popup, 0, 12, XTREME_ASSETS()->I_RFIDDolphinSend_97x61); + popup_set_icon(popup, 0, 12, &I_RFIDDolphinSend_97x61); view_dispatcher_switch_to_view(app->view_dispatcher, LfRfidViewPopup); diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_save_success.c b/applications/main/lfrfid/scenes/lfrfid_scene_save_success.c index 612445125..b7b0eaa5d 100644 --- a/applications/main/lfrfid/scenes/lfrfid_scene_save_success.c +++ b/applications/main/lfrfid/scenes/lfrfid_scene_save_success.c @@ -1,5 +1,4 @@ #include "../lfrfid_i.h" -#include void lfrfid_scene_save_success_on_enter(void* context) { LfRfid* app = context; @@ -7,7 +6,7 @@ void lfrfid_scene_save_success_on_enter(void* context) { // Clear state of data enter scene scene_manager_set_scene_state(app->scene_manager, LfRfidSceneSaveData, 0); - popup_set_icon(popup, 32, 5, XTREME_ASSETS()->I_DolphinNice_96x59); + popup_set_icon(popup, 32, 5, &I_DolphinNice_96x59); popup_set_header(popup, "Saved!", 5, 7, AlignLeft, AlignTop); popup_set_context(popup, app); popup_set_callback(popup, lfrfid_popup_timeout_callback); diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_write.c b/applications/main/lfrfid/scenes/lfrfid_scene_write.c index 61e92ac4f..b7faed69f 100644 --- a/applications/main/lfrfid/scenes/lfrfid_scene_write.c +++ b/applications/main/lfrfid/scenes/lfrfid_scene_write.c @@ -1,5 +1,4 @@ #include "../lfrfid_i.h" -#include static void lfrfid_write_callback(LFRFIDWorkerWriteResult result, void* context) { LfRfid* app = context; @@ -34,7 +33,7 @@ void lfrfid_scene_write_on_enter(void* context) { AlignCenter, AlignTop); } - popup_set_icon(popup, 0, 3, XTREME_ASSETS()->I_RFIDDolphinSend_97x61); + popup_set_icon(popup, 0, 3, &I_RFIDDolphinSend_97x61); view_dispatcher_switch_to_view(app->view_dispatcher, LfRfidViewPopup); diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_write_success.c b/applications/main/lfrfid/scenes/lfrfid_scene_write_success.c index a5b90ec38..52e30d6b6 100644 --- a/applications/main/lfrfid/scenes/lfrfid_scene_write_success.c +++ b/applications/main/lfrfid/scenes/lfrfid_scene_write_success.c @@ -1,12 +1,11 @@ #include "../lfrfid_i.h" -#include void lfrfid_scene_write_success_on_enter(void* context) { LfRfid* app = context; Popup* popup = app->popup; popup_set_header(popup, "Successfully\nwritten!", 94, 3, AlignCenter, AlignTop); - popup_set_icon(popup, 0, 6, XTREME_ASSETS()->I_RFIDDolphinSuccess_108x57); + popup_set_icon(popup, 0, 6, &I_RFIDDolphinSuccess_108x57); popup_set_context(popup, app); popup_set_callback(popup, lfrfid_popup_timeout_callback); popup_set_timeout(popup, 1500); diff --git a/applications/main/nfc/scenes/nfc_scene_delete_success.c b/applications/main/nfc/scenes/nfc_scene_delete_success.c index 07b637eb4..795363527 100644 --- a/applications/main/nfc/scenes/nfc_scene_delete_success.c +++ b/applications/main/nfc/scenes/nfc_scene_delete_success.c @@ -1,5 +1,4 @@ #include "../nfc_i.h" -#include void nfc_scene_delete_success_popup_callback(void* context) { Nfc* nfc = context; @@ -11,7 +10,7 @@ void nfc_scene_delete_success_on_enter(void* context) { // Setup view Popup* popup = nfc->popup; - popup_set_icon(popup, 0, 2, XTREME_ASSETS()->I_DolphinMafia_115x62); + popup_set_icon(popup, 0, 2, &I_DolphinMafia_115x62); popup_set_header(popup, "Deleted", 83, 19, AlignLeft, AlignBottom); popup_set_timeout(popup, 1500); popup_set_context(popup, nfc); diff --git a/applications/main/nfc/scenes/nfc_scene_emulate_uid.c b/applications/main/nfc/scenes/nfc_scene_emulate_uid.c index c46a2a075..7316eebe0 100644 --- a/applications/main/nfc/scenes/nfc_scene_emulate_uid.c +++ b/applications/main/nfc/scenes/nfc_scene_emulate_uid.c @@ -1,5 +1,4 @@ #include "../nfc_i.h" -#include #define NFC_SCENE_EMULATE_UID_LOG_SIZE_MAX (200) @@ -38,7 +37,7 @@ static void nfc_scene_emulate_uid_widget_config(Nfc* nfc, bool data_received) { FuriString* info_str; info_str = furi_string_alloc(); - widget_add_icon_element(widget, 0, 3, XTREME_ASSETS()->I_NFC_dolphin_emulation_47x61); + widget_add_icon_element(widget, 0, 3, &I_NFC_dolphin_emulation_47x61); widget_add_string_element(widget, 57, 13, AlignLeft, AlignTop, FontPrimary, "Emulating UID"); if(strcmp(nfc->dev->dev_name, "") != 0) { furi_string_printf(info_str, "%s", nfc->dev->dev_name); diff --git a/applications/main/nfc/scenes/nfc_scene_mf_classic_emulate.c b/applications/main/nfc/scenes/nfc_scene_mf_classic_emulate.c index 9caf0390b..8c0f493e1 100644 --- a/applications/main/nfc/scenes/nfc_scene_mf_classic_emulate.c +++ b/applications/main/nfc/scenes/nfc_scene_mf_classic_emulate.c @@ -1,5 +1,4 @@ #include "../nfc_i.h" -#include #define NFC_MF_CLASSIC_DATA_NOT_CHANGED (0UL) #define NFC_MF_CLASSIC_DATA_CHANGED (1UL) @@ -24,7 +23,7 @@ void nfc_scene_mf_classic_emulate_on_enter(void* context) { } else { nfc_text_store_set(nfc, "MIFARE\nClassic"); } - popup_set_icon(popup, 0, 3, XTREME_ASSETS()->I_NFC_dolphin_emulation_47x61); + popup_set_icon(popup, 0, 3, &I_NFC_dolphin_emulation_47x61); popup_set_text(popup, nfc->text_store, 90, 28, AlignCenter, AlignTop); // Setup and start worker diff --git a/applications/main/nfc/scenes/nfc_scene_mf_classic_update_success.c b/applications/main/nfc/scenes/nfc_scene_mf_classic_update_success.c index 79256525f..fef8fd5e9 100644 --- a/applications/main/nfc/scenes/nfc_scene_mf_classic_update_success.c +++ b/applications/main/nfc/scenes/nfc_scene_mf_classic_update_success.c @@ -1,6 +1,5 @@ #include "../nfc_i.h" #include -#include void nfc_scene_mf_classic_update_success_popup_callback(void* context) { Nfc* nfc = context; @@ -14,7 +13,7 @@ void nfc_scene_mf_classic_update_success_on_enter(void* context) { notification_message(nfc->notifications, &sequence_success); Popup* popup = nfc->popup; - popup_set_icon(popup, 32, 5, XTREME_ASSETS()->I_DolphinNice_96x59); + popup_set_icon(popup, 32, 5, &I_DolphinNice_96x59); popup_set_header(popup, "Updated!", 11, 20, AlignLeft, AlignBottom); popup_set_timeout(popup, 1500); popup_set_context(popup, nfc); diff --git a/applications/main/nfc/scenes/nfc_scene_mf_classic_write_success.c b/applications/main/nfc/scenes/nfc_scene_mf_classic_write_success.c index 97dc50167..2f2a3beb1 100644 --- a/applications/main/nfc/scenes/nfc_scene_mf_classic_write_success.c +++ b/applications/main/nfc/scenes/nfc_scene_mf_classic_write_success.c @@ -1,6 +1,5 @@ #include "../nfc_i.h" #include -#include void nfc_scene_mf_classic_write_success_popup_callback(void* context) { Nfc* nfc = context; @@ -14,7 +13,7 @@ void nfc_scene_mf_classic_write_success_on_enter(void* context) { notification_message(nfc->notifications, &sequence_success); Popup* popup = nfc->popup; - popup_set_icon(popup, 32, 5, XTREME_ASSETS()->I_DolphinNice_96x59); + popup_set_icon(popup, 32, 5, &I_DolphinNice_96x59); popup_set_header(popup, "Successfully\nwritten", 13, 22, AlignLeft, AlignBottom); popup_set_timeout(popup, 1500); popup_set_context(popup, nfc); diff --git a/applications/main/nfc/scenes/nfc_scene_mf_ultralight_emulate.c b/applications/main/nfc/scenes/nfc_scene_mf_ultralight_emulate.c index b13e169e4..9d8f17f9a 100644 --- a/applications/main/nfc/scenes/nfc_scene_mf_ultralight_emulate.c +++ b/applications/main/nfc/scenes/nfc_scene_mf_ultralight_emulate.c @@ -1,5 +1,4 @@ #include "../nfc_i.h" -#include #define NFC_MF_UL_DATA_NOT_CHANGED (0UL) #define NFC_MF_UL_DATA_CHANGED (1UL) @@ -29,7 +28,7 @@ void nfc_scene_mf_ultralight_emulate_on_enter(void* context) { } else { nfc_text_store_set(nfc, "MIFARE\nNTAG"); } - popup_set_icon(popup, 0, 3, XTREME_ASSETS()->I_NFC_dolphin_emulation_47x61); + popup_set_icon(popup, 0, 3, &I_NFC_dolphin_emulation_47x61); popup_set_text(popup, nfc->text_store, 90, 28, AlignCenter, AlignTop); // Setup and start worker diff --git a/applications/main/nfc/scenes/nfc_scene_restore_original.c b/applications/main/nfc/scenes/nfc_scene_restore_original.c index 198c54e85..3ecf5c048 100644 --- a/applications/main/nfc/scenes/nfc_scene_restore_original.c +++ b/applications/main/nfc/scenes/nfc_scene_restore_original.c @@ -1,5 +1,4 @@ #include "../nfc_i.h" -#include void nfc_scene_restore_original_popup_callback(void* context) { Nfc* nfc = context; @@ -11,7 +10,7 @@ void nfc_scene_restore_original_on_enter(void* context) { // Setup view Popup* popup = nfc->popup; - popup_set_icon(popup, 32, 5, XTREME_ASSETS()->I_DolphinNice_96x59); + popup_set_icon(popup, 32, 5, &I_DolphinNice_96x59); popup_set_header(popup, "Original file\nrestored", 13, 22, AlignLeft, AlignBottom); popup_set_timeout(popup, 1500); popup_set_context(popup, nfc); diff --git a/applications/main/nfc/scenes/nfc_scene_rpc.c b/applications/main/nfc/scenes/nfc_scene_rpc.c index b57dfed37..d06ee7564 100644 --- a/applications/main/nfc/scenes/nfc_scene_rpc.c +++ b/applications/main/nfc/scenes/nfc_scene_rpc.c @@ -1,5 +1,4 @@ #include "../nfc_i.h" -#include void nfc_scene_rpc_on_enter(void* context) { Nfc* nfc = context; @@ -8,7 +7,7 @@ void nfc_scene_rpc_on_enter(void* context) { popup_set_header(popup, "NFC", 89, 42, AlignCenter, AlignBottom); popup_set_text(popup, "RPC mode", 89, 44, AlignCenter, AlignTop); - popup_set_icon(popup, 0, 12, XTREME_ASSETS()->I_NFC_dolphin_emulation_47x61); + popup_set_icon(popup, 0, 12, &I_NFC_dolphin_emulation_47x61); view_dispatcher_switch_to_view(nfc->view_dispatcher, NfcViewPopup); diff --git a/applications/main/nfc/scenes/nfc_scene_save_success.c b/applications/main/nfc/scenes/nfc_scene_save_success.c index deef64524..34919cbd8 100644 --- a/applications/main/nfc/scenes/nfc_scene_save_success.c +++ b/applications/main/nfc/scenes/nfc_scene_save_success.c @@ -1,5 +1,4 @@ #include "../nfc_i.h" -#include void nfc_scene_save_success_popup_callback(void* context) { Nfc* nfc = context; @@ -11,7 +10,7 @@ void nfc_scene_save_success_on_enter(void* context) { // Setup view Popup* popup = nfc->popup; - popup_set_icon(popup, 32, 5, XTREME_ASSETS()->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); diff --git a/applications/main/subghz/scenes/subghz_scene_delete_success.c b/applications/main/subghz/scenes/subghz_scene_delete_success.c index 252736f2d..63ce2bd6d 100644 --- a/applications/main/subghz/scenes/subghz_scene_delete_success.c +++ b/applications/main/subghz/scenes/subghz_scene_delete_success.c @@ -1,6 +1,5 @@ #include "../subghz_i.h" #include "../helpers/subghz_custom_event.h" -#include void subghz_scene_delete_success_popup_callback(void* context) { SubGhz* subghz = context; @@ -13,7 +12,7 @@ void subghz_scene_delete_success_on_enter(void* context) { // Setup view Popup* popup = subghz->popup; - popup_set_icon(popup, 0, 2, XTREME_ASSETS()->I_DolphinMafia_115x62); + popup_set_icon(popup, 0, 2, &I_DolphinMafia_115x62); popup_set_header(popup, "Deleted", 83, 19, AlignLeft, AlignBottom); popup_set_timeout(popup, 1500); popup_set_context(popup, subghz); diff --git a/applications/main/subghz/scenes/subghz_scene_rpc.c b/applications/main/subghz/scenes/subghz_scene_rpc.c index 8a52cf2a9..abff9c55a 100644 --- a/applications/main/subghz/scenes/subghz_scene_rpc.c +++ b/applications/main/subghz/scenes/subghz_scene_rpc.c @@ -4,8 +4,6 @@ #include -#include - typedef enum { SubGhzRpcStateIdle, SubGhzRpcStateLoaded, @@ -18,7 +16,7 @@ void subghz_scene_rpc_on_enter(void* context) { popup_set_header(popup, "Sub-GHz", 89, 42, AlignCenter, AlignBottom); popup_set_text(popup, "RPC mode", 89, 44, AlignCenter, AlignTop); - popup_set_icon(popup, 0, 12, XTREME_ASSETS()->I_RFIDDolphinSend_97x61); + popup_set_icon(popup, 0, 12, &I_RFIDDolphinSend_97x61); view_dispatcher_switch_to_view(subghz->view_dispatcher, SubGhzViewIdPopup); diff --git a/applications/main/subghz/scenes/subghz_scene_save_success.c b/applications/main/subghz/scenes/subghz_scene_save_success.c index 5babae8b9..6a5346492 100644 --- a/applications/main/subghz/scenes/subghz_scene_save_success.c +++ b/applications/main/subghz/scenes/subghz_scene_save_success.c @@ -1,6 +1,5 @@ #include "../subghz_i.h" #include "../helpers/subghz_custom_event.h" -#include void subghz_scene_save_success_popup_callback(void* context) { SubGhz* subghz = context; @@ -12,7 +11,7 @@ void subghz_scene_save_success_on_enter(void* context) { // Setup view Popup* popup = subghz->popup; - popup_set_icon(popup, 32, 5, XTREME_ASSETS()->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, subghz); diff --git a/applications/main/subghz/views/receiver.c b/applications/main/subghz/views/receiver.c index d9904bfca..c327d55b3 100644 --- a/applications/main/subghz/views/receiver.c +++ b/applications/main/subghz/views/receiver.c @@ -7,8 +7,6 @@ #include #include -#include - #define FRAME_HEIGHT 12 #define MAX_LEN_PX 111 #define MENU_ITEMS 4u @@ -297,8 +295,7 @@ void subghz_view_receiver_draw(Canvas* canvas, SubGhzViewReceiverModel* model) { canvas, 0, 0, - furi_hal_subghz_get_radio_type() ? XTREME_ASSETS()->I_Fishing_123x52 : - XTREME_ASSETS()->I_Scanning_123x52); + furi_hal_subghz_get_radio_type() ? &I_Fishing_123x52 : &I_Scanning_123x52); canvas_set_font(canvas, FontPrimary); canvas_draw_str(canvas, 63, 46, "Scanning..."); //canvas_draw_line(canvas, 46, 51, 125, 51); @@ -308,8 +305,7 @@ void subghz_view_receiver_draw(Canvas* canvas, SubGhzViewReceiverModel* model) { canvas, 0, 0, - furi_hal_subghz_get_radio_type() ? XTREME_ASSETS()->I_Fishing_123x52 : - XTREME_ASSETS()->I_Scanning_123x52); + furi_hal_subghz_get_radio_type() ? &I_Fishing_123x52 : &I_Scanning_123x52); canvas_set_font(canvas, FontPrimary); canvas_draw_str(canvas, 63, 46, "Decoding..."); canvas_set_font(canvas, FontSecondary); diff --git a/applications/main/u2f/views/u2f_view.c b/applications/main/u2f/views/u2f_view.c index 4b76c2187..742aff7c7 100644 --- a/applications/main/u2f/views/u2f_view.c +++ b/applications/main/u2f/views/u2f_view.c @@ -20,7 +20,7 @@ static void u2f_view_draw_callback(Canvas* canvas, void* _model) { canvas_set_font(canvas, FontSecondary); if(model->display_msg == U2fMsgNotConnected) { - canvas_draw_icon(canvas, 22, 15, XTREME_ASSETS()->I_Connect_me_62x31); + canvas_draw_icon(canvas, 22, 15, &I_Connect_me_62x31); if(XTREME_ASSETS()->is_nsfw) { canvas_draw_str_aligned( canvas, 128 / 2, 3, AlignCenter, AlignTop, "Plug me in d-daddy"); @@ -29,34 +29,34 @@ static void u2f_view_draw_callback(Canvas* canvas, void* _model) { canvas, 128 / 2, 3, AlignCenter, AlignTop, "Connect to a device"); } } else if(model->display_msg == U2fMsgIdle) { - canvas_draw_icon(canvas, 22, 15, XTREME_ASSETS()->I_Connected_62x31); + canvas_draw_icon(canvas, 22, 15, &I_Connected_62x31); canvas_draw_str_aligned(canvas, 128 / 2, 3, AlignCenter, AlignTop, "Connected!"); } else if(model->display_msg == U2fMsgRegister) { if(XTREME_ASSETS()->is_nsfw) { elements_button_center(canvas, "CUM"); - canvas_draw_icon(canvas, 22, 15, XTREME_ASSETS()->I_Auth_62x31); + canvas_draw_icon(canvas, 22, 15, &I_Auth_62x31); canvas_draw_str_aligned( canvas, 128 / 2, 3, AlignCenter, AlignTop, "Press CUM to register"); } else { elements_button_center(canvas, "OK"); - canvas_draw_icon(canvas, 22, 15, XTREME_ASSETS()->I_Auth_62x31); + canvas_draw_icon(canvas, 22, 15, &I_Auth_62x31); canvas_draw_str_aligned( canvas, 128 / 2, 3, AlignCenter, AlignTop, "Press OK to register"); } } else if(model->display_msg == U2fMsgAuth) { if(XTREME_ASSETS()->is_nsfw) { elements_button_center(canvas, "CUM"); - canvas_draw_icon(canvas, 22, 15, XTREME_ASSETS()->I_Auth_62x31); + canvas_draw_icon(canvas, 22, 15, &I_Auth_62x31); canvas_draw_str_aligned( canvas, 128 / 2, 3, AlignCenter, AlignTop, "Press CUM to authenticate"); } else { elements_button_center(canvas, "OK"); - canvas_draw_icon(canvas, 22, 15, XTREME_ASSETS()->I_Auth_62x31); + canvas_draw_icon(canvas, 22, 15, &I_Auth_62x31); canvas_draw_str_aligned( canvas, 128 / 2, 3, AlignCenter, AlignTop, "Press OK to authenticate"); } } else if(model->display_msg == U2fMsgSuccess) { - canvas_draw_icon(canvas, 22, 15, XTREME_ASSETS()->I_Connected_62x31); + canvas_draw_icon(canvas, 22, 15, &I_Connected_62x31); if(XTREME_ASSETS()->is_nsfw) { canvas_draw_str_aligned(canvas, 128 / 2, 3, AlignCenter, AlignTop, "Cum released~"); } else { @@ -64,7 +64,7 @@ static void u2f_view_draw_callback(Canvas* canvas, void* _model) { canvas, 128 / 2, 3, AlignCenter, AlignTop, "Authentication successful!"); } } else if(model->display_msg == U2fMsgError) { - canvas_draw_icon(canvas, 22, 15, XTREME_ASSETS()->I_Error_62x31); + canvas_draw_icon(canvas, 22, 15, &I_Error_62x31); if(XTREME_ASSETS()->is_nsfw) { canvas_draw_str_aligned(canvas, 128 / 2, 3, AlignCenter, AlignTop, "Unable to cum"); } else { diff --git a/applications/services/bt/bt_service/bt.c b/applications/services/bt/bt_service/bt.c index 62b104844..60ab1dd84 100644 --- a/applications/services/bt/bt_service/bt.c +++ b/applications/services/bt/bt_service/bt.c @@ -5,7 +5,6 @@ #include #include #include -#include #define TAG "BtSrv" @@ -36,7 +35,7 @@ static void bt_pin_code_view_port_draw_callback(Canvas* canvas, void* context) { furi_assert(context); Bt* bt = context; char pin_code_info[24]; - canvas_draw_icon(canvas, 0, 0, XTREME_ASSETS()->I_BLE_Pairing_128x64); + canvas_draw_icon(canvas, 0, 0, &I_BLE_Pairing_128x64); snprintf(pin_code_info, sizeof(pin_code_info), "Pairing code\n%06lu", bt->pin_code); elements_multiline_text_aligned(canvas, 64, 4, AlignCenter, AlignTop, pin_code_info); elements_button_left(canvas, "Quit"); @@ -84,7 +83,7 @@ static bool bt_pin_code_verify_event_handler(Bt* bt, uint32_t pin) { if(bt->suppress_pin_screen) return true; FuriString* pin_str; - dialog_message_set_icon(bt->dialog_message, XTREME_ASSETS()->I_BLE_Pairing_128x64, 0, 0); + dialog_message_set_icon(bt->dialog_message, &I_BLE_Pairing_128x64, 0, 0); pin_str = furi_string_alloc_printf("Verify code\n%06lu", pin); dialog_message_set_text( bt->dialog_message, furi_string_get_cstr(pin_str), 64, 4, AlignCenter, AlignTop); diff --git a/applications/services/desktop/animations/animation_manager.c b/applications/services/desktop/animations/animation_manager.c index 77884f2c1..0d079e213 100644 --- a/applications/services/desktop/animations/animation_manager.c +++ b/applications/services/desktop/animations/animation_manager.c @@ -590,8 +590,7 @@ static void animation_manager_switch_to_one_shot_view(AnimationManager* animatio View* next_view = one_shot_view_get_view(animation_manager->one_shot_view); view_stack_remove_view(animation_manager->view_stack, prev_view); view_stack_add_view(animation_manager->view_stack, next_view); - one_shot_view_start_animation( - animation_manager->one_shot_view, XTREME_ASSETS()->A_Levelup_128x64); + one_shot_view_start_animation(animation_manager->one_shot_view, &A_Levelup_128x64); } static void animation_manager_switch_to_animation_view(AnimationManager* animation_manager) { diff --git a/applications/services/desktop/views/desktop_view_locked.c b/applications/services/desktop/views/desktop_view_locked.c index d7cc7f236..21f24dde9 100644 --- a/applications/services/desktop/views/desktop_view_locked.c +++ b/applications/services/desktop/views/desktop_view_locked.c @@ -94,7 +94,7 @@ void desktop_view_locked_draw_lockscreen(Canvas* canvas, void* m) { snprintf(date_str, 14, "%.2d-%.2d-%.4d", datetime.day, datetime.month, datetime.year); } - canvas_draw_icon(canvas, 0, 0 + y, XTREME_ASSETS()->I_Lockscreen); + canvas_draw_icon(canvas, 0, 0 + y, &I_Lockscreen); if(xtreme_settings->lockscreen_time) { canvas_set_font(canvas, FontBigNumbers); canvas_draw_str(canvas, 0, 64 + y, time_str); diff --git a/applications/services/gui/gui.c b/applications/services/gui/gui.c index dd3b4114e..4c85186fc 100644 --- a/applications/services/gui/gui.c +++ b/applications/services/gui/gui.c @@ -77,7 +77,7 @@ static void gui_redraw_status_bar(Gui* gui, bool need_attention) { canvas_draw_box(gui->canvas, 89, 3, 38, 6); canvas_set_color(gui->canvas, ColorBlack); canvas_set_bitmap_mode(gui->canvas, 1); - canvas_draw_icon(gui->canvas, 0, 0, XTREME_ASSETS()->I_Background_128x11); + canvas_draw_icon(gui->canvas, 0, 0, &I_Background_128x11); } else { canvas_set_color(gui->canvas, ColorBlack); } diff --git a/applications/settings/bt_settings_app/scenes/bt_settings_scene_forget_dev_success.c b/applications/settings/bt_settings_app/scenes/bt_settings_scene_forget_dev_success.c index e8aed9b45..481ba6d5c 100644 --- a/applications/settings/bt_settings_app/scenes/bt_settings_scene_forget_dev_success.c +++ b/applications/settings/bt_settings_app/scenes/bt_settings_scene_forget_dev_success.c @@ -1,5 +1,4 @@ #include "../bt_settings_app.h" -#include #include void bt_settings_app_scene_forget_dev_success_popup_callback(void* context) { @@ -11,7 +10,7 @@ void bt_settings_scene_forget_dev_success_on_enter(void* context) { BtSettingsApp* app = context; Popup* popup = app->popup; - popup_set_icon(popup, 32, 5, XTREME_ASSETS()->I_DolphinNice_96x59); + popup_set_icon(popup, 32, 5, &I_DolphinNice_96x59); popup_set_header(popup, "Done", 14, 15, AlignLeft, AlignTop); popup_set_timeout(popup, 1500); popup_set_context(popup, app); diff --git a/applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_disable.c b/applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_disable.c index 0ae92062a..2969db9ea 100644 --- a/applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_disable.c +++ b/applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_disable.c @@ -6,7 +6,6 @@ #include "../desktop_settings_app.h" #include #include "desktop_settings_scene.h" -#include #define SCENE_EVENT_EXIT (0U) @@ -25,7 +24,7 @@ void desktop_settings_scene_pin_disable_on_enter(void* context) { popup_set_context(app->popup, app); popup_set_callback(app->popup, pin_disable_back_callback); - popup_set_icon(app->popup, 0, 2, XTREME_ASSETS()->I_DolphinMafia_115x62); + popup_set_icon(app->popup, 0, 2, &I_DolphinMafia_115x62); popup_set_header(app->popup, "PIN\nDeleted!", 95, 9, AlignCenter, AlignCenter); popup_set_timeout(app->popup, 1500); popup_enable_timeout(app->popup); diff --git a/applications/settings/dolphin_passport/passport.c b/applications/settings/dolphin_passport/passport.c index dc7f754eb..d7e256ab1 100644 --- a/applications/settings/dolphin_passport/passport.c +++ b/applications/settings/dolphin_passport/passport.c @@ -33,8 +33,6 @@ static void render_callback(Canvas* canvas, void* _ctx) { PassportContext* ctx = _ctx; DolphinStats* stats = ctx->stats; - XtremeAssets* xtreme_assets = XTREME_ASSETS(); - char level_str[20]; char xp_str[12]; const char* mood_str = NULL; @@ -42,24 +40,24 @@ static void render_callback(Canvas* canvas, void* _ctx) { if(XTREME_ASSETS()->is_nsfw) { if(stats->butthurt <= 4) { - portrait = xtreme_assets->I_passport_happy_46x49; + portrait = &I_passport_happy_46x49; mood_str = "Status: Wet"; } else if(stats->butthurt <= 9) { - portrait = xtreme_assets->I_passport_okay_46x49; + portrait = &I_passport_okay_46x49; mood_str = "Status: Horny"; } else { - portrait = xtreme_assets->I_passport_bad_46x49; + portrait = &I_passport_bad_46x49; mood_str = "Status: Desperate"; } } else { if(stats->butthurt <= 4) { - portrait = xtreme_assets->I_passport_happy_46x49; + portrait = &I_passport_happy_46x49; mood_str = "Mood: Happy"; } else if(stats->butthurt <= 9) { - portrait = xtreme_assets->I_passport_okay_46x49; + portrait = &I_passport_okay_46x49; mood_str = "Mood: Okay"; } else { - portrait = xtreme_assets->I_passport_bad_46x49; + portrait = &I_passport_bad_46x49; mood_str = "Mood: Angry"; } } @@ -81,7 +79,7 @@ static void render_callback(Canvas* canvas, void* _ctx) { } // multipass - canvas_draw_icon(canvas, 0, 0, xtreme_assets->I_passport_DB); + canvas_draw_icon(canvas, 0, 0, &I_passport_DB); // portrait furi_assert((stats->level > 0) && (stats->level <= DOLPHIN_LEVEL_COUNT + 1)); diff --git a/applications/settings/power_settings_app/scenes/power_settings_scene_power_off.c b/applications/settings/power_settings_app/scenes/power_settings_scene_power_off.c index 9b35e9eb6..115509012 100644 --- a/applications/settings/power_settings_app/scenes/power_settings_scene_power_off.c +++ b/applications/settings/power_settings_app/scenes/power_settings_scene_power_off.c @@ -19,7 +19,7 @@ void power_settings_scene_power_off_on_enter(void* context) { dialog_ex_set_text( dialog, " I will be\nwaiting for\n you here", 78, 16, AlignLeft, AlignTop); } - dialog_ex_set_icon(dialog, 21, 13, XTREME_ASSETS()->I_Cry_dolph_55x52); + dialog_ex_set_icon(dialog, 21, 13, &I_Cry_dolph_55x52); dialog_ex_set_left_button_text(dialog, "Back"); dialog_ex_set_right_button_text(dialog, "OFF"); dialog_ex_set_result_callback(dialog, power_settings_scene_power_off_dialog_callback); diff --git a/applications/settings/storage_settings/scenes/storage_settings_scene_unmounted.c b/applications/settings/storage_settings/scenes/storage_settings_scene_unmounted.c index dca53b60a..486f07603 100644 --- a/applications/settings/storage_settings/scenes/storage_settings_scene_unmounted.c +++ b/applications/settings/storage_settings/scenes/storage_settings_scene_unmounted.c @@ -1,5 +1,4 @@ #include "../storage_settings.h" -#include static void storage_settings_scene_unmounted_dialog_callback(DialogExResult result, void* context) { @@ -14,7 +13,7 @@ void storage_settings_scene_unmounted_on_enter(void* context) { DialogEx* dialog_ex = app->dialog_ex; dialog_ex_set_center_button_text(dialog_ex, "OK"); - dialog_ex_set_icon(dialog_ex, 72, 17, XTREME_ASSETS()->I_DolphinCommon_56x48); + dialog_ex_set_icon(dialog_ex, 72, 17, &I_DolphinCommon_56x48); if(error == FSE_OK) { dialog_ex_set_header(dialog_ex, "SD Card Unmounted", 64, 3, AlignCenter, AlignTop);