Revert asset packs to OFW copium naming scheme

This commit is contained in:
Willy-JL
2023-01-24 11:44:42 +00:00
parent 211388733f
commit 45a0a1104d
47 changed files with 146 additions and 154 deletions

View File

@@ -10,7 +10,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()->dolphin_mafia);
popup_set_icon(popup, 0, 2, XTREME_ASSETS()->I_DolphinMafia_115x62);
popup_set_header(popup, "Deleted", 83, 19, AlignLeft, AlignBottom);
popup_set_callback(popup, ibutton_scene_delete_success_popup_callback);

View File

@@ -15,7 +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);
popup_set_icon(popup, 0, 5, XTREME_ASSETS()->dolphin_wait);
popup_set_icon(popup, 0, 5, XTREME_ASSETS()->I_DolphinWait_61x59);
view_dispatcher_switch_to_view(ibutton->view_dispatcher, iButtonViewPopup);
furi_string_set(ibutton->file_path, IBUTTON_APP_FOLDER);

View File

@@ -10,7 +10,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()->dolphin_nice);
popup_set_icon(popup, 32, 5, XTREME_ASSETS()->I_DolphinNice_96x59);
popup_set_header(popup, "Saved!", 5, 7, AlignLeft, AlignTop);
popup_set_callback(popup, ibutton_scene_save_success_popup_callback);

View File

@@ -11,7 +11,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()->ibutton_success);
popup_set_icon(popup, 0, 12, XTREME_ASSETS()->I_iButtonDolphinVerySuccess_108x52);
popup_set_text(popup, "Successfully written!", 40, 12, AlignLeft, AlignBottom);
popup_set_callback(popup, ibutton_scene_write_success_popup_callback);

View File

@@ -5,7 +5,7 @@ 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()->dolphin_nice);
popup_set_icon(popup, 32, 5, XTREME_ASSETS()->I_DolphinNice_96x59);
popup_set_header(popup, "Saved!", 5, 7, AlignLeft, AlignTop);
popup_set_callback(popup, infrared_popup_closed_callback);

View File

@@ -5,7 +5,7 @@ void infrared_scene_learn_done_on_enter(void* context) {
Infrared* infrared = context;
Popup* popup = infrared->popup;
popup_set_icon(popup, 32, 5, XTREME_ASSETS()->dolphin_nice);
popup_set_icon(popup, 32, 5, XTREME_ASSETS()->I_DolphinNice_96x59);
if(infrared->app_state.is_learning_new_remote) {
popup_set_header(popup, "New remote\ncreated!", 0, 0, AlignLeft, AlignTop);
} else {

View File

@@ -48,7 +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");
dialog_ex_set_icon(dialog_ex, 0, 1, XTREME_ASSETS()->ir_success);
dialog_ex_set_icon(dialog_ex, 0, 1, XTREME_ASSETS()->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);

View File

@@ -43,7 +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);
popup_set_icon(popup, 0, 3, XTREME_ASSETS()->rfid_send);
popup_set_icon(popup, 0, 3, XTREME_ASSETS()->I_RFIDDolphinSend_97x61);
popup_set_text(popup, curr_buf, 90, 56, AlignCenter, AlignCenter);
notification_message(app->notifications, &sequence_blink_start_magenta);
@@ -71,7 +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);
popup_set_icon(popup, 0, 7, XTREME_ASSETS()->rfid_success);
popup_set_icon(popup, 0, 7, XTREME_ASSETS()->I_RFIDDolphinSuccess_108x57);
popup_set_context(popup, app);
popup_set_callback(popup, lfrfid_popup_timeout_callback);
popup_set_timeout(popup, 1500);

View File

@@ -5,7 +5,7 @@ void lfrfid_scene_delete_success_on_enter(void* context) {
LfRfid* app = context;
Popup* popup = app->popup;
popup_set_icon(popup, 0, 2, XTREME_ASSETS()->dolphin_mafia);
popup_set_icon(popup, 0, 2, XTREME_ASSETS()->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);

View File

@@ -17,7 +17,7 @@ void lfrfid_scene_emulate_on_enter(void* context) {
AlignCenter,
AlignTop);
}
popup_set_icon(popup, 0, 3, XTREME_ASSETS()->rfid_send);
popup_set_icon(popup, 0, 3, XTREME_ASSETS()->I_RFIDDolphinSend_97x61);
lfrfid_worker_start_thread(app->lfworker);
lfrfid_worker_emulate_start(app->lfworker, (LFRFIDProtocol)app->protocol_id);

View File

@@ -33,7 +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();
popup_set_icon(popup, 0, 3, XTREME_ASSETS()->rfid_receive);
popup_set_icon(popup, 0, 3, XTREME_ASSETS()->I_RFIDDolphinReceive_97x61);
view_dispatcher_switch_to_view(app->view_dispatcher, LfRfidViewPopup);
lfrfid_worker_start_thread(app->lfworker);
lfrfid_make_app_folder(app);

View File

@@ -7,7 +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);
popup_set_icon(popup, 0, 12, XTREME_ASSETS()->rfid_send);
popup_set_icon(popup, 0, 12, XTREME_ASSETS()->I_RFIDDolphinSend_97x61);
view_dispatcher_switch_to_view(app->view_dispatcher, LfRfidViewPopup);

View File

@@ -7,7 +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);
popup_set_icon(popup, 32, 5, XTREME_ASSETS()->dolphin_nice);
popup_set_icon(popup, 32, 5, XTREME_ASSETS()->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);

View File

@@ -34,7 +34,7 @@ void lfrfid_scene_write_on_enter(void* context) {
AlignCenter,
AlignTop);
}
popup_set_icon(popup, 0, 3, XTREME_ASSETS()->rfid_send);
popup_set_icon(popup, 0, 3, XTREME_ASSETS()->I_RFIDDolphinSend_97x61);
view_dispatcher_switch_to_view(app->view_dispatcher, LfRfidViewPopup);

View File

@@ -6,7 +6,7 @@ void lfrfid_scene_write_success_on_enter(void* context) {
Popup* popup = app->popup;
popup_set_header(popup, "Successfully\nwritten!", 94, 3, AlignCenter, AlignTop);
popup_set_icon(popup, 0, 6, XTREME_ASSETS()->rfid_success);
popup_set_icon(popup, 0, 6, XTREME_ASSETS()->I_RFIDDolphinSuccess_108x57);
popup_set_context(popup, app);
popup_set_callback(popup, lfrfid_popup_timeout_callback);
popup_set_timeout(popup, 1500);

View File

@@ -11,7 +11,7 @@ void nfc_scene_delete_success_on_enter(void* context) {
// Setup view
Popup* popup = nfc->popup;
popup_set_icon(popup, 0, 2, XTREME_ASSETS()->dolphin_mafia);
popup_set_icon(popup, 0, 2, XTREME_ASSETS()->I_DolphinMafia_115x62);
popup_set_header(popup, "Deleted", 83, 19, AlignLeft, AlignBottom);
popup_set_timeout(popup, 1500);
popup_set_context(popup, nfc);

View File

@@ -38,7 +38,7 @@ static void nfc_scene_emulate_nfcv_widget_config(Nfc* nfc, bool data_received) {
FuriString* info_str;
info_str = furi_string_alloc();
widget_add_icon_element(widget, 0, 3, XTREME_ASSETS()->rfid_send);
widget_add_icon_element(widget, 0, 3, XTREME_ASSETS()->I_RFIDDolphinSend_97x61);
widget_add_string_element(
widget, 89, 32, AlignCenter, AlignTop, FontPrimary, "Emulating NfcV");

View File

@@ -38,7 +38,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()->nfc_emulation);
widget_add_icon_element(widget, 0, 3, XTREME_ASSETS()->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);

View File

@@ -24,7 +24,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()->nfc_emulation);
popup_set_icon(popup, 0, 3, XTREME_ASSETS()->I_NFC_dolphin_emulation_47x61);
popup_set_text(popup, nfc->text_store, 90, 28, AlignCenter, AlignTop);
// Setup and start worker

View File

@@ -14,7 +14,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()->dolphin_nice);
popup_set_icon(popup, 32, 5, XTREME_ASSETS()->I_DolphinNice_96x59);
popup_set_header(popup, "Updated!", 11, 20, AlignLeft, AlignBottom);
popup_set_timeout(popup, 1500);
popup_set_context(popup, nfc);

View File

@@ -14,7 +14,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()->dolphin_nice);
popup_set_icon(popup, 32, 5, XTREME_ASSETS()->I_DolphinNice_96x59);
popup_set_header(popup, "Successfully\nwritten", 13, 22, AlignLeft, AlignBottom);
popup_set_timeout(popup, 1500);
popup_set_context(popup, nfc);

View File

@@ -66,7 +66,7 @@ void nfc_scene_mf_ultralight_emulate_widget_config(Nfc* nfc, bool auth_attempted
FuriString* info_str;
info_str = furi_string_alloc();
widget_add_icon_element(widget, 0, 3, XTREME_ASSETS()->nfc_emulation);
widget_add_icon_element(widget, 0, 3, XTREME_ASSETS()->I_NFC_dolphin_emulation_47x61);
if(strcmp(nfc->dev->dev_name, "")) {
furi_string_printf(info_str, "Emulating\n%s", nfc->dev->dev_name);
@@ -113,7 +113,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()->nfc_emulation);
popup_set_icon(popup, 0, 3, XTREME_ASSETS()->I_NFC_dolphin_emulation_47x61);
popup_set_text(popup, nfc->text_store, 90, 28, AlignCenter, AlignTop);
// Set Widget state and view

View File

@@ -11,7 +11,7 @@ void nfc_scene_restore_original_on_enter(void* context) {
// Setup view
Popup* popup = nfc->popup;
popup_set_icon(popup, 32, 5, XTREME_ASSETS()->dolphin_nice);
popup_set_icon(popup, 32, 5, XTREME_ASSETS()->I_DolphinNice_96x59);
popup_set_header(popup, "Original file\nrestored", 13, 22, AlignLeft, AlignBottom);
popup_set_timeout(popup, 1500);
popup_set_context(popup, nfc);

View File

@@ -8,7 +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);
popup_set_icon(popup, 0, 12, XTREME_ASSETS()->nfc_emulation);
popup_set_icon(popup, 0, 12, XTREME_ASSETS()->I_NFC_dolphin_emulation_47x61);
view_dispatcher_switch_to_view(nfc->view_dispatcher, NfcViewPopup);

View File

@@ -11,7 +11,7 @@ void nfc_scene_save_success_on_enter(void* context) {
// Setup view
Popup* popup = nfc->popup;
popup_set_icon(popup, 32, 5, XTREME_ASSETS()->dolphin_nice);
popup_set_icon(popup, 32, 5, XTREME_ASSETS()->I_DolphinNice_96x59);
popup_set_header(popup, "Saved!", 13, 22, AlignLeft, AlignBottom);
popup_set_timeout(popup, 1500);
popup_set_context(popup, nfc);

View File

@@ -13,7 +13,7 @@ void subghz_scene_delete_success_on_enter(void* context) {
// Setup view
Popup* popup = subghz->popup;
popup_set_icon(popup, 0, 2, XTREME_ASSETS()->dolphin_mafia);
popup_set_icon(popup, 0, 2, XTREME_ASSETS()->I_DolphinMafia_115x62);
popup_set_header(popup, "Deleted", 83, 19, AlignLeft, AlignBottom);
popup_set_timeout(popup, 1500);
popup_set_context(popup, subghz);

View File

@@ -14,7 +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);
popup_set_icon(popup, 0, 12, XTREME_ASSETS()->rfid_send);
popup_set_icon(popup, 0, 12, XTREME_ASSETS()->I_RFIDDolphinSend_97x61);
view_dispatcher_switch_to_view(subghz->view_dispatcher, SubGhzViewIdPopup);

View File

@@ -12,7 +12,7 @@ void subghz_scene_save_success_on_enter(void* context) {
// Setup view
Popup* popup = subghz->popup;
popup_set_icon(popup, 32, 5, XTREME_ASSETS()->dolphin_nice);
popup_set_icon(popup, 32, 5, XTREME_ASSETS()->I_DolphinNice_96x59);
popup_set_header(popup, "Saved!", 13, 22, AlignLeft, AlignBottom);
popup_set_timeout(popup, 1500);
popup_set_context(popup, subghz);

View File

@@ -232,13 +232,13 @@ void subghz_view_receiver_draw(Canvas* canvas, SubGhzViewReceiverModel* model) {
if(model->history_item == 0) {
if(model->mode == SubGhzViewReceiverModeLive) {
canvas_draw_icon(canvas, 0, 0, XTREME_ASSETS()->subghz_scanning);
canvas_draw_icon(canvas, 0, 0, XTREME_ASSETS()->I_Scanning_123x52);
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 {
canvas_draw_icon(canvas, 0, 0, XTREME_ASSETS()->subghz_scanning);
canvas_draw_icon(canvas, 0, 0, XTREME_ASSETS()->I_Scanning_123x52);
canvas_set_font(canvas, FontPrimary);
canvas_draw_str(canvas, 63, 46, "Decoding...");
canvas_set_font(canvas, FontSecondary);

View File

@@ -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()->connect_me);
canvas_draw_icon(canvas, 22, 15, XTREME_ASSETS()->I_Connect_me_62x31);
if(XTREME_SETTINGS()->nsfw_mode) {
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()->connected);
canvas_draw_icon(canvas, 22, 15, XTREME_ASSETS()->I_Connected_62x31);
canvas_draw_str_aligned(canvas, 128 / 2, 3, AlignCenter, AlignTop, "Connected!");
} else if(model->display_msg == U2fMsgRegister) {
if(XTREME_SETTINGS()->nsfw_mode) {
elements_button_center(canvas, "CUM");
canvas_draw_icon(canvas, 22, 15, XTREME_ASSETS()->authenticate);
canvas_draw_icon(canvas, 22, 15, XTREME_ASSETS()->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()->authenticate);
canvas_draw_icon(canvas, 22, 15, XTREME_ASSETS()->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_SETTINGS()->nsfw_mode) {
elements_button_center(canvas, "CUM");
canvas_draw_icon(canvas, 22, 15, XTREME_ASSETS()->authenticate);
canvas_draw_icon(canvas, 22, 15, XTREME_ASSETS()->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()->authenticate);
canvas_draw_icon(canvas, 22, 15, XTREME_ASSETS()->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()->connected);
canvas_draw_icon(canvas, 22, 15, XTREME_ASSETS()->I_Connected_62x31);
if(XTREME_SETTINGS()->nsfw_mode) {
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()->error);
canvas_draw_icon(canvas, 22, 15, XTREME_ASSETS()->I_Error_62x31);
if(XTREME_SETTINGS()->nsfw_mode) {
canvas_draw_str_aligned(canvas, 128 / 2, 3, AlignCenter, AlignTop, "Unable to cum");
} else {

View File

@@ -36,7 +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];
canvas_draw_icon(canvas, 0, 0, XTREME_ASSETS()->bt_pairing);
canvas_draw_icon(canvas, 0, 0, XTREME_ASSETS()->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");
@@ -79,7 +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;
dialog_message_set_icon(bt->dialog_message, XTREME_ASSETS()->bt_pairing, 0, 0);
dialog_message_set_icon(bt->dialog_message, XTREME_ASSETS()->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);

View File

@@ -11,7 +11,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()->dolphin_nice);
popup_set_icon(popup, 32, 5, XTREME_ASSETS()->I_DolphinNice_96x59);
popup_set_header(popup, "Done", 14, 15, AlignLeft, AlignTop);
popup_set_timeout(popup, 1500);
popup_set_context(popup, app);

View File

@@ -25,7 +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);
popup_set_icon(app->popup, 0, 2, XTREME_ASSETS()->dolphin_mafia);
popup_set_icon(app->popup, 0, 2, XTREME_ASSETS()->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);

View File

@@ -42,24 +42,24 @@ static void render_callback(Canvas* canvas, void* _ctx) {
if(XTREME_SETTINGS()->nsfw_mode) {
if(stats->butthurt <= 4) {
portrait = xtreme_assets->passport_happy;
portrait = xtreme_assets->I_passport_happy_46x49;
mood_str = "Status: Wet";
} else if(stats->butthurt <= 9) {
portrait = xtreme_assets->passport_okay;
portrait = xtreme_assets->I_passport_okay_46x49;
mood_str = "Status: Horny";
} else {
portrait = xtreme_assets->passport_angry;
portrait = xtreme_assets->I_passport_bad_46x49;
mood_str = "Status: Desperate";
}
} else {
if(stats->butthurt <= 4) {
portrait = xtreme_assets->passport_happy;
portrait = xtreme_assets->I_passport_happy_46x49;
mood_str = "Mood: Happy";
} else if(stats->butthurt <= 9) {
portrait = xtreme_assets->passport_okay;
portrait = xtreme_assets->I_passport_okay_46x49;
mood_str = "Mood: Okay";
} else {
portrait = xtreme_assets->passport_angry;
portrait = xtreme_assets->I_passport_bad_46x49;
mood_str = "Mood: Angry";
}
}
@@ -81,7 +81,7 @@ static void render_callback(Canvas* canvas, void* _ctx) {
}
// multipass
canvas_draw_icon(canvas, 0, 0, xtreme_assets->passport_background);
canvas_draw_icon(canvas, 0, 0, xtreme_assets->I_passport_DB);
// portrait
furi_assert((stats->level > 0) && (stats->level <= DOLPHIN_LEVEL_COUNT + 1));

View File

@@ -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()->dolphin_cry);
dialog_ex_set_icon(dialog, 21, 13, XTREME_ASSETS()->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);

View File

@@ -14,7 +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");
dialog_ex_set_icon(dialog_ex, 72, 17, XTREME_ASSETS()->dolphin_common);
dialog_ex_set_icon(dialog_ex, 72, 17, XTREME_ASSETS()->I_DolphinCommon_56x48);
if(error == FSE_OK) {
dialog_ex_set_header(dialog_ex, "SD Card Unmounted", 64, 3, AlignCenter, AlignTop);

View File

@@ -18,51 +18,49 @@ void XTREME_ASSETS_LOAD() {
XtremeSettings* xtreme_settings = XTREME_SETTINGS();
if (xtreme_settings->nsfw_mode) {
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;
xtreme_assets->I_BLE_Pairing_128x64 = &I_BLE_Pairing_128x64;
xtreme_assets->I_DolphinCommon_56x48 = &I_DolphinCommon_56x48;
xtreme_assets->I_DolphinMafia_115x62 = &I_DolphinMafia_115x62;
xtreme_assets->I_DolphinNice_96x59 = &I_DolphinNice_96x59;
xtreme_assets->I_DolphinWait_61x59 = &I_DolphinWait_61x59;
xtreme_assets->I_iButtonDolphinVerySuccess_108x52 = &I_iButtonDolphinVerySuccess_108x52;
xtreme_assets->I_DolphinReadingSuccess_59x63 = &I_DolphinReadingSuccess_59x63;
xtreme_assets->I_NFC_dolphin_emulation_47x61 = &I_NFC_dolphin_emulation_47x61;
xtreme_assets->I_passport_bad_46x49 = &I_flipper;
xtreme_assets->I_passport_DB = &I_passport_DB;
xtreme_assets->I_passport_happy_46x49 = &I_flipper;
xtreme_assets->I_passport_okay_46x49 = &I_flipper;
xtreme_assets->I_RFIDDolphinReceive_97x61 = &I_RFIDDolphinReceive_97x61;
xtreme_assets->I_RFIDDolphinSend_97x61 = &I_RFIDDolphinSend_97x61;
xtreme_assets->I_RFIDDolphinSuccess_108x57 = &I_RFIDDolphinSuccess_108x57;
xtreme_assets->I_Cry_dolph_55x52 = &I_Cry_dolph_55x52;
xtreme_assets->I_Scanning_123x52 = &I_Scanning_123x52;
xtreme_assets->I_Auth_62x31 = &I_Auth_62x31;
xtreme_assets->I_Connect_me_62x31 = &I_Connect_me_62x31;
xtreme_assets->I_Connected_62x31 = &I_Connected_62x31;
xtreme_assets->I_Error_62x31 = &I_Error_62x31;
} else {
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;
xtreme_assets->I_BLE_Pairing_128x64 = &I_BLE_Pairing_128x64_sfw;
xtreme_assets->I_DolphinCommon_56x48 = &I_DolphinCommon_56x48_sfw;
xtreme_assets->I_DolphinMafia_115x62 = &I_DolphinMafia_115x62_sfw;
xtreme_assets->I_DolphinNice_96x59 = &I_DolphinNice_96x59_sfw;
xtreme_assets->I_DolphinWait_61x59 = &I_DolphinWait_61x59_sfw;
xtreme_assets->I_iButtonDolphinVerySuccess_108x52 = &I_iButtonDolphinVerySuccess_108x52_sfw;
xtreme_assets->I_DolphinReadingSuccess_59x63 = &I_DolphinReadingSuccess_59x63_sfw;
xtreme_assets->I_NFC_dolphin_emulation_47x61 = &I_NFC_dolphin_emulation_47x61_sfw;
xtreme_assets->I_passport_bad_46x49 = &I_passport_bad1_46x49_sfw;
xtreme_assets->I_passport_DB = &I_passport_DB_sfw;
xtreme_assets->I_passport_happy_46x49 = &I_passport_happy1_46x49_sfw;
xtreme_assets->I_passport_okay_46x49 = &I_passport_okay1_46x49_sfw;
xtreme_assets->I_RFIDDolphinReceive_97x61 = &I_RFIDDolphinReceive_97x61_sfw;
xtreme_assets->I_RFIDDolphinSend_97x61 = &I_RFIDDolphinSend_97x61_sfw;
xtreme_assets->I_RFIDDolphinSuccess_108x57 = &I_RFIDDolphinSuccess_108x57_sfw;
xtreme_assets->I_Cry_dolph_55x52 = &I_Cry_dolph_55x52_sfw;
xtreme_assets->I_Scanning_123x52 = &I_Scanning_123x52_sfw;
xtreme_assets->I_Auth_62x31 = &I_Auth_62x31_sfw;
xtreme_assets->I_Connect_me_62x31 = &I_Connect_me_62x31_sfw;
xtreme_assets->I_Connected_62x31 = &I_Connected_62x31_sfw;
xtreme_assets->I_Error_62x31 = &I_Error_62x31_sfw;
}
if (xtreme_settings->asset_pack[0] == '\0') return;
@@ -74,28 +72,27 @@ void XTREME_ASSETS_LOAD() {
if (storage_common_stat(storage, furi_string_get_cstr(path), &info) == FSE_OK && info.flags & FSF_DIRECTORY) {
File* file = storage_file_alloc(storage);
swap_bmx_icon(&xtreme_assets->authenticate, pack, "Icons/authenticate.bmx", path, file);
swap_bmx_icon(&xtreme_assets->bt_pairing, pack, "Icons/bt_pairing.bmx", path, file);
swap_bmx_icon(&xtreme_assets->connect_me, pack, "Icons/connect_me.bmx", path, file);
swap_bmx_icon(&xtreme_assets->connected, pack, "Icons/connected.bmx", path, file);
swap_bmx_icon(&xtreme_assets->dolphin_common, pack, "Icons/dolphin_common.bmx", path, file);
swap_bmx_icon(&xtreme_assets->dolphin_cry, pack, "Icons/dolphin_cry.bmx", path, file);
swap_bmx_icon(&xtreme_assets->dolphin_mafia, pack, "Icons/dolphin_mafia.bmx", path, file);
swap_bmx_icon(&xtreme_assets->dolphin_nice, pack, "Icons/dolphin_nice.bmx", path, file);
swap_bmx_icon(&xtreme_assets->dolphin_wait, pack, "Icons/dolphin_wait.bmx", path, file);
swap_bmx_icon(&xtreme_assets->error, pack, "Icons/error.bmx", path, file);
swap_bmx_icon(&xtreme_assets->ibutton_success, pack, "Icons/ibutton_success.bmx", path, file);
swap_bmx_icon(&xtreme_assets->ir_success, pack, "Icons/ir_success.bmx", path, file);
swap_bmx_icon(&xtreme_assets->nfc_emulation, pack, "Icons/nfc_emulation.bmx", path, file);
swap_bmx_icon(&xtreme_assets->rfid_receive, pack, "Icons/rfid_receive.bmx", path, file);
swap_bmx_icon(&xtreme_assets->rfid_send, pack, "Icons/rfid_send.bmx", path, file);
swap_bmx_icon(&xtreme_assets->rfid_success, pack, "Icons/rfid_success.bmx", path, file);
swap_bmx_icon(&xtreme_assets->subghz_scanning, pack, "Icons/subghz_scanning.bmx", path, file);
swap_bmx_icon(&xtreme_assets->passport_angry, pack, "Passport/angry.bmx", path, file);
swap_bmx_icon(&xtreme_assets->passport_background, pack, "Passport/background.bmx", path, file);
swap_bmx_icon(&xtreme_assets->passport_happy, pack, "Passport/happy.bmx", path, file);
swap_bmx_icon(&xtreme_assets->passport_okay, pack, "Passport/okay.bmx", path, file);
swap_bmx_icon(&xtreme_assets->I_BLE_Pairing_128x64, pack, "BLE/BLE_Pairing_128x64.bmx", path, file);
swap_bmx_icon(&xtreme_assets->I_DolphinCommon_56x48, pack, "Dolphin/DolphinCommon_56x48.bmx", path, file);
swap_bmx_icon(&xtreme_assets->I_DolphinMafia_115x62, pack, "iButton/DolphinMafia_115x62.bmx", path, file);
swap_bmx_icon(&xtreme_assets->I_DolphinNice_96x59, pack, "iButton/DolphinNice_96x59.bmx", path, file);
swap_bmx_icon(&xtreme_assets->I_DolphinWait_61x59, pack, "iButton/DolphinWait_61x59.bmx", path, file);
swap_bmx_icon(&xtreme_assets->I_iButtonDolphinVerySuccess_108x52, pack, "iButton/iButtonDolphinVerySuccess_108x52.bmx", path, file);
swap_bmx_icon(&xtreme_assets->I_DolphinReadingSuccess_59x63, pack, "Infrared/DolphinReadingSuccess_59x63.bmx", path, file);
swap_bmx_icon(&xtreme_assets->I_NFC_dolphin_emulation_47x61, pack, "NFC/NFC_dolphin_emulation_47x61.bmx", path, file);
swap_bmx_icon(&xtreme_assets->I_passport_bad_46x49, pack, "Passport/passport_bad_46x49.bmx", path, file);
swap_bmx_icon(&xtreme_assets->I_passport_DB, pack, "Passport/passport_DB.bmx", path, file);
swap_bmx_icon(&xtreme_assets->I_passport_happy_46x49, pack, "Passport/passport_happy_46x49.bmx", path, file);
swap_bmx_icon(&xtreme_assets->I_passport_okay_46x49, pack, "Passport/passport_okay_46x49.bmx", path, file);
swap_bmx_icon(&xtreme_assets->I_RFIDDolphinReceive_97x61, pack, "RFID/RFIDDolphinReceive_97x61.bmx", path, file);
swap_bmx_icon(&xtreme_assets->I_RFIDDolphinSend_97x61, pack, "RFID/RFIDDolphinSend_97x61.bmx", path, file);
swap_bmx_icon(&xtreme_assets->I_RFIDDolphinSuccess_108x57, pack, "RFID/RFIDDolphinSuccess_108x57.bmx", path, file);
swap_bmx_icon(&xtreme_assets->I_Cry_dolph_55x52, pack, "Settings/Cry_dolph_55x52.bmx", path, file);
swap_bmx_icon(&xtreme_assets->I_Scanning_123x52, pack, "SubGhz/Scanning_123x52.bmx", path, file);
swap_bmx_icon(&xtreme_assets->I_Auth_62x31, pack, "U2F/Auth_62x31.bmx", path, file);
swap_bmx_icon(&xtreme_assets->I_Connect_me_62x31, pack, "U2F/Connect_me_62x31.bmx", path, file);
swap_bmx_icon(&xtreme_assets->I_Connected_62x31, pack, "U2F/Connected_62x31.bmx", path, file);
swap_bmx_icon(&xtreme_assets->I_Error_62x31, pack, "U2F/Error_62x31.bmx", path, file);
storage_file_free(file);
}
@@ -104,7 +101,7 @@ void XTREME_ASSETS_LOAD() {
}
void swap_bmx_icon(const Icon** replace, const char* pack, const char* name, FuriString* path, File* file) {
furi_string_printf(path, PACKS_DIR "/%s/%s", pack, name);
furi_string_printf(path, PACKS_DIR "/%s/Icons/%s", pack, name);
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;

View File

@@ -7,28 +7,27 @@
#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* I_BLE_Pairing_128x64;
const Icon* I_DolphinCommon_56x48;
const Icon* I_DolphinMafia_115x62;
const Icon* I_DolphinNice_96x59;
const Icon* I_DolphinWait_61x59;
const Icon* I_iButtonDolphinVerySuccess_108x52;
const Icon* I_DolphinReadingSuccess_59x63;
const Icon* I_NFC_dolphin_emulation_47x61;
const Icon* I_passport_bad_46x49;
const Icon* I_passport_DB;
const Icon* I_passport_happy_46x49;
const Icon* I_passport_okay_46x49;
const Icon* I_RFIDDolphinReceive_97x61;
const Icon* I_RFIDDolphinSend_97x61;
const Icon* I_RFIDDolphinSuccess_108x57;
const Icon* I_Cry_dolph_55x52;
const Icon* I_Scanning_123x52;
const Icon* I_Auth_62x31;
const Icon* I_Connect_me_62x31;
const Icon* I_Connected_62x31;
const Icon* I_Error_62x31;
} XtremeAssets;
XtremeAssets* XTREME_ASSETS();

View File

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

View File

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

View File

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

View File

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

View File

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 21 KiB

View File

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 21 KiB

View File

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

View File

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

View File

@@ -65,11 +65,9 @@ def pack(input: "str | pathlib.Path", output: "str | pathlib.Path", logger: typi
pass
packed.mkdir(parents=True, exist_ok=True)
(packed / "Anims").mkdir(parents=True, exist_ok=True)
(packed / "Icons").mkdir(parents=True, exist_ok=True)
(packed / "Passport").mkdir(parents=True, exist_ok=True)
if (source / "Anims/manifest.txt").exists():
(packed / "Anims").mkdir(parents=True, exist_ok=True)
shutil.copyfile(source / "Anims/manifest.txt", packed / "Anims/manifest.txt")
for anim in (source / "Anims").iterdir():
if not anim.is_dir():
@@ -84,16 +82,14 @@ def pack(input: "str | pathlib.Path", output: "str | pathlib.Path", logger: typi
(packed / "Anims" / anim.name / frame.with_suffix(".bm").name).write_bytes(convert_bm(frame))
if (source / "Icons").is_dir():
for icon in (source / "Icons").iterdir():
if not icon.is_file():
for icons in (source / "Icons").iterdir():
if not icons.is_dir():
continue
(packed / "Icons" / icon.with_suffix(".bmx").name).write_bytes(convert_bmx(icon))
if (source / "Passport").is_dir():
for icon in (source / "Passport").iterdir():
if not icon.is_file():
continue
(packed / "Passport" / icon.with_suffix(".bmx").name).write_bytes(convert_bmx(icon))
(packed / "Icons" / icons.name).mkdir(parents=True, exist_ok=True)
for icon in icons.iterdir():
if not icon.is_file():
continue
(packed / "Icons" / icons.name / icon.with_suffix(".bmx").name).write_bytes(convert_bmx(icon))
if __name__ == "__main__":