Move to dialogs for the error message

Author: Astra

applications/nfc/nfc.c

@@ -32,61 +32,26 @@ static void nfc_rpc_command_callback(RpcAppSystemEvent event, void* context) {
     }
 }
 
-Nfc* nfc_min_alloc() {
+Nfc* nfc_alloc() {
     Nfc* nfc = malloc(sizeof(Nfc));
 
+    nfc->worker = nfc_worker_alloc();
     nfc->view_dispatcher = view_dispatcher_alloc();
     nfc->scene_manager = scene_manager_alloc(&nfc_scene_handlers, nfc);
     view_dispatcher_enable_queue(nfc->view_dispatcher);
     view_dispatcher_set_event_callback_context(nfc->view_dispatcher, nfc);
     view_dispatcher_set_custom_event_callback(nfc->view_dispatcher, nfc_custom_event_callback);
     view_dispatcher_set_navigation_event_callback(nfc->view_dispatcher, nfc_back_event_callback);
 
+    // Nfc device
+    nfc->dev = nfc_device_alloc();
+
     // Open GUI record
     nfc->gui = furi_record_open(RECORD_GUI);
 
     // Open Notification record
     nfc->notifications = furi_record_open(RECORD_NOTIFICATION);
 
-    // Popup
-    nfc->popup = popup_alloc();
-    view_dispatcher_add_view(nfc->view_dispatcher, NfcViewPopup, popup_get_view(nfc->popup));
-
-    return nfc;
-}
-
-void nfc_min_free(Nfc* nfc) {
-    furi_assert(nfc);
-
-    // Popup
-    view_dispatcher_remove_view(nfc->view_dispatcher, NfcViewPopup);
-    popup_free(nfc->popup);
-
-    // View Dispatcher
-    view_dispatcher_free(nfc->view_dispatcher);
-
-    // Scene Manager
-    scene_manager_free(nfc->scene_manager);
-
-    // GUI
-    furi_record_close(RECORD_GUI);
-    nfc->gui = NULL;
-
-    // Notifications
-    furi_record_close(RECORD_NOTIFICATION);
-    nfc->notifications = NULL;
-
-    free(nfc);
-}
-
-Nfc* nfc_alloc() {
-    Nfc* nfc = nfc_min_alloc();
-
-    nfc->worker = nfc_worker_alloc();
-
-    // Nfc device
-    nfc->dev = nfc_device_alloc();
-
     // Submenu
     nfc->submenu = submenu_alloc();
     view_dispatcher_add_view(nfc->view_dispatcher, NfcViewMenu, submenu_get_view(nfc->submenu));
@@ -96,6 +61,10 @@ Nfc* nfc_alloc() {
     view_dispatcher_add_view(
         nfc->view_dispatcher, NfcViewDialogEx, dialog_ex_get_view(nfc->dialog_ex));
 
+    // Popup
+    nfc->popup = popup_alloc();
+    view_dispatcher_add_view(nfc->view_dispatcher, NfcViewPopup, popup_get_view(nfc->popup));
+
     // Loading
     nfc->loading = loading_alloc();
     view_dispatcher_add_view(nfc->view_dispatcher, NfcViewLoading, loading_get_view(nfc->loading));
@@ -165,6 +134,10 @@ void nfc_free(Nfc* nfc) {
     view_dispatcher_remove_view(nfc->view_dispatcher, NfcViewDialogEx);
     dialog_ex_free(nfc->dialog_ex);
 
+    // Popup
+    view_dispatcher_remove_view(nfc->view_dispatcher, NfcViewPopup);
+    popup_free(nfc->popup);
+
     // Loading
     view_dispatcher_remove_view(nfc->view_dispatcher, NfcViewLoading);
     loading_free(nfc->loading);
@@ -198,7 +171,21 @@ void nfc_free(Nfc* nfc) {
     nfc_worker_stop(nfc->worker);
     nfc_worker_free(nfc->worker);
 
-    nfc_min_free(nfc);
+    // View Dispatcher
+    view_dispatcher_free(nfc->view_dispatcher);
+
+    // Scene Manager
+    scene_manager_free(nfc->scene_manager);
+
+    // GUI
+    furi_record_close(RECORD_GUI);
+    nfc->gui = NULL;
+
+    // Notifications
+    furi_record_close(RECORD_NOTIFICATION);
+    nfc->notifications = NULL;
+
+    free(nfc);
 }
 
 void nfc_text_store_set(Nfc* nfc, const char* text, ...) {
@@ -239,14 +226,16 @@ void nfc_show_loading_popup(void* context, bool show) {
 int32_t nfc_app(void* p) {
     if(!furi_hal_nfc_is_init()) {
         // No connection to the chip, show an error screen
-        Nfc* nfc = nfc_min_alloc();
-        view_dispatcher_attach_to_gui(
-            nfc->view_dispatcher, nfc->gui, ViewDispatcherTypeFullscreen);
-        scene_manager_next_scene(nfc->scene_manager, NfcSceneNotInit);
-        view_dispatcher_run(nfc->view_dispatcher);
-
-        nfc_min_free(nfc);
-
+        DialogsApp* dialogs = furi_record_open(RECORD_DIALOGS);
+        DialogMessage* message = dialog_message_alloc();
+        dialog_message_set_text(
+            message,
+            "Error!\nNFC chip failed to start\n\n\nSend a photo of this to:\[email protected]",
+            0,
+            0,
+            AlignLeft,
+            AlignTop);
+        dialog_message_show(dialogs, message);
         return 0;
     }
 

applications/nfc/nfc_i.h

@@ -33,6 +33,8 @@
 #include <nfc/scenes/nfc_scene.h>
 #include <nfc/helpers/nfc_custom_event.h>
 
+#include <dialogs/dialogs.h>
+
 #include "rpc/rpc_app.h"
 
 #define NFC_TEXT_STORE_SIZE 128

applications/nfc/scenes/nfc_scene_config.h

@@ -51,4 +51,3 @@ ADD_SCENE(nfc, detect_reader, DetectReader)
 ADD_SCENE(nfc, mfkey_nonces_info, MfkeyNoncesInfo)
 ADD_SCENE(nfc, mfkey_complete, MfkeyComplete)
 ADD_SCENE(nfc, nfc_data_info, NfcDataInfo)
-ADD_SCENE(nfc, not_init, NotInit)