diff --git a/applications/main/ibutton/scenes/ibutton_scene_delete_success.c b/applications/main/ibutton/scenes/ibutton_scene_delete_success.c index 42ad4b5e9..94ebb14dc 100644 --- a/applications/main/ibutton/scenes/ibutton_scene_delete_success.c +++ b/applications/main/ibutton/scenes/ibutton_scene_delete_success.c @@ -1,5 +1,5 @@ #include "../ibutton_i.h" -#include "../../../settings/xtreme_settings/xtreme_settings.h" +#include "../../../settings/xtreme_settings/xtreme_assets.h" static void ibutton_scene_delete_success_popup_callback(void* context) { iButton* ibutton = context; @@ -10,11 +10,7 @@ void ibutton_scene_delete_success_on_enter(void* context) { iButton* ibutton = context; Popup* popup = ibutton->popup; - if(XTREME_SETTINGS()->sfw_mode) { - popup_set_icon(popup, 0, 2, &I_DolphinMafia_115x62_sfw); - } else { - popup_set_icon(popup, 0, 2, &I_DolphinMafia_115x62); - } + popup_set_icon(popup, 0, 2, XTREME_ASSETS()->dolphin_mafia); 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 49accd130..c346ab034 100644 --- a/applications/main/ibutton/scenes/ibutton_scene_read.c +++ b/applications/main/ibutton/scenes/ibutton_scene_read.c @@ -1,6 +1,6 @@ #include "../ibutton_i.h" #include -#include "../../../settings/xtreme_settings/xtreme_settings.h" +#include "../../../settings/xtreme_settings/xtreme_assets.h" static void ibutton_scene_read_callback(void* context) { iButton* ibutton = context; @@ -15,11 +15,7 @@ void ibutton_scene_read_on_enter(void* context) { popup_set_header(popup, "iButton", 95, 26, AlignCenter, AlignBottom); popup_set_text(popup, "Waiting\nfor key ...", 95, 30, AlignCenter, AlignTop); - if(XTREME_SETTINGS()->sfw_mode) { - popup_set_icon(popup, 0, 5, &I_DolphinWait_61x59_sfw); - } else { - popup_set_icon(popup, 0, 5, &I_DolphinWait_61x59); - } + popup_set_icon(popup, 0, 5, XTREME_ASSETS()->dolphin_wait); view_dispatcher_switch_to_view(ibutton->view_dispatcher, iButtonViewPopup); furi_string_set(ibutton->file_path, IBUTTON_APP_FOLDER); diff --git a/applications/main/ibutton/scenes/ibutton_scene_save_success.c b/applications/main/ibutton/scenes/ibutton_scene_save_success.c index 7bf002010..2d5d55377 100644 --- a/applications/main/ibutton/scenes/ibutton_scene_save_success.c +++ b/applications/main/ibutton/scenes/ibutton_scene_save_success.c @@ -1,5 +1,5 @@ #include "../ibutton_i.h" -#include "../../../settings/xtreme_settings/xtreme_settings.h" +#include "../../../settings/xtreme_settings/xtreme_assets.h" static void ibutton_scene_save_success_popup_callback(void* context) { iButton* ibutton = context; @@ -10,11 +10,7 @@ void ibutton_scene_save_success_on_enter(void* context) { iButton* ibutton = context; Popup* popup = ibutton->popup; - if(XTREME_SETTINGS()->sfw_mode) { - popup_set_icon(popup, 32, 5, &I_DolphinNice_96x59_sfw); - } else { - popup_set_icon(popup, 32, 5, &I_DolphinNice_96x59); - } + popup_set_icon(popup, 32, 5, XTREME_ASSETS()->dolphin_nice); 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 2907935bc..d436b83be 100644 --- a/applications/main/ibutton/scenes/ibutton_scene_write_success.c +++ b/applications/main/ibutton/scenes/ibutton_scene_write_success.c @@ -1,5 +1,5 @@ #include "../ibutton_i.h" -#include "../../../settings/xtreme_settings/xtreme_settings.h" +#include "../../../settings/xtreme_settings/xtreme_assets.h" static void ibutton_scene_write_success_popup_callback(void* context) { iButton* ibutton = context; @@ -11,11 +11,7 @@ void ibutton_scene_write_success_on_enter(void* context) { iButton* ibutton = context; Popup* popup = ibutton->popup; - if(XTREME_SETTINGS()->sfw_mode) { - popup_set_icon(popup, 0, 12, &I_iButtonDolphinVerySuccess_108x52_sfw); - } else { - popup_set_icon(popup, 0, 12, &I_iButtonDolphinVerySuccess_108x52); - } + popup_set_icon(popup, 0, 12, XTREME_ASSETS()->ibutton_success); 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 a1615a3ac..0521a8c8e 100644 --- a/applications/main/infrared/scenes/infrared_scene_edit_rename_done.c +++ b/applications/main/infrared/scenes/infrared_scene_edit_rename_done.c @@ -1,15 +1,11 @@ #include "../infrared_i.h" -#include "../../../settings/xtreme_settings/xtreme_settings.h" +#include "../../../settings/xtreme_settings/xtreme_assets.h" void infrared_scene_edit_rename_done_on_enter(void* context) { Infrared* infrared = context; Popup* popup = infrared->popup; - if(XTREME_SETTINGS()->sfw_mode) { - popup_set_icon(popup, 32, 5, &I_DolphinNice_96x59_sfw); - } else { - popup_set_icon(popup, 32, 5, &I_DolphinNice_96x59); - } + popup_set_icon(popup, 32, 5, XTREME_ASSETS()->dolphin_nice); 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 c83c35356..a04af9834 100644 --- a/applications/main/infrared/scenes/infrared_scene_learn_done.c +++ b/applications/main/infrared/scenes/infrared_scene_learn_done.c @@ -1,19 +1,15 @@ #include "../infrared_i.h" -#include "../../../settings/xtreme_settings/xtreme_settings.h" +#include "../../../settings/xtreme_settings/xtreme_assets.h" void infrared_scene_learn_done_on_enter(void* context) { Infrared* infrared = context; Popup* popup = infrared->popup; - if(XTREME_SETTINGS()->sfw_mode) { - popup_set_icon(popup, 32, 5, &I_DolphinNice_96x59_sfw); - if(infrared->app_state.is_learning_new_remote) { - popup_set_header(popup, "New remote\ncreated!", 0, 0, AlignLeft, AlignTop); - } else { - popup_set_header(popup, "Saved!", 5, 7, AlignLeft, AlignTop); - } + popup_set_icon(popup, 32, 5, XTREME_ASSETS()->dolphin_nice); + if(infrared->app_state.is_learning_new_remote) { + popup_set_header(popup, "New remote\ncreated!", 0, 0, AlignLeft, AlignTop); } else { - 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_success.c b/applications/main/infrared/scenes/infrared_scene_learn_success.c index 0e53ab96f..8603d558b 100644 --- a/applications/main/infrared/scenes/infrared_scene_learn_success.c +++ b/applications/main/infrared/scenes/infrared_scene_learn_success.c @@ -1,5 +1,5 @@ #include "../infrared_i.h" -#include "../../../settings/xtreme_settings/xtreme_settings.h" +#include "../../../settings/xtreme_settings/xtreme_assets.h" static void infrared_scene_learn_success_dialog_result_callback(DialogExResult result, void* context) { @@ -48,11 +48,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"); - if(XTREME_SETTINGS()->sfw_mode) { - dialog_ex_set_icon(dialog_ex, 0, 1, &I_DolphinReadingSuccess_59x63_sfw); - } else { - dialog_ex_set_icon(dialog_ex, 0, 1, &I_DolphinReadingSuccess_59x63); - } + dialog_ex_set_icon(dialog_ex, 0, 1, XTREME_ASSETS()->ir_success); 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 ca08544d6..b8cdfb833 100644 --- a/applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c +++ b/applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c @@ -1,6 +1,6 @@ #include "../lfrfid_i.h" #include "../helpers/rfid_writer.h" -#include "../../../settings/xtreme_settings/xtreme_settings.h" +#include "../../../settings/xtreme_settings/xtreme_assets.h" static void writer_initialize(T55xxTiming* t55xxtiming) { t55xxtiming->wait_time = 400; @@ -43,11 +43,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); - if(XTREME_SETTINGS()->sfw_mode) { - popup_set_icon(popup, 0, 3, &I_RFIDDolphinSend_97x61_sfw); - } else { - popup_set_icon(popup, 0, 3, &I_RFIDDolphinSend_97x61); - } + popup_set_icon(popup, 0, 3, XTREME_ASSETS()->rfid_send); popup_set_text(popup, curr_buf, 90, 56, AlignCenter, AlignCenter); notification_message(app->notifications, &sequence_blink_start_magenta); @@ -75,11 +71,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); - if(XTREME_SETTINGS()->sfw_mode) { - popup_set_icon(popup, 0, 7, &I_RFIDDolphinSuccess_108x57_sfw); - } else { - popup_set_icon(popup, 0, 7, &I_RFIDDolphinSuccess_108x57); - } + popup_set_icon(popup, 0, 7, XTREME_ASSETS()->rfid_success); 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 274147eec..0d519049e 100644 --- a/applications/main/lfrfid/scenes/lfrfid_scene_delete_success.c +++ b/applications/main/lfrfid/scenes/lfrfid_scene_delete_success.c @@ -1,15 +1,11 @@ #include "../lfrfid_i.h" -#include "../../../settings/xtreme_settings/xtreme_settings.h" +#include "../../../settings/xtreme_settings/xtreme_assets.h" void lfrfid_scene_delete_success_on_enter(void* context) { LfRfid* app = context; Popup* popup = app->popup; - if(XTREME_SETTINGS()->sfw_mode) { - popup_set_icon(popup, 0, 2, &I_DolphinMafia_115x62_sfw); - } else { - popup_set_icon(popup, 0, 2, &I_DolphinMafia_115x62); - } + popup_set_icon(popup, 0, 2, XTREME_ASSETS()->dolphin_mafia); 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 923a6a8ba..c0cc23b8f 100644 --- a/applications/main/lfrfid/scenes/lfrfid_scene_emulate.c +++ b/applications/main/lfrfid/scenes/lfrfid_scene_emulate.c @@ -1,5 +1,5 @@ #include "../lfrfid_i.h" -#include "../../../settings/xtreme_settings/xtreme_settings.h" +#include "../../../settings/xtreme_settings/xtreme_assets.h" void lfrfid_scene_emulate_on_enter(void* context) { LfRfid* app = context; @@ -17,11 +17,7 @@ void lfrfid_scene_emulate_on_enter(void* context) { AlignCenter, AlignTop); } - if(XTREME_SETTINGS()->sfw_mode) { - popup_set_icon(popup, 0, 3, &I_RFIDDolphinSend_97x61_sfw); - } else { - popup_set_icon(popup, 0, 3, &I_RFIDDolphinSend_97x61); - } + popup_set_icon(popup, 0, 3, XTREME_ASSETS()->rfid_send); 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 f56ef8684..67b48d02c 100644 --- a/applications/main/lfrfid/scenes/lfrfid_scene_raw_read.c +++ b/applications/main/lfrfid/scenes/lfrfid_scene_raw_read.c @@ -1,5 +1,5 @@ #include "../lfrfid_i.h" -#include "../../../settings/xtreme_settings/xtreme_settings.h" +#include "../../../settings/xtreme_settings/xtreme_assets.h" #define RAW_READ_TIME 5000 @@ -33,11 +33,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(); - if(XTREME_SETTINGS()->sfw_mode) { - popup_set_icon(popup, 0, 3, &I_RFIDDolphinReceive_97x61_sfw); - } else { - popup_set_icon(popup, 0, 3, &I_RFIDDolphinReceive_97x61); - } + popup_set_icon(popup, 0, 3, XTREME_ASSETS()->rfid_receive); 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 5b102ff1a..b5c7d911e 100644 --- a/applications/main/lfrfid/scenes/lfrfid_scene_rpc.c +++ b/applications/main/lfrfid/scenes/lfrfid_scene_rpc.c @@ -1,5 +1,5 @@ #include "../lfrfid_i.h" -#include "../../../settings/xtreme_settings/xtreme_settings.h" +#include "../../../settings/xtreme_settings/xtreme_assets.h" void lfrfid_scene_rpc_on_enter(void* context) { LfRfid* app = context; @@ -7,11 +7,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); - if(XTREME_SETTINGS()->sfw_mode) { - popup_set_icon(popup, 0, 12, &I_RFIDDolphinSend_97x61_sfw); - } else { - popup_set_icon(popup, 0, 12, &I_RFIDDolphinSend_97x61); - } + popup_set_icon(popup, 0, 12, XTREME_ASSETS()->rfid_send); 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 2367f4ccd..3b964e176 100644 --- a/applications/main/lfrfid/scenes/lfrfid_scene_save_success.c +++ b/applications/main/lfrfid/scenes/lfrfid_scene_save_success.c @@ -1,5 +1,5 @@ #include "../lfrfid_i.h" -#include "../../../settings/xtreme_settings/xtreme_settings.h" +#include "../../../settings/xtreme_settings/xtreme_assets.h" void lfrfid_scene_save_success_on_enter(void* context) { LfRfid* app = context; @@ -7,11 +7,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); - if(XTREME_SETTINGS()->sfw_mode) { - popup_set_icon(popup, 32, 5, &I_DolphinNice_96x59_sfw); - } else { - popup_set_icon(popup, 32, 5, &I_DolphinNice_96x59); - } + popup_set_icon(popup, 32, 5, XTREME_ASSETS()->dolphin_nice); 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 79c74413d..349d3df3d 100644 --- a/applications/main/lfrfid/scenes/lfrfid_scene_write.c +++ b/applications/main/lfrfid/scenes/lfrfid_scene_write.c @@ -1,5 +1,5 @@ #include "../lfrfid_i.h" -#include "../../../settings/xtreme_settings/xtreme_settings.h" +#include "../../../settings/xtreme_settings/xtreme_assets.h" static void lfrfid_write_callback(LFRFIDWorkerWriteResult result, void* context) { LfRfid* app = context; @@ -34,11 +34,7 @@ void lfrfid_scene_write_on_enter(void* context) { AlignCenter, AlignTop); } - if(XTREME_SETTINGS()->sfw_mode) { - popup_set_icon(popup, 0, 3, &I_RFIDDolphinSend_97x61_sfw); - } else { - popup_set_icon(popup, 0, 3, &I_RFIDDolphinSend_97x61); - } + popup_set_icon(popup, 0, 3, XTREME_ASSETS()->rfid_send); 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 807a975b2..25a9bb85b 100644 --- a/applications/main/lfrfid/scenes/lfrfid_scene_write_success.c +++ b/applications/main/lfrfid/scenes/lfrfid_scene_write_success.c @@ -1,16 +1,12 @@ #include "../lfrfid_i.h" -#include "../../../settings/xtreme_settings/xtreme_settings.h" +#include "../../../settings/xtreme_settings/xtreme_assets.h" 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); - if(XTREME_SETTINGS()->sfw_mode) { - popup_set_icon(popup, 0, 6, &I_RFIDDolphinSuccess_108x57_sfw); - } else { - popup_set_icon(popup, 0, 6, &I_RFIDDolphinSuccess_108x57); - } + popup_set_icon(popup, 0, 6, XTREME_ASSETS()->rfid_success); 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 c2d76a464..f04d06ad9 100644 --- a/applications/main/nfc/scenes/nfc_scene_delete_success.c +++ b/applications/main/nfc/scenes/nfc_scene_delete_success.c @@ -1,5 +1,5 @@ #include "../nfc_i.h" -#include "../../../settings/xtreme_settings/xtreme_settings.h" +#include "../../../settings/xtreme_settings/xtreme_assets.h" void nfc_scene_delete_success_popup_callback(void* context) { Nfc* nfc = context; @@ -11,11 +11,7 @@ void nfc_scene_delete_success_on_enter(void* context) { // Setup view Popup* popup = nfc->popup; - if(XTREME_SETTINGS()->sfw_mode) { - popup_set_icon(popup, 0, 2, &I_DolphinMafia_115x62_sfw); - } else { - popup_set_icon(popup, 0, 2, &I_DolphinMafia_115x62); - } + popup_set_icon(popup, 0, 2, XTREME_ASSETS()->dolphin_mafia); 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_nfcv.c b/applications/main/nfc/scenes/nfc_scene_emulate_nfcv.c index fd9faca08..6b76b4299 100644 --- a/applications/main/nfc/scenes/nfc_scene_emulate_nfcv.c +++ b/applications/main/nfc/scenes/nfc_scene_emulate_nfcv.c @@ -1,5 +1,5 @@ #include "../nfc_i.h" -#include "../../../settings/xtreme_settings/xtreme_settings.h" +#include "../../../settings/xtreme_settings/xtreme_assets.h" #define NFC_SCENE_EMULATE_NFCV_LOG_SIZE_MAX (100) @@ -38,11 +38,7 @@ static void nfc_scene_emulate_nfcv_widget_config(Nfc* nfc, bool data_received) { FuriString* info_str; info_str = furi_string_alloc(); - if(XTREME_SETTINGS()->sfw_mode) { - widget_add_icon_element(widget, 0, 3, &I_RFIDDolphinSend_97x61_sfw); - } else { - widget_add_icon_element(widget, 0, 3, &I_RFIDDolphinSend_97x61); - } + widget_add_icon_element(widget, 0, 3, XTREME_ASSETS()->rfid_send); widget_add_string_element( widget, 89, 32, AlignCenter, AlignTop, FontPrimary, "Emulating NfcV"); diff --git a/applications/main/nfc/scenes/nfc_scene_emulate_uid.c b/applications/main/nfc/scenes/nfc_scene_emulate_uid.c index 44fe5ead2..df99b6c52 100644 --- a/applications/main/nfc/scenes/nfc_scene_emulate_uid.c +++ b/applications/main/nfc/scenes/nfc_scene_emulate_uid.c @@ -1,5 +1,5 @@ #include "../nfc_i.h" -#include "../../../settings/xtreme_settings/xtreme_settings.h" +#include "../../../settings/xtreme_settings/xtreme_assets.h" #define NFC_SCENE_EMULATE_UID_LOG_SIZE_MAX (200) @@ -38,11 +38,7 @@ static void nfc_scene_emulate_uid_widget_config(Nfc* nfc, bool data_received) { FuriString* info_str; info_str = furi_string_alloc(); - if(XTREME_SETTINGS()->sfw_mode) { - widget_add_icon_element(widget, 0, 3, &I_NFC_dolphin_emulation_47x61_sfw); - } else { - widget_add_icon_element(widget, 0, 3, &I_NFC_dolphin_emulation_47x61); - } + widget_add_icon_element(widget, 0, 3, XTREME_ASSETS()->nfc_emulation); 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 83c757a34..2608f3463 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,5 @@ #include "../nfc_i.h" -#include "../../../settings/xtreme_settings/xtreme_settings.h" +#include "../../../settings/xtreme_settings/xtreme_assets.h" #define NFC_MF_CLASSIC_DATA_NOT_CHANGED (0UL) #define NFC_MF_CLASSIC_DATA_CHANGED (1UL) @@ -24,11 +24,7 @@ void nfc_scene_mf_classic_emulate_on_enter(void* context) { } else { nfc_text_store_set(nfc, "MIFARE\nClassic"); } - if(XTREME_SETTINGS()->sfw_mode) { - popup_set_icon(popup, 0, 3, &I_NFC_dolphin_emulation_47x61_sfw); - } else { - popup_set_icon(popup, 0, 3, &I_NFC_dolphin_emulation_47x61); - } + popup_set_icon(popup, 0, 3, XTREME_ASSETS()->nfc_emulation); 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 8e7e80fd7..4f7e2904c 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,6 @@ #include "../nfc_i.h" #include -#include "../../../settings/xtreme_settings/xtreme_settings.h" +#include "../../../settings/xtreme_settings/xtreme_assets.h" void nfc_scene_mf_classic_update_success_popup_callback(void* context) { Nfc* nfc = context; @@ -14,11 +14,7 @@ void nfc_scene_mf_classic_update_success_on_enter(void* context) { notification_message(nfc->notifications, &sequence_success); Popup* popup = nfc->popup; - if(XTREME_SETTINGS()->sfw_mode) { - popup_set_icon(popup, 32, 5, &I_DolphinNice_96x59_sfw); - } else { - popup_set_icon(popup, 32, 5, &I_DolphinNice_96x59); - } + popup_set_icon(popup, 32, 5, XTREME_ASSETS()->dolphin_nice); 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 3485aa17a..c67b302b7 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,6 @@ #include "../nfc_i.h" #include -#include "../../../settings/xtreme_settings/xtreme_settings.h" +#include "../../../settings/xtreme_settings/xtreme_assets.h" void nfc_scene_mf_classic_write_success_popup_callback(void* context) { Nfc* nfc = context; @@ -14,11 +14,7 @@ void nfc_scene_mf_classic_write_success_on_enter(void* context) { notification_message(nfc->notifications, &sequence_success); Popup* popup = nfc->popup; - if(XTREME_SETTINGS()->sfw_mode) { - popup_set_icon(popup, 32, 5, &I_DolphinNice_96x59_sfw); - } else { - popup_set_icon(popup, 32, 5, &I_DolphinNice_96x59); - } + popup_set_icon(popup, 32, 5, XTREME_ASSETS()->dolphin_nice); 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 aad01cdf1..8ea131d7e 100644 --- a/applications/main/nfc/scenes/nfc_scene_mf_ultralight_emulate.c +++ b/applications/main/nfc/scenes/nfc_scene_mf_ultralight_emulate.c @@ -1,6 +1,6 @@ #include "../nfc_i.h" #include -#include "../../../settings/xtreme_settings/xtreme_settings.h" +#include "../../../settings/xtreme_settings/xtreme_assets.h" #define NFC_SCENE_MF_ULTRALIGHT_EMULATE_LOG_SIZE_MAX (200) @@ -66,11 +66,7 @@ void nfc_scene_mf_ultralight_emulate_widget_config(Nfc* nfc, bool auth_attempted FuriString* info_str; info_str = furi_string_alloc(); - if(XTREME_SETTINGS()->sfw_mode) { - widget_add_icon_element(widget, 0, 3, &I_NFC_dolphin_emulation_47x61_sfw); - } else { - widget_add_icon_element(widget, 0, 3, &I_NFC_dolphin_emulation_47x61); - } + widget_add_icon_element(widget, 0, 3, XTREME_ASSETS()->nfc_emulation); if(strcmp(nfc->dev->dev_name, "")) { furi_string_printf(info_str, "Emulating\n%s", nfc->dev->dev_name); @@ -117,11 +113,7 @@ void nfc_scene_mf_ultralight_emulate_on_enter(void* context) { } else { nfc_text_store_set(nfc, "MIFARE\nNTAG"); } - if(XTREME_SETTINGS()->sfw_mode) { - popup_set_icon(popup, 0, 3, &I_NFC_dolphin_emulation_47x61_sfw); - } else { - popup_set_icon(popup, 0, 3, &I_NFC_dolphin_emulation_47x61); - } + popup_set_icon(popup, 0, 3, XTREME_ASSETS()->nfc_emulation); popup_set_text(popup, nfc->text_store, 90, 28, AlignCenter, AlignTop); // Set Widget state and view diff --git a/applications/main/nfc/scenes/nfc_scene_restore_original.c b/applications/main/nfc/scenes/nfc_scene_restore_original.c index e2ea843a5..dad843241 100644 --- a/applications/main/nfc/scenes/nfc_scene_restore_original.c +++ b/applications/main/nfc/scenes/nfc_scene_restore_original.c @@ -1,5 +1,5 @@ #include "../nfc_i.h" -#include "../../../settings/xtreme_settings/xtreme_settings.h" +#include "../../../settings/xtreme_settings/xtreme_assets.h" void nfc_scene_restore_original_popup_callback(void* context) { Nfc* nfc = context; @@ -11,11 +11,7 @@ void nfc_scene_restore_original_on_enter(void* context) { // Setup view Popup* popup = nfc->popup; - if(XTREME_SETTINGS()->sfw_mode) { - popup_set_icon(popup, 32, 5, &I_DolphinNice_96x59_sfw); - } else { - popup_set_icon(popup, 32, 5, &I_DolphinNice_96x59); - } + popup_set_icon(popup, 32, 5, XTREME_ASSETS()->dolphin_nice); 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 2360bd719..0f8150e1a 100644 --- a/applications/main/nfc/scenes/nfc_scene_rpc.c +++ b/applications/main/nfc/scenes/nfc_scene_rpc.c @@ -1,5 +1,5 @@ #include "../nfc_i.h" -#include "../../../settings/xtreme_settings/xtreme_settings.h" +#include "../../../settings/xtreme_settings/xtreme_assets.h" void nfc_scene_rpc_on_enter(void* context) { Nfc* nfc = context; @@ -8,11 +8,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); - if(XTREME_SETTINGS()->sfw_mode) { - popup_set_icon(popup, 0, 12, &I_NFC_dolphin_emulation_47x61_sfw); - } else { - popup_set_icon(popup, 0, 12, &I_NFC_dolphin_emulation_47x61); - } + popup_set_icon(popup, 0, 12, XTREME_ASSETS()->nfc_emulation); 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 e9a701119..75b88d763 100644 --- a/applications/main/nfc/scenes/nfc_scene_save_success.c +++ b/applications/main/nfc/scenes/nfc_scene_save_success.c @@ -1,5 +1,5 @@ #include "../nfc_i.h" -#include "../../../settings/xtreme_settings/xtreme_settings.h" +#include "../../../settings/xtreme_settings/xtreme_assets.h" void nfc_scene_save_success_popup_callback(void* context) { Nfc* nfc = context; @@ -11,11 +11,7 @@ void nfc_scene_save_success_on_enter(void* context) { // Setup view Popup* popup = nfc->popup; - if(XTREME_SETTINGS()->sfw_mode) { - popup_set_icon(popup, 32, 5, &I_DolphinNice_96x59_sfw); - } else { - popup_set_icon(popup, 32, 5, &I_DolphinNice_96x59); - } + popup_set_icon(popup, 32, 5, XTREME_ASSETS()->dolphin_nice); 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 701fa1e7e..af70df368 100644 --- a/applications/main/subghz/scenes/subghz_scene_delete_success.c +++ b/applications/main/subghz/scenes/subghz_scene_delete_success.c @@ -1,6 +1,6 @@ #include "../subghz_i.h" #include "../helpers/subghz_custom_event.h" -#include "../../../settings/xtreme_settings/xtreme_settings.h" +#include "../../../settings/xtreme_settings/xtreme_assets.h" void subghz_scene_delete_success_popup_callback(void* context) { SubGhz* subghz = context; @@ -13,11 +13,7 @@ void subghz_scene_delete_success_on_enter(void* context) { // Setup view Popup* popup = subghz->popup; - if(XTREME_SETTINGS()->sfw_mode) { - popup_set_icon(popup, 0, 2, &I_DolphinMafia_115x62_sfw); - } else { - popup_set_icon(popup, 0, 2, &I_DolphinMafia_115x62); - } + popup_set_icon(popup, 0, 2, XTREME_ASSETS()->dolphin_mafia); 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 2e2f53356..d854e4735 100644 --- a/applications/main/subghz/scenes/subghz_scene_rpc.c +++ b/applications/main/subghz/scenes/subghz_scene_rpc.c @@ -1,7 +1,7 @@ #include "../subghz_i.h" #include #include -#include "../../../settings/xtreme_settings/xtreme_settings.h" +#include "../../../settings/xtreme_settings/xtreme_assets.h" typedef enum { SubGhzRpcStateIdle, @@ -14,11 +14,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); - if(XTREME_SETTINGS()->sfw_mode) { - popup_set_icon(popup, 0, 12, &I_RFIDDolphinSend_97x61_sfw); - } else { - popup_set_icon(popup, 0, 12, &I_RFIDDolphinSend_97x61); - } + popup_set_icon(popup, 0, 12, XTREME_ASSETS()->rfid_send); 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 24e35e711..39774a813 100644 --- a/applications/main/subghz/scenes/subghz_scene_save_success.c +++ b/applications/main/subghz/scenes/subghz_scene_save_success.c @@ -1,6 +1,6 @@ #include "../subghz_i.h" #include "../helpers/subghz_custom_event.h" -#include "../../../settings/xtreme_settings/xtreme_settings.h" +#include "../../../settings/xtreme_settings/xtreme_assets.h" void subghz_scene_save_success_popup_callback(void* context) { SubGhz* subghz = context; @@ -12,11 +12,7 @@ void subghz_scene_save_success_on_enter(void* context) { // Setup view Popup* popup = subghz->popup; - if(XTREME_SETTINGS()->sfw_mode) { - popup_set_icon(popup, 32, 5, &I_DolphinNice_96x59_sfw); - } else { - popup_set_icon(popup, 32, 5, &I_DolphinNice_96x59); - } + popup_set_icon(popup, 32, 5, XTREME_ASSETS()->dolphin_nice); 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 02fec748b..a12ff0468 100644 --- a/applications/main/subghz/views/receiver.c +++ b/applications/main/subghz/views/receiver.c @@ -7,7 +7,7 @@ #include #include -#include "../../../settings/xtreme_settings/xtreme_settings.h" +#include "../../../settings/xtreme_settings/xtreme_assets.h" #define FRAME_HEIGHT 12 #define MAX_LEN_PX 111 @@ -195,7 +195,6 @@ void subghz_view_receiver_draw(Canvas* canvas, SubGhzViewReceiverModel* model) { canvas_clear(canvas); canvas_set_color(canvas, ColorBlack); canvas_set_font(canvas, FontSecondary); - XtremeSettings* xtreme_settings = XTREME_SETTINGS(); if(model->mode == SubGhzViewReceiverModeLive) { elements_button_left(canvas, "Config"); @@ -233,21 +232,13 @@ void subghz_view_receiver_draw(Canvas* canvas, SubGhzViewReceiverModel* model) { if(model->history_item == 0) { if(model->mode == SubGhzViewReceiverModeLive) { - if(xtreme_settings->sfw_mode) { - canvas_draw_icon(canvas, 0, 0, &I_Scanning_123x52_sfw); - } else { - canvas_draw_icon(canvas, 0, 0, &I_Scanning_123x52); - } + canvas_draw_icon(canvas, 0, 0, XTREME_ASSETS()->subghz_scanning); canvas_set_font(canvas, FontPrimary); canvas_draw_str(canvas, 63, 46, "Scanning..."); canvas_draw_line(canvas, 46, 51, 125, 51); canvas_set_font(canvas, FontSecondary); } else { - if(xtreme_settings->sfw_mode) { - canvas_draw_icon(canvas, 0, 0, &I_Scanning_123x52_sfw); - } else { - canvas_draw_icon(canvas, 0, 0, &I_Scanning_123x52); - } + canvas_draw_icon(canvas, 0, 0, XTREME_ASSETS()->subghz_scanning); 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 a770dd0aa..05e3ca715 100644 --- a/applications/main/u2f/views/u2f_view.c +++ b/applications/main/u2f/views/u2f_view.c @@ -1,7 +1,7 @@ #include "u2f_view.h" #include #include -#include "../../../settings/xtreme_settings/xtreme_settings.h" +#include "../../../settings/xtreme_settings/xtreme_assets.h" struct U2fView { View* view; @@ -16,68 +16,65 @@ typedef struct { static void u2f_view_draw_callback(Canvas* canvas, void* _model) { U2fModel* model = _model; XtremeSettings* xtreme_settings = XTREME_SETTINGS(); + XtremeAssets* xtreme_assets = XTREME_ASSETS(); canvas_draw_icon(canvas, 8, 14, &I_Drive_112x35); canvas_set_font(canvas, FontSecondary); if(model->display_msg == U2fMsgNotConnected) { + canvas_draw_icon(canvas, 22, 15, xtreme_assets->connect_me); if(xtreme_settings->sfw_mode) { - canvas_draw_icon(canvas, 22, 15, &I_Connect_me_62x31_sfw); canvas_draw_str_aligned( canvas, 128 / 2, 3, AlignCenter, AlignTop, "Connect to a device"); } else { - canvas_draw_icon(canvas, 22, 15, &I_Connect_me_62x31); canvas_draw_str_aligned( canvas, 128 / 2, 3, AlignCenter, AlignTop, "Plug me in d-daddy"); } } else if(model->display_msg == U2fMsgIdle) { + canvas_draw_icon(canvas, 22, 15, xtreme_assets->connected); if(xtreme_settings->sfw_mode) { - canvas_draw_icon(canvas, 22, 15, &I_Connected_62x31_sfw); canvas_draw_str_aligned(canvas, 128 / 2, 3, AlignCenter, AlignTop, "Connected!"); } else { - 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_settings->sfw_mode) { elements_button_center(canvas, "OK"); - canvas_draw_icon(canvas, 22, 15, &I_Auth_62x31_sfw); + canvas_draw_icon(canvas, 22, 15, xtreme_assets->authenticate); canvas_draw_str_aligned( canvas, 128 / 2, 3, AlignCenter, AlignTop, "Press OK to register"); } else { elements_button_center(canvas, "CUM"); - canvas_draw_icon(canvas, 22, 15, &I_Auth_62x31); + canvas_draw_icon(canvas, 22, 15, xtreme_assets->authenticate); canvas_draw_str_aligned( canvas, 128 / 2, 3, AlignCenter, AlignTop, "Press CUM to register"); } } else if(model->display_msg == U2fMsgAuth) { if(xtreme_settings->sfw_mode) { elements_button_center(canvas, "OK"); - canvas_draw_icon(canvas, 22, 15, &I_Auth_62x31_sfw); + canvas_draw_icon(canvas, 22, 15, xtreme_assets->authenticate); canvas_draw_str_aligned( canvas, 128 / 2, 3, AlignCenter, AlignTop, "Press OK to authenticate"); } else { elements_button_center(canvas, "CUM"); - canvas_draw_icon(canvas, 22, 15, &I_Auth_62x31); + canvas_draw_icon(canvas, 22, 15, xtreme_assets->authenticate); canvas_draw_str_aligned( canvas, 128 / 2, 3, AlignCenter, AlignTop, "Press CUM to authenticate"); } } else if(model->display_msg == U2fMsgSuccess) { + canvas_draw_icon(canvas, 22, 15, xtreme_assets->connected); if(xtreme_settings->sfw_mode) { - canvas_draw_icon(canvas, 22, 15, &I_Connected_62x31_sfw); canvas_draw_str_aligned( canvas, 128 / 2, 3, AlignCenter, AlignTop, "Authentication successful!"); } else { - canvas_draw_icon(canvas, 22, 15, &I_Connected_62x31); canvas_draw_str_aligned(canvas, 128 / 2, 3, AlignCenter, AlignTop, "Cum released~"); } } else if(model->display_msg == U2fMsgError) { + canvas_draw_icon(canvas, 22, 15, xtreme_assets->error); if(xtreme_settings->sfw_mode) { - canvas_draw_icon(canvas, 22, 15, &I_Error_62x31_sfw); canvas_draw_str_aligned( canvas, 128 / 2, 3, AlignCenter, AlignTop, "Certificate error"); } else { - canvas_draw_icon(canvas, 22, 15, &I_Error_62x31); canvas_draw_str_aligned(canvas, 128 / 2, 3, AlignCenter, AlignTop, "Unable to cum"); } } diff --git a/applications/plugins/pocsag_pager/views/pocsag_pager_receiver.c b/applications/plugins/pocsag_pager/views/pocsag_pager_receiver.c index 598e1e6db..ec6075612 100644 --- a/applications/plugins/pocsag_pager/views/pocsag_pager_receiver.c +++ b/applications/plugins/pocsag_pager/views/pocsag_pager_receiver.c @@ -7,7 +7,7 @@ #include #include -#include "../../../settings/xtreme_settings/xtreme_settings.h" +#include "../../../settings/xtreme_settings/xtreme_assets.h" #define FRAME_HEIGHT 12 #define MAX_LEN_PX 112 @@ -181,8 +181,6 @@ void pcsg_view_receiver_draw(Canvas* canvas, PCSGReceiverModel* model) { FuriString* str_buff; str_buff = furi_string_alloc(); - XtremeSettings* xtreme_settings = XTREME_SETTINGS(); - PCSGReceiverMenuItem* item_menu; for(size_t i = 0; i < MIN(model->history_item, MENU_ITEMS); ++i) { @@ -208,11 +206,7 @@ void pcsg_view_receiver_draw(Canvas* canvas, PCSGReceiverModel* model) { canvas_set_color(canvas, ColorBlack); if(model->history_item == 0) { - if(xtreme_settings->sfw_mode) { - canvas_draw_icon(canvas, 0, 0, &I_Scanning_123x52_sfw); - } else { - canvas_draw_icon(canvas, 0, 0, &I_Scanning_123x52); - } + canvas_draw_icon(canvas, 0, 0, XTREME_ASSETS()->subghz_scanning); canvas_set_font(canvas, FontPrimary); canvas_draw_str(canvas, 63, 46, "Scanning..."); canvas_draw_line(canvas, 46, 51, 125, 51); @@ -234,7 +228,7 @@ void pcsg_view_receiver_draw(Canvas* canvas, PCSGReceiverModel* model) { canvas_draw_icon(canvas, 65, 42, &I_Pin_back_arrow_10x8); canvas_draw_icon(canvas, 80, 42, &I_Pin_back_arrow_10x8); canvas_draw_icon(canvas, 95, 42, &I_Pin_back_arrow_10x8); - if(xtreme_settings->sfw_mode) { + if(XTREME_SETTINGS()->sfw_mode) { canvas_draw_icon(canvas, 16, 13, &I_WarningDolphin_45x42_sfw); } else { canvas_draw_icon(canvas, 16, 13, &I_WarningDolphin_45x42); diff --git a/applications/plugins/weather_station/views/weather_station_receiver.c b/applications/plugins/weather_station/views/weather_station_receiver.c index f1c201168..01947455d 100644 --- a/applications/plugins/weather_station/views/weather_station_receiver.c +++ b/applications/plugins/weather_station/views/weather_station_receiver.c @@ -7,7 +7,7 @@ #include #include -#include "../../../settings/xtreme_settings/xtreme_settings.h" +#include "../../../settings/xtreme_settings/xtreme_assets.h" #define FRAME_HEIGHT 12 #define MAX_LEN_PX 112 @@ -178,8 +178,6 @@ void ws_view_receiver_draw(Canvas* canvas, WSReceiverModel* model) { FuriString* str_buff; str_buff = furi_string_alloc(); - XtremeSettings* xtreme_settings = XTREME_SETTINGS(); - WSReceiverMenuItem* item_menu; for(size_t i = 0; i < MIN(model->history_item, MENU_ITEMS); ++i) { @@ -204,11 +202,7 @@ void ws_view_receiver_draw(Canvas* canvas, WSReceiverModel* model) { canvas_set_color(canvas, ColorBlack); if(model->history_item == 0) { - if(xtreme_settings->sfw_mode) { - canvas_draw_icon(canvas, 0, 0, &I_Scanning_123x52_sfw); - } else { - canvas_draw_icon(canvas, 0, 0, &I_Scanning_123x52); - } + canvas_draw_icon(canvas, 0, 0, XTREME_ASSETS()->subghz_scanning); canvas_set_font(canvas, FontPrimary); canvas_draw_str(canvas, 63, 46, "Scanning..."); canvas_draw_line(canvas, 46, 51, 125, 51); @@ -230,7 +224,7 @@ void ws_view_receiver_draw(Canvas* canvas, WSReceiverModel* model) { canvas_draw_icon(canvas, 65, 42, &I_Pin_back_arrow_10x8); canvas_draw_icon(canvas, 80, 42, &I_Pin_back_arrow_10x8); canvas_draw_icon(canvas, 95, 42, &I_Pin_back_arrow_10x8); - if(xtreme_settings->sfw_mode) { + if(XTREME_SETTINGS()->sfw_mode) { canvas_draw_icon(canvas, 16, 13, &I_WarningDolphin_45x42_sfw); } else { canvas_draw_icon(canvas, 16, 13, &I_WarningDolphin_45x42); diff --git a/applications/services/bt/bt_service/bt.c b/applications/services/bt/bt_service/bt.c index 13df73da7..4e325b355 100644 --- a/applications/services/bt/bt_service/bt.c +++ b/applications/services/bt/bt_service/bt.c @@ -5,7 +5,7 @@ #include #include #include -#include "../../../settings/xtreme_settings/xtreme_settings.h" +#include "../../../settings/xtreme_settings/xtreme_assets.h" #define TAG "BtSrv" @@ -36,11 +36,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]; - if(XTREME_SETTINGS()->sfw_mode) { - canvas_draw_icon(canvas, 0, 0, &I_BLE_Pairing_128x64_sfw); - } else { - canvas_draw_icon(canvas, 0, 0, &I_BLE_Pairing_128x64); - } + canvas_draw_icon(canvas, 0, 0, XTREME_ASSETS()->bt_pairing); 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"); @@ -83,11 +79,7 @@ static bool bt_pin_code_verify_event_handler(Bt* bt, uint32_t pin) { notification_message(bt->notification, &sequence_display_backlight_on); FuriString* pin_str; - if(XTREME_SETTINGS()->sfw_mode) { - dialog_message_set_icon(bt->dialog_message, &I_BLE_Pairing_128x64_sfw, 0, 0); - } else { - dialog_message_set_icon(bt->dialog_message, &I_BLE_Pairing_128x64, 0, 0); - } + dialog_message_set_icon(bt->dialog_message, XTREME_ASSETS()->bt_pairing, 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_storage.c b/applications/services/desktop/animations/animation_storage.c index 22008677f..804f4e924 100644 --- a/applications/services/desktop/animations/animation_storage.c +++ b/applications/services/desktop/animations/animation_storage.c @@ -11,7 +11,6 @@ #include "animation_storage_i.h" #include #include -#include "../../../settings/xtreme_settings/xtreme_settings.h" #include "../../../settings/xtreme_settings/xtreme_assets.h" #define ANIMATION_META_FILE "meta.txt" #define BASE_ANIMATION_DIR EXT_PATH("dolphin") 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 34d5de16a..7e0667d4d 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,6 +1,6 @@ #include "../bt_settings_app.h" #include "furi_hal_bt.h" -#include "../../xtreme_settings/xtreme_settings.h" +#include "../../xtreme_settings/xtreme_assets.h" void bt_settings_app_scene_forget_dev_success_popup_callback(void* context) { BtSettingsApp* app = context; @@ -11,11 +11,7 @@ void bt_settings_scene_forget_dev_success_on_enter(void* context) { BtSettingsApp* app = context; Popup* popup = app->popup; - if(XTREME_SETTINGS()->sfw_mode) { - popup_set_icon(popup, 32, 5, &I_DolphinNice_96x59_sfw); - } else { - popup_set_icon(popup, 32, 5, &I_DolphinNice_96x59); - } + popup_set_icon(popup, 32, 5, XTREME_ASSETS()->dolphin_nice); 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 78088155a..71cdf39e6 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,7 @@ #include "../desktop_settings_app.h" #include #include "desktop_settings_scene.h" -#include "../../xtreme_settings/xtreme_settings.h" +#include "../../xtreme_settings/xtreme_assets.h" #define SCENE_EVENT_EXIT (0U) @@ -25,11 +25,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); - if(XTREME_SETTINGS()->sfw_mode) { - popup_set_icon(app->popup, 0, 2, &I_DolphinMafia_115x62_sfw); - } else { - popup_set_icon(app->popup, 0, 2, &I_DolphinMafia_115x62); - } + popup_set_icon(app->popup, 0, 2, XTREME_ASSETS()->dolphin_mafia); 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 83f67ad1c..9fc1d5e76 100644 --- a/applications/settings/dolphin_passport/passport.c +++ b/applications/settings/dolphin_passport/passport.c @@ -6,7 +6,6 @@ #include #include #include "dolphin/dolphin.h" -#include "../xtreme_settings/xtreme_settings.h" #include "../xtreme_settings/xtreme_assets.h" #include "math.h" @@ -34,33 +33,33 @@ static void render_callback(Canvas* canvas, void* _ctx) { PassportContext* ctx = _ctx; DolphinStats* stats = ctx->stats; - XtremeSettings* xtreme_settings = XTREME_SETTINGS(); + XtremeAssets* xtreme_assets = XTREME_ASSETS(); char level_str[20]; char xp_str[12]; const char* mood_str = NULL; const Icon* portrait = NULL; - if(xtreme_settings->sfw_mode) { + if(XTREME_SETTINGS()->sfw_mode) { if(stats->butthurt <= 4) { - portrait = XTREME_ASSETS()->passport_happy; + portrait = xtreme_assets->passport_happy; mood_str = "Mood: Happy"; } else if(stats->butthurt <= 9) { - portrait = XTREME_ASSETS()->passport_okay; + portrait = xtreme_assets->passport_okay; mood_str = "Mood: Okay"; } else { - portrait = XTREME_ASSETS()->passport_angry; + portrait = xtreme_assets->passport_angry; mood_str = "Mood: Angry"; } } else { if(stats->butthurt <= 4) { - portrait = XTREME_ASSETS()->passport_happy; + portrait = xtreme_assets->passport_happy; mood_str = "Status: Wet"; } else if(stats->butthurt <= 9) { - portrait = XTREME_ASSETS()->passport_okay; + portrait = xtreme_assets->passport_okay; mood_str = "Status: Horny"; } else { - portrait = XTREME_ASSETS()->passport_angry; + portrait = xtreme_assets->passport_angry; mood_str = "Status: Desperate"; } } @@ -82,11 +81,7 @@ static void render_callback(Canvas* canvas, void* _ctx) { } // multipass - if(xtreme_settings->sfw_mode) { - canvas_draw_icon(canvas, 0, 0, &I_passport_DB_sfw); - } else { - canvas_draw_icon(canvas, 0, 0, &I_passport_DB); - } + canvas_draw_icon(canvas, 0, 0, xtreme_assets->passport_background); // 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 b8a40a67f..b92662682 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 @@ -1,5 +1,5 @@ #include "../power_settings_app.h" -#include "../../xtreme_settings/xtreme_settings.h" +#include "../../xtreme_settings/xtreme_assets.h" void power_settings_scene_power_off_dialog_callback(DialogExResult result, void* context) { furi_assert(context); @@ -15,12 +15,11 @@ void power_settings_scene_power_off_on_enter(void* context) { if(XTREME_SETTINGS()->sfw_mode) { dialog_ex_set_text( dialog, " I will be\nwaiting for\n you here", 78, 16, AlignLeft, AlignTop); - dialog_ex_set_icon(dialog, 21, 13, &I_Cry_dolph_55x52_sfw); } else { dialog_ex_set_text( dialog, " I will be\nwaiting for\n you master", 78, 16, AlignLeft, AlignTop); - dialog_ex_set_icon(dialog, 21, 13, &I_Cry_dolph_55x52); } + dialog_ex_set_icon(dialog, 21, 13, XTREME_ASSETS()->dolphin_cry); 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 3c37327cd..02c555e5d 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,5 @@ #include "../storage_settings.h" -#include "../../xtreme_settings/xtreme_settings.h" +#include "../../xtreme_settings/xtreme_assets.h" static void storage_settings_scene_unmounted_dialog_callback(DialogExResult result, void* context) { @@ -14,11 +14,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"); - if(XTREME_SETTINGS()->sfw_mode) { - dialog_ex_set_icon(dialog_ex, 72, 17, &I_DolphinCommon_56x48_sfw); - } else { - dialog_ex_set_icon(dialog_ex, 72, 17, &I_DolphinCommon_56x48); - } + dialog_ex_set_icon(dialog_ex, 72, 17, XTREME_ASSETS()->dolphin_common); if(error == FSE_OK) { dialog_ex_set_header(dialog_ex, "SD Card Unmounted", 64, 3, AlignCenter, AlignTop); diff --git a/applications/settings/xtreme_settings/xtreme_assets.c b/applications/settings/xtreme_settings/xtreme_assets.c index 0acf3f888..5f52c49b8 100644 --- a/applications/settings/xtreme_settings/xtreme_assets.c +++ b/applications/settings/xtreme_settings/xtreme_assets.c @@ -2,7 +2,7 @@ #include "assets_icons.h" #include -#define XTREME_ASSETS_COUNT 3 +#define XTREME_ASSETS_COUNT 21 Icon* loaded_icons[XTREME_ASSETS_COUNT]; XtremeAssets* xtreme_assets = NULL; @@ -21,13 +21,51 @@ void XTREME_ASSETS_UPDATE() { XtremeSettings* xtreme_settings = XTREME_SETTINGS(); if (xtreme_settings->sfw_mode) { - xtreme_assets->passport_happy = &I_passport_happy1_46x49_sfw; - xtreme_assets->passport_okay = &I_passport_okay1_46x49_sfw; - xtreme_assets->passport_angry = &I_passport_bad1_46x49_sfw; + xtreme_assets->authenticate = &I_Auth_62x31_sfw; + xtreme_assets->bt_pairing = &I_BLE_Pairing_128x64_sfw; + xtreme_assets->connect_me = &I_Connect_me_62x31_sfw; + xtreme_assets->connected = &I_Connected_62x31_sfw; + xtreme_assets->dolphin_common = &I_DolphinCommon_56x48_sfw; + xtreme_assets->dolphin_cry = &I_Cry_dolph_55x52_sfw; + xtreme_assets->dolphin_mafia = &I_DolphinMafia_115x62_sfw; + xtreme_assets->dolphin_nice = &I_DolphinNice_96x59_sfw; + xtreme_assets->dolphin_wait = &I_DolphinWait_61x59_sfw; + xtreme_assets->error = &I_Error_62x31_sfw; + xtreme_assets->ibutton_success = &I_iButtonDolphinVerySuccess_108x52_sfw; + xtreme_assets->ir_success = &I_DolphinReadingSuccess_59x63_sfw; + xtreme_assets->nfc_emulation = &I_NFC_dolphin_emulation_47x61_sfw; + xtreme_assets->rfid_receive = &I_RFIDDolphinReceive_97x61_sfw; + xtreme_assets->rfid_send = &I_RFIDDolphinSend_97x61_sfw; + xtreme_assets->rfid_success = &I_RFIDDolphinSuccess_108x57_sfw; + xtreme_assets->subghz_scanning = &I_Scanning_123x52_sfw; + + xtreme_assets->passport_angry = &I_passport_bad1_46x49_sfw; + xtreme_assets->passport_background = &I_passport_DB_sfw; + xtreme_assets->passport_happy = &I_passport_happy1_46x49_sfw; + xtreme_assets->passport_okay = &I_passport_okay1_46x49_sfw; } else { - xtreme_assets->passport_happy = &I_flipper; - xtreme_assets->passport_okay = &I_flipper; - xtreme_assets->passport_angry = &I_flipper; + xtreme_assets->authenticate = &I_Auth_62x31; + xtreme_assets->bt_pairing = &I_BLE_Pairing_128x64; + xtreme_assets->connect_me = &I_Connect_me_62x31; + xtreme_assets->connected = &I_Connected_62x31; + xtreme_assets->dolphin_common = &I_DolphinCommon_56x48; + xtreme_assets->dolphin_cry = &I_Cry_dolph_55x52; + xtreme_assets->dolphin_mafia = &I_DolphinMafia_115x62; + xtreme_assets->dolphin_nice = &I_DolphinNice_96x59; + xtreme_assets->dolphin_wait = &I_DolphinWait_61x59; + xtreme_assets->error = &I_Error_62x31; + xtreme_assets->ibutton_success = &I_iButtonDolphinVerySuccess_108x52; + xtreme_assets->ir_success = &I_DolphinReadingSuccess_59x63; + xtreme_assets->nfc_emulation = &I_NFC_dolphin_emulation_47x61; + xtreme_assets->rfid_receive = &I_RFIDDolphinReceive_97x61; + xtreme_assets->rfid_send = &I_RFIDDolphinSend_97x61; + xtreme_assets->rfid_success = &I_RFIDDolphinSuccess_108x57; + xtreme_assets->subghz_scanning = &I_Scanning_123x52; + + xtreme_assets->passport_angry = &I_flipper; + xtreme_assets->passport_background = &I_passport_DB; + xtreme_assets->passport_happy = &I_flipper; + xtreme_assets->passport_okay = &I_flipper; } for (int i = 0; i < XTREME_ASSETS_COUNT; i++) { @@ -44,9 +82,28 @@ void XTREME_ASSETS_UPDATE() { File* file = storage_file_alloc(storage); int i = 0; - swap_bmx_icon(&xtreme_assets->passport_happy, pack, "Passport/happy.bmx", path, file, i++); - swap_bmx_icon(&xtreme_assets->passport_okay, pack, "Passport/okay.bmx", path, file, i++); - swap_bmx_icon(&xtreme_assets->passport_angry, pack, "Passport/angry.bmx", path, file, i++); + swap_bmx_icon(&xtreme_assets->authenticate, pack, "Icons/authenticate.bmx", path, file, i++); + swap_bmx_icon(&xtreme_assets->bt_pairing, pack, "Icons/bt_pairing.bmx", path, file, i++); + swap_bmx_icon(&xtreme_assets->connect_me, pack, "Icons/connect_me.bmx", path, file, i++); + swap_bmx_icon(&xtreme_assets->connected, pack, "Icons/connected.bmx", path, file, i++); + swap_bmx_icon(&xtreme_assets->dolphin_common, pack, "Icons/dolphin_common.bmx", path, file, i++); + swap_bmx_icon(&xtreme_assets->dolphin_cry, pack, "Icons/dolphin_cry.bmx", path, file, i++); + swap_bmx_icon(&xtreme_assets->dolphin_mafia, pack, "Icons/dolphin_mafia.bmx", path, file, i++); + swap_bmx_icon(&xtreme_assets->dolphin_nice, pack, "Icons/dolphin_nice.bmx", path, file, i++); + swap_bmx_icon(&xtreme_assets->dolphin_wait, pack, "Icons/dolphin_wait.bmx", path, file, i++); + swap_bmx_icon(&xtreme_assets->error, pack, "Icons/error.bmx", path, file, i++); + swap_bmx_icon(&xtreme_assets->ibutton_success, pack, "Icons/ibutton_success.bmx", path, file, i++); + swap_bmx_icon(&xtreme_assets->ir_success, pack, "Icons/ir_success.bmx", path, file, i++); + swap_bmx_icon(&xtreme_assets->nfc_emulation, pack, "Icons/nfc_emulation.bmx", path, file, i++); + swap_bmx_icon(&xtreme_assets->rfid_receive, pack, "Icons/rfid_receive.bmx", path, file, i++); + swap_bmx_icon(&xtreme_assets->rfid_send, pack, "Icons/rfid_send.bmx", path, file, i++); + swap_bmx_icon(&xtreme_assets->rfid_success, pack, "Icons/rfid_success.bmx", path, file, i++); + swap_bmx_icon(&xtreme_assets->subghz_scanning, pack, "Icons/subghz_scanning.bmx", path, file, i++); + + swap_bmx_icon(&xtreme_assets->passport_angry, pack, "Passport/angry.bmx", path, file, i++); + swap_bmx_icon(&xtreme_assets->passport_background, pack, "Passport/background.bmx", path, file, i++); + swap_bmx_icon(&xtreme_assets->passport_happy, pack, "Passport/happy.bmx", path, file, i++); + swap_bmx_icon(&xtreme_assets->passport_okay, pack, "Passport/okay.bmx", path, file, i++); storage_file_free(file); } @@ -57,6 +114,10 @@ void XTREME_ASSETS_UPDATE() { void swap_bmx_icon(const Icon** replace, const char* base, const char* name, FuriString* path, File* file, int i) { loaded_icons[i] = NULL; path_concat(base, name, path); + FURI_LOG_E( + "XtremeAssets", + "Loading \'%s\'", + furi_string_get_cstr(path)); if (storage_file_open(file, furi_string_get_cstr(path), FSAM_READ, FSOM_OPEN_EXISTING)) { uint64_t size = storage_file_size(file) - 8; int32_t width, height; diff --git a/applications/settings/xtreme_settings/xtreme_assets.h b/applications/settings/xtreme_settings/xtreme_assets.h index 002500bac..ec8c03f53 100644 --- a/applications/settings/xtreme_settings/xtreme_assets.h +++ b/applications/settings/xtreme_settings/xtreme_assets.h @@ -7,9 +7,28 @@ #define PACKS_DIR EXT_PATH("dolphin_custom") typedef struct { + const Icon* authenticate; + const Icon* bt_pairing; + const Icon* connect_me; + const Icon* connected; + const Icon* dolphin_common; + const Icon* dolphin_cry; + const Icon* dolphin_mafia; + const Icon* dolphin_nice; + const Icon* dolphin_wait; + const Icon* error; + const Icon* ibutton_success; + const Icon* ir_success; + const Icon* nfc_emulation; + const Icon* rfid_receive; + const Icon* rfid_send; + const Icon* rfid_success; + const Icon* subghz_scanning; + + const Icon* passport_angry; + const Icon* passport_background; const Icon* passport_happy; const Icon* passport_okay; - const Icon* passport_angry; } XtremeAssets; XtremeAssets* XTREME_ASSETS(); diff --git a/assets/dolphin/custom/WatchDogs/Icons/nfc_emulation.png b/assets/dolphin/custom/WatchDogs/Icons/nfc_emulation.png new file mode 100644 index 000000000..7df750e84 Binary files /dev/null and b/assets/dolphin/custom/WatchDogs/Icons/nfc_emulation.png differ diff --git a/assets/dolphin/custom/WatchDogs/Icons/rfid_receive.png b/assets/dolphin/custom/WatchDogs/Icons/rfid_receive.png new file mode 100644 index 000000000..7e25d8e20 Binary files /dev/null and b/assets/dolphin/custom/WatchDogs/Icons/rfid_receive.png differ diff --git a/assets/dolphin/custom/WatchDogs/Icons/rfid_send.png b/assets/dolphin/custom/WatchDogs/Icons/rfid_send.png new file mode 100644 index 000000000..0639f4996 Binary files /dev/null and b/assets/dolphin/custom/WatchDogs/Icons/rfid_send.png differ diff --git a/assets/dolphin/custom/WatchDogs/Icons/rfid_success.png b/assets/dolphin/custom/WatchDogs/Icons/rfid_success.png new file mode 100644 index 000000000..8954004e0 Binary files /dev/null and b/assets/dolphin/custom/WatchDogs/Icons/rfid_success.png differ diff --git a/assets/dolphin/custom/WatchDogs/Icons/subghz_scanning.png b/assets/dolphin/custom/WatchDogs/Icons/subghz_scanning.png new file mode 100644 index 000000000..fd6762e65 Binary files /dev/null and b/assets/dolphin/custom/WatchDogs/Icons/subghz_scanning.png differ diff --git a/assets/resources/dolphin_custom/WatchDogs/Icons/nfc_emulation.png b/assets/resources/dolphin_custom/WatchDogs/Icons/nfc_emulation.png new file mode 100644 index 000000000..3b5661bfc Binary files /dev/null and b/assets/resources/dolphin_custom/WatchDogs/Icons/nfc_emulation.png differ diff --git a/assets/resources/dolphin_custom/WatchDogs/Icons/rfid_receive.png b/assets/resources/dolphin_custom/WatchDogs/Icons/rfid_receive.png new file mode 100644 index 000000000..51446057a Binary files /dev/null and b/assets/resources/dolphin_custom/WatchDogs/Icons/rfid_receive.png differ diff --git a/assets/resources/dolphin_custom/WatchDogs/Icons/rfid_send.png b/assets/resources/dolphin_custom/WatchDogs/Icons/rfid_send.png new file mode 100644 index 000000000..51446057a Binary files /dev/null and b/assets/resources/dolphin_custom/WatchDogs/Icons/rfid_send.png differ diff --git a/assets/resources/dolphin_custom/WatchDogs/Icons/rfid_success.png b/assets/resources/dolphin_custom/WatchDogs/Icons/rfid_success.png new file mode 100644 index 000000000..14f6efc32 Binary files /dev/null and b/assets/resources/dolphin_custom/WatchDogs/Icons/rfid_success.png differ diff --git a/assets/resources/dolphin_custom/WatchDogs/Icons/subghz_scanning.png b/assets/resources/dolphin_custom/WatchDogs/Icons/subghz_scanning.png new file mode 100644 index 000000000..7c576cb7b Binary files /dev/null and b/assets/resources/dolphin_custom/WatchDogs/Icons/subghz_scanning.png differ