From f375a60555901d331deb017b9919a3cec6dfbf32 Mon Sep 17 00:00:00 2001 From: VerstreuteSeele Date: Sun, 15 Jan 2023 01:12:25 +0100 Subject: [PATCH] Fix Assets --- .../main/lfrfid/scenes/lfrfid_scene_extra_actions.c | 2 +- .../main/nfc/scenes/nfc_scene_emulate_nfcv.c | 12 +++++++++++- .../nfc/scenes/nfc_scene_mf_ultralight_emulate.c | 11 ++++++++++- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_extra_actions.c b/applications/main/lfrfid/scenes/lfrfid_scene_extra_actions.c index efa319c1e..b1130d191 100644 --- a/applications/main/lfrfid/scenes/lfrfid_scene_extra_actions.c +++ b/applications/main/lfrfid/scenes/lfrfid_scene_extra_actions.c @@ -20,7 +20,7 @@ void lfrfid_scene_extra_actions_on_enter(void* context) { submenu_add_item( submenu, - "Read ASK (FDX,Regular)", + "Read ASK (Animal, FDX)", SubmenuIndexASK, lfrfid_scene_extra_actions_submenu_callback, app); diff --git a/applications/main/nfc/scenes/nfc_scene_emulate_nfcv.c b/applications/main/nfc/scenes/nfc_scene_emulate_nfcv.c index e6fc60d86..d9d3db9da 100644 --- a/applications/main/nfc/scenes/nfc_scene_emulate_nfcv.c +++ b/applications/main/nfc/scenes/nfc_scene_emulate_nfcv.c @@ -1,4 +1,5 @@ #include "../nfc_i.h" +#include "../../../settings/desktop_settings/desktop_settings_app.h" #define NFC_SCENE_EMULATE_NFCV_LOG_SIZE_MAX (100) @@ -37,7 +38,15 @@ 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, &I_RFIDDolphinSend_97x61); + DesktopSettings* settings = malloc(sizeof(DesktopSettings)); + DESKTOP_SETTINGS_LOAD(settings); + + if(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_string_element( widget, 89, 32, AlignCenter, AlignTop, FontPrimary, "Emulating NfcV"); if(strcmp(nfc->dev->dev_name, "")) { @@ -55,6 +64,7 @@ static void nfc_scene_emulate_nfcv_widget_config(Nfc* nfc, bool data_received) { widget_add_button_element( widget, GuiButtonTypeCenter, "Log", nfc_scene_emulate_nfcv_widget_callback, nfc); } + free(settings); } void nfc_scene_emulate_nfcv_on_enter(void* context) { 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 e46609c08..7e8a899a4 100644 --- a/applications/main/nfc/scenes/nfc_scene_mf_ultralight_emulate.c +++ b/applications/main/nfc/scenes/nfc_scene_mf_ultralight_emulate.c @@ -66,7 +66,15 @@ 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, &I_RFIDDolphinSend_97x61); + DesktopSettings* settings = malloc(sizeof(DesktopSettings)); + DESKTOP_SETTINGS_LOAD(settings); + + if(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); + } + if(strcmp(nfc->dev->dev_name, "")) { furi_string_printf(info_str, "Emulating\n%s", nfc->dev->dev_name); } else { @@ -84,6 +92,7 @@ void nfc_scene_mf_ultralight_emulate_widget_config(Nfc* nfc, bool auth_attempted nfc_scene_mf_ultralight_emulate_widget_callback, nfc); } + free(settings); } void nfc_scene_mf_ultralight_emulate_on_enter(void* context) {