Luu 11 месяцев назад
Родитель
Сommit
9826197d71

+ 1 - 1
metroflip.c

@@ -157,7 +157,7 @@ void metroflip_exit_widget_callback(GuiButtonType result, InputType type, void*
     UNUSED(result);
 
     if(type == InputTypeShort) {
-        scene_manager_next_scene(app->scene_manager, MetroflipSceneSave);
+        scene_manager_next_scene(app->scene_manager, MetroflipSceneStart);
     }
 }
 

+ 1 - 1
metroflip_i.h

@@ -51,7 +51,7 @@
 #include "api/calypso/calypso_i.h"
 
 #define KEY_MASK_BIT_CHECK(key_mask_1, key_mask_2) (((key_mask_1) & (key_mask_2)) == (key_mask_1))
-#define METROFLIP_FILE_EXTENSION                   ".metro"
+#define METROFLIP_FILE_EXTENSION                   ".nfc"
 typedef struct {
     Gui* gui;
     SceneManager* scene_manager;

+ 1 - 1
scenes/metroflip_scene_save.c

@@ -25,7 +25,7 @@ void metroflip_scene_save_on_enter(void* context) {
         true);
 
     ValidatorIsFile* validator_is_file =
-        validator_is_file_alloc_init(APP_DATA_PATH(), ".metro", NULL);
+        validator_is_file_alloc_init(APP_DATA_PATH(), METROFLIP_FILE_EXTENSION, NULL);
     text_input_set_validator(text_input, validator_is_file_callback, validator_is_file);
 
     view_dispatcher_switch_to_view(app->view_dispatcher, MetroflipViewTextInput);

+ 4 - 11
scenes/metroflip_scene_save_result.c

@@ -16,22 +16,15 @@ void metroflip_scene_save_result_on_enter(void* context) {
     Popup* popup = app->popup;
 
     char path[280];
-    snprintf(path, sizeof(path), "/ext/apps_data/metroflip/%s.metro", app->save_buf);
+    snprintf(path, sizeof(path), "/ext/apps_data/metroflip/%s.nfc", app->save_buf);
     FURI_LOG_I("path", "path: %s", path);
     bool success = nfc_device_save(app->nfc_device, path);
     Storage* storage = furi_record_open(RECORD_STORAGE);
     FlipperFormat* ff = flipper_format_file_alloc(storage);
-    //flipper_format_buffered_file_open_existing(ff, path);
     flipper_format_write_empty_line(ff);
-    if(flipper_format_file_open_existing(ff, path)) {
-        if(flipper_format_insert_or_update_string_cstr(ff, "Card Type", app->card_type)) {
-            flipper_format_file_close(ff);
-        } else {
-            FURI_LOG_I("ting", "cant write");
-        }
-    } else {
-        FURI_LOG_I("ting", "not found");
-    }
+    flipper_format_file_open_existing(ff, path);
+    flipper_format_insert_or_update_string_cstr(ff, "Card Type", app->card_type);
+    flipper_format_file_close(ff);
     flipper_format_free(ff);
     furi_record_close(RECORD_STORAGE);
 

+ 1 - 5
scenes/metroflip_scene_start.c

@@ -22,11 +22,7 @@ void metroflip_scene_start_on_enter(void* context) {
         app);
 
     submenu_add_item(
-        submenu,
-        "Load (not working)",
-        MetroflipSceneLoad,
-        metroflip_scene_start_submenu_callback,
-        app);
+        submenu, "Saved", MetroflipSceneLoad, metroflip_scene_start_submenu_callback, app);
 
     submenu_add_item(
         submenu,