Tweaks + Icon + File Select

Author: acegoal07

application.fam

@@ -6,13 +6,13 @@ App(
     stack_size=4 * 1024,
     fap_category="NFC",
     fap_version="0.1",
-    fap_icon="assets/nfc_comparator.png",
+    fap_icon="assets/Comparator_10px.png",
     fap_description="A app to check if a physical NFC card is the same as a saved one",
     fap_author="acegoal07",
     fap_weburl="https://github.com/acegoal07/FlipperZero_NFC_Comparator",
     fap_icon_assets="assets",
     fap_private_libs=[
-        lib(
+        Lib(
             name="reader_worker",
         ),
     ],

assets/Comparator_10px.png

@@ -18,8 +18,3 @@ void nfc_comparator_reader_worker_free(NfcComparatorReaderWorker* nfc_comparator
    nfc_scanner_free(nfc_comparator_reader_worker->nfc_scanner);
    free(nfc_comparator_reader_worker);
 }
-
-void nfc_comparator_reader_worker_start(NfcComparatorReaderWorker* nfc_comparator_reader_worker) {
-   furi_assert(nfc_comparator_reader_worker);
-   nfc_poller_start(nfc_comparator_reader_worker->nfc_poller);
-}

assets/Nfc_10px.png

@@ -21,3 +21,6 @@ typedef struct {
    NfcPoller* nfc_poller;
    NfcScanner* nfc_scanner;
 } NfcComparatorReaderWorker;
+
+NfcComparatorReaderWorker* nfc_comparator_reader_worker_alloc();
+void nfc_comparator_reader_worker_free(NfcComparatorReaderWorker* nfc_comparator_reader_worker);

assets/nfc_comparator.png

@@ -18,8 +18,12 @@ static NfcComparator* nfc_comparator_alloc() {
    nfc_comparator->scene_manager =
       scene_manager_alloc(&nfc_comparator_scene_handlers, nfc_comparator);
    nfc_comparator->view_dispatcher = view_dispatcher_alloc();
+
    nfc_comparator->submenu = submenu_alloc();
 
+   nfc_comparator->file_browser_output = furi_string_alloc();
+   nfc_comparator->file_browser = file_browser_alloc(nfc_comparator->file_browser_output);
+
    view_dispatcher_set_event_callback_context(nfc_comparator->view_dispatcher, nfc_comparator);
    view_dispatcher_set_custom_event_callback(
       nfc_comparator->view_dispatcher, nfc_comparator_custom_callback);
@@ -30,6 +34,10 @@ static NfcComparator* nfc_comparator_alloc() {
       nfc_comparator->view_dispatcher,
       NfcComparatorView_Submenu,
       submenu_get_view(nfc_comparator->submenu));
+   view_dispatcher_add_view(
+      nfc_comparator->view_dispatcher,
+      NfcComparatorView_FileBrowser,
+      file_browser_get_view(nfc_comparator->file_browser));
 
    return nfc_comparator;
 }
@@ -38,11 +46,15 @@ static void nfc_comparator_free(NfcComparator* nfc_comparator) {
    furi_assert(nfc_comparator);
 
    view_dispatcher_remove_view(nfc_comparator->view_dispatcher, NfcComparatorView_Submenu);
+   view_dispatcher_remove_view(nfc_comparator->view_dispatcher, NfcComparatorView_FileBrowser);
 
    scene_manager_free(nfc_comparator->scene_manager);
    view_dispatcher_free(nfc_comparator->view_dispatcher);
 
    submenu_free(nfc_comparator->submenu);
+   file_browser_free(nfc_comparator->file_browser);
+   furi_string_free(nfc_comparator->file_browser_output);
+   nfc_device_free(nfc_comparator->loaded_nfc_card);
 
    free(nfc_comparator);
 }

lib/reader_worker/nfc_comparator_reader_worker.c

@@ -10,21 +10,34 @@
 #include <gui/view_dispatcher.h>
 #include <gui/scene_manager.h>
 #include <gui/modules/submenu.h>
+#include <gui/modules/file_browser.h>
 
 #include <nfc_device.h>
 #include <nfc_listener.h>
 #include <nfc_scanner.h>
 
+#include <storage/storage.h>
+
+#include <toolbox/stream/stream.h>
+#include <toolbox/stream/file_stream.h>
+#include <toolbox/path.h>
+
 #include "scenes/nfc_comparator_scene.h"
 
 #include "lib/reader_worker/nfc_comparator_reader_worker.h"
 
 typedef enum {
-   NfcComparatorView_Submenu
+   NfcComparatorView_Submenu,
+   NfcComparatorView_FileBrowser
 } NfcComparatorViews;
 
 typedef struct {
    SceneManager* scene_manager;
    ViewDispatcher* view_dispatcher;
    Submenu* submenu;
+   FileBrowser* file_browser;
+   FuriString* file_browser_output;
+   NfcDevice* loaded_nfc_card;
 } NfcComparator;
+
+#define NFC_ITEM_LOCATION "/ext/nfc/"

lib/reader_worker/nfc_comparator_reader_worker.h

@@ -1 +1,2 @@
 ADD_SCENE(nfc_comparator, main_menu, MainMenu)
+ADD_SCENE(nfc_comparator, select_nfc_card, SelectNfcCard)

nfc_comparator.c

@@ -2,7 +2,8 @@
 #include "../nfc_comparator.h"
 
 typedef enum {
-   NfcComparatorMainMenu_Start
+   NfcComparatorMainMenu_Start,
+   NfcComparatorMainMenu_SelectNfcCard
 } NfcComparatorMainMenuMenuSelection;
 
 void nfc_comparator_main_menu_menu_callback(void* context, uint32_t index) {
@@ -17,11 +18,20 @@ void nfc_comparator_main_menu_scene_on_enter(void* context) {
    submenu_set_header(nfc_comparator->submenu, furi_string_get_cstr(header));
    furi_string_free(header);
 
-   submenu_add_item(
+   submenu_add_lockable_item(
       nfc_comparator->submenu,
       "Start",
       NfcComparatorMainMenu_Start,
       nfc_comparator_main_menu_menu_callback,
+      nfc_comparator,
+      !nfc_comparator->loaded_nfc_card,
+      "No NFC card selected");
+
+   submenu_add_item(
+      nfc_comparator->submenu,
+      "Select NFC Card",
+      NfcComparatorMainMenu_SelectNfcCard,
+      nfc_comparator_main_menu_menu_callback,
       nfc_comparator);
 
    view_dispatcher_switch_to_view(nfc_comparator->view_dispatcher, NfcComparatorView_Submenu);
@@ -37,6 +47,10 @@ bool nfc_comparator_main_menu_scene_on_event(void* context, SceneManagerEvent ev
       //    scene_manager_next_scene(nfc_comparator->scene_manager, NfcComparatorScene_Emulation);
       //    consumed = true;
       //    break;
+      case NfcComparatorMainMenu_SelectNfcCard:
+         scene_manager_next_scene(nfc_comparator->scene_manager, NfcComparatorScene_SelectNfcCard);
+         consumed = true;
+         break;
       default:
          break;
       }

nfc_comparator.h

@@ -0,0 +1,34 @@
+#include "../nfc_comparator.h"
+
+void nfc_comparator_select_nfc_card_menu_callback(void* context) {
+   NfcComparator* nfc_comparator = context;
+   nfc_comparator->loaded_nfc_card = nfc_device_alloc();
+   nfc_device_load(
+      nfc_comparator->loaded_nfc_card, furi_string_get_cstr(nfc_comparator->file_browser_output));
+   furi_string_reset(nfc_comparator->file_browser_output);
+   scene_manager_previous_scene(nfc_comparator->scene_manager);
+}
+
+void nfc_comparator_select_nfc_card_scene_on_enter(void* context) {
+   NfcComparator* nfc_comparator = context;
+   file_browser_configure(
+      nfc_comparator->file_browser, ".nfc", NFC_ITEM_LOCATION, true, true, &I_Nfc_10px, true);
+   file_browser_set_callback(
+      nfc_comparator->file_browser, nfc_comparator_select_nfc_card_menu_callback, nfc_comparator);
+   FuriString* tmp_str = furi_string_alloc_set_str(NFC_ITEM_LOCATION);
+   file_browser_start(nfc_comparator->file_browser, tmp_str);
+   furi_string_free(tmp_str);
+
+   view_dispatcher_switch_to_view(nfc_comparator->view_dispatcher, NfcComparatorView_FileBrowser);
+}
+
+bool nfc_comparator_select_nfc_card_scene_on_event(void* context, SceneManagerEvent event) {
+   UNUSED(event);
+   UNUSED(context);
+   return false;
+}
+
+void nfc_comparator_select_nfc_card_scene_on_exit(void* context) {
+   NfcComparator* nfc_comparator = context;
+   file_browser_stop(nfc_comparator->file_browser);
+}