Просмотр исходного кода

[FL-3017], [FL-3018] Change NFC emulation screens (#2102)

* nfc: fix emulate uid view
* archive: hide dot files in apps
* nfc: fix other emulation scenes view
gornekich 3 лет назад
Родитель
Сommit
c535b8f4ce

+ 3 - 1
applications/main/archive/helpers/archive_browser.c

@@ -475,8 +475,10 @@ void archive_switch_tab(ArchiveBrowserView* browser, InputKey key) {
         tab = archive_get_tab(browser);
         if(archive_is_dir_exists(browser->path)) {
             bool skip_assets = (strcmp(archive_get_tab_ext(tab), "*") == 0) ? false : true;
+            // Hide dot files everywhere except Browser
+            bool hide_dot_files = (strcmp(archive_get_tab_ext(tab), "*") == 0) ? false : true;
             archive_file_browser_set_path(
-                browser, browser->path, archive_get_tab_ext(tab), skip_assets, false);
+                browser, browser->path, archive_get_tab_ext(tab), skip_assets, hide_dot_files);
             tab_empty = false; // Empty check will be performed later
         }
     }

+ 3 - 3
applications/main/nfc/scenes/nfc_scene_emulate_uid.c

@@ -37,8 +37,8 @@ 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, &I_RFIDDolphinSend_97x61);
-    widget_add_string_element(widget, 89, 32, AlignCenter, AlignTop, FontPrimary, "Emulating UID");
+    widget_add_icon_element(widget, 0, 3, &I_NFC_dolphin_emulation_47x61);
+    widget_add_string_element(widget, 57, 13, AlignLeft, AlignTop, FontPrimary, "Emulating UID");
     if(strcmp(nfc->dev->dev_name, "")) {
         furi_string_printf(info_str, "%s", nfc->dev->dev_name);
     } else {
@@ -48,7 +48,7 @@ static void nfc_scene_emulate_uid_widget_config(Nfc* nfc, bool data_received) {
     }
     furi_string_trim(info_str);
     widget_add_text_box_element(
-        widget, 56, 43, 70, 21, AlignCenter, AlignTop, furi_string_get_cstr(info_str), true);
+        widget, 57, 28, 67, 25, AlignCenter, AlignTop, furi_string_get_cstr(info_str), true);
     furi_string_free(info_str);
     if(data_received) {
         widget_add_button_element(

+ 5 - 4
applications/main/nfc/scenes/nfc_scene_mf_classic_emulate.c

@@ -17,13 +17,14 @@ void nfc_scene_mf_classic_emulate_on_enter(void* context) {
 
     // Setup view
     Popup* popup = nfc->popup;
+    popup_set_header(popup, "Emulating", 67, 13, AlignLeft, AlignTop);
     if(strcmp(nfc->dev->dev_name, "")) {
-        nfc_text_store_set(nfc, "Emulating\n%s", nfc->dev->dev_name);
+        nfc_text_store_set(nfc, "%s", nfc->dev->dev_name);
     } else {
-        nfc_text_store_set(nfc, "Emulating\nMf Classic", nfc->dev->dev_name);
+        nfc_text_store_set(nfc, "MIFARE\nClassic");
     }
-    popup_set_icon(popup, 0, 3, &I_RFIDDolphinSend_97x61);
-    popup_set_header(popup, nfc->text_store, 56, 31, AlignLeft, AlignTop);
+    popup_set_icon(popup, 0, 3, &I_NFC_dolphin_emulation_47x61);
+    popup_set_text(popup, nfc->text_store, 90, 28, AlignCenter, AlignTop);
 
     // Setup and start worker
     view_dispatcher_switch_to_view(nfc->view_dispatcher, NfcViewPopup);

+ 10 - 4
applications/main/nfc/scenes/nfc_scene_mf_ultralight_emulate.c

@@ -16,14 +16,20 @@ void nfc_scene_mf_ultralight_emulate_on_enter(void* context) {
     Nfc* nfc = context;
 
     // Setup view
+    MfUltralightType type = nfc->dev->dev_data.mf_ul_data.type;
+    bool is_ultralight = (type == MfUltralightTypeUL11) || (type == MfUltralightTypeUL21) ||
+                         (type == MfUltralightTypeUnknown);
     Popup* popup = nfc->popup;
+    popup_set_header(popup, "Emulating", 67, 13, AlignLeft, AlignTop);
     if(strcmp(nfc->dev->dev_name, "")) {
-        nfc_text_store_set(nfc, "Emulating\n%s", nfc->dev->dev_name);
+        nfc_text_store_set(nfc, "%s", nfc->dev->dev_name);
+    } else if(is_ultralight) {
+        nfc_text_store_set(nfc, "MIFARE\nUltralight");
     } else {
-        nfc_text_store_set(nfc, "Emulating\nMf Ultralight", nfc->dev->dev_name);
+        nfc_text_store_set(nfc, "MIFARE\nNTAG");
     }
-    popup_set_icon(popup, 0, 3, &I_RFIDDolphinSend_97x61);
-    popup_set_header(popup, nfc->text_store, 56, 31, AlignLeft, AlignTop);
+    popup_set_icon(popup, 0, 3, &I_NFC_dolphin_emulation_47x61);
+    popup_set_text(popup, nfc->text_store, 90, 28, AlignCenter, AlignTop);
 
     // Setup and start worker
     view_dispatcher_switch_to_view(nfc->view_dispatcher, NfcViewPopup);

+ 1 - 1
applications/main/nfc/scenes/nfc_scene_rpc.c

@@ -7,7 +7,7 @@ void nfc_scene_rpc_on_enter(void* context) {
     popup_set_header(popup, "NFC", 89, 42, AlignCenter, AlignBottom);
     popup_set_text(popup, "RPC mode", 89, 44, AlignCenter, AlignTop);
 
-    popup_set_icon(popup, 0, 12, &I_RFIDDolphinSend_97x61);
+    popup_set_icon(popup, 0, 12, &I_NFC_dolphin_emulation_47x61);
 
     view_dispatcher_switch_to_view(nfc->view_dispatcher, NfcViewPopup);
 

BIN
assets/icons/NFC/NFC_dolphin_emulation_47x61.png