Fix bugs with new model

applications/main/archive/archive.c

@@ -1,76 +1,86 @@
 #include "archive_i.h"
 
-bool archive_custom_event_callback(void* context, uint32_t event) {
+static bool archive_custom_event_callback(void* context, uint32_t event) {
     furi_assert(context);
-    ArchiveApp* archive = (ArchiveApp*)context;
+    ArchiveApp* archive = context;
     return scene_manager_handle_custom_event(archive->scene_manager, event);
 }
 
-bool archive_back_event_callback(void* context) {
+static bool archive_back_event_callback(void* context) {
     furi_assert(context);
-    ArchiveApp* archive = (ArchiveApp*)context;
+    ArchiveApp* archive = context;
     return scene_manager_handle_back_event(archive->scene_manager);
 }
 
-ArchiveApp* archive_alloc() {
+static void archive_tick_event_callback(void* context) {
+    furi_assert(context);
+    ArchiveApp* archive = context;
+    scene_manager_handle_tick_event(archive->scene_manager);
+}
+
+static ArchiveApp* archive_alloc() {
     ArchiveApp* archive = malloc(sizeof(ArchiveApp));
 
-    archive->gui = furi_record_open(RECORD_GUI);
-    archive->dialogs = furi_record_open(RECORD_DIALOGS);
-    archive->text_input = text_input_alloc();
     string_init(archive->fav_move_str);
 
-    archive->view_dispatcher = view_dispatcher_alloc();
     archive->scene_manager = scene_manager_alloc(&archive_scene_handlers, archive);
+    archive->view_dispatcher = view_dispatcher_alloc();
 
-    view_dispatcher_enable_queue(archive->view_dispatcher);
+    archive->gui = furi_record_open(RECORD_GUI);
-    view_dispatcher_attach_to_gui(
-        archive->view_dispatcher, archive->gui, ViewDispatcherTypeFullscreen);
 
-    view_dispatcher_set_event_callback_context(archive->view_dispatcher, archive);
+    ViewDispatcher* view_dispatcher = archive->view_dispatcher;
-    view_dispatcher_set_custom_event_callback(
+    view_dispatcher_enable_queue(view_dispatcher);
-        archive->view_dispatcher, archive_custom_event_callback);
+    view_dispatcher_set_event_callback_context(view_dispatcher, archive);
-    view_dispatcher_set_navigation_event_callback(
+    view_dispatcher_set_custom_event_callback(view_dispatcher, archive_custom_event_callback);
-        archive->view_dispatcher, archive_back_event_callback);
+    view_dispatcher_set_navigation_event_callback(view_dispatcher, archive_back_event_callback);
+    view_dispatcher_set_tick_event_callback(view_dispatcher, archive_tick_event_callback, 100);
 
-    archive->browser = browser_alloc();
+    archive->dialogs = furi_record_open(RECORD_DIALOGS);
 
+    archive->text_input = text_input_alloc();
     view_dispatcher_add_view(
-        archive->view_dispatcher, ArchiveViewBrowser, archive_browser_get_view(archive->browser));
+        view_dispatcher, ArchiveViewTextInput, text_input_get_view(archive->text_input));
-
-    view_dispatcher_add_view(
-        archive->view_dispatcher, ArchiveViewTextInput, text_input_get_view(archive->text_input));
 
     archive->widget = widget_alloc();
     view_dispatcher_add_view(
         archive->view_dispatcher, ArchiveViewWidget, widget_get_view(archive->widget));
 
+    archive->view_stack = view_stack_alloc();
+    view_dispatcher_add_view(
+        view_dispatcher, ArchiveViewStack, view_stack_get_view(archive->view_stack));
+
+    archive->browser = browser_alloc();
+    view_dispatcher_add_view(
+        archive->view_dispatcher, ArchiveViewBrowser, archive_browser_get_view(archive->browser));
+
     // Loading
     archive->loading = loading_alloc();
-    view_dispatcher_add_view(
-        archive->view_dispatcher, ArchiveViewLoading, loading_get_view(archive->loading));
 
     return archive;
 }
 
 void archive_free(ArchiveApp* archive) {
     furi_assert(archive);
+    ViewDispatcher* view_dispatcher = archive->view_dispatcher;
 
     // Loading
-    view_dispatcher_remove_view(archive->view_dispatcher, ArchiveViewLoading);
+    view_dispatcher_remove_view(view_dispatcher, ArchiveViewLoading);
     loading_free(archive->loading);
 
-    view_dispatcher_remove_view(archive->view_dispatcher, ArchiveViewBrowser);
+    view_dispatcher_remove_view(view_dispatcher, ArchiveViewTextInput);
-    view_dispatcher_remove_view(archive->view_dispatcher, ArchiveViewTextInput);
+    text_input_free(archive->text_input);
-    view_dispatcher_remove_view(archive->view_dispatcher, ArchiveViewWidget);
+
+    view_dispatcher_remove_view(view_dispatcher, ArchiveViewWidget);
     widget_free(archive->widget);
+
+    view_dispatcher_remove_view(view_dispatcher, ArchiveViewBrowser);
+
     view_dispatcher_free(archive->view_dispatcher);
     scene_manager_free(archive->scene_manager);
+
     browser_free(archive->browser);
     string_clear(archive->fav_move_str);
 
-    text_input_free(archive->text_input);
-
     furi_record_close(RECORD_DIALOGS);
     archive->dialogs = NULL;
 
@@ -80,15 +90,17 @@ void archive_free(ArchiveApp* archive) {
     free(archive);
 }
 
-void archive_show_loading_popup(void* context, bool show) {
+void archive_show_loading_popup(ArchiveApp* context, bool show) {
-    ArchiveApp* instance = context;
     TaskHandle_t timer_task = xTaskGetHandle(configTIMER_SERVICE_TASK_NAME);
+    ViewStack* view_stack = context->view_stack;
+    Loading* loading = context->loading;
 
     if(show) {
         // Raise timer priority so that animations can play
         vTaskPrioritySet(timer_task, configMAX_PRIORITIES - 1);
-        view_dispatcher_switch_to_view(instance->view_dispatcher, ArchiveViewLoading);
+        view_stack_add_view(view_stack, loading_get_view(loading));
     } else {
+        view_stack_remove_view(view_stack, loading_get_view(loading));
         // Restore default timer priority
         vTaskPrioritySet(timer_task, configTIMER_TASK_PRIORITY);
     }
@@ -96,10 +108,13 @@ void archive_show_loading_popup(void* context, bool show) {
 
 int32_t archive_app(void* p) {
     UNUSED(p);
+
     ArchiveApp* archive = archive_alloc();
+    view_dispatcher_attach_to_gui(
+        archive->view_dispatcher, archive->gui, ViewDispatcherTypeFullscreen);
     scene_manager_next_scene(archive->scene_manager, ArchiveAppSceneBrowser);
     view_dispatcher_run(archive->view_dispatcher);
-    archive_free(archive);
 
+    archive_free(archive);
     return 0;
 }

applications/main/archive/archive_i.h

@@ -8,6 +8,7 @@
 #include <gui/scene_manager.h>
 #include <gui/modules/text_input.h>
 #include <gui/modules/widget.h>
+#include <gui/view_stack.h>
 #include <dialogs/dialogs.h>
 #include <gui/modules/loading.h>
 #include <loader/loader.h>
@@ -21,11 +22,13 @@ typedef enum {
     ArchiveViewWidget,
     ArchiveViewTotal,
     ArchiveViewLoading,
+    ArchiveViewStack,
 } ArchiveViewEnum;
 
 struct ArchiveApp {
     Gui* gui;
     ViewDispatcher* view_dispatcher;
+    ViewStack* view_stack;
     SceneManager* scene_manager;
     ArchiveBrowserView* browser;
     TextInput* text_input;
@@ -33,9 +36,10 @@ struct ArchiveApp {
     DialogsApp* dialogs;
     Loading* loading;
     FuriPubSubSubscription* loader_stop_subscription;
+
     string_t fav_move_str;
     char text_store[MAX_NAME_LEN];
     char file_extension[MAX_EXT_LEN + 1];
 };
 
-void archive_show_loading_popup(void* context, bool show);
+void archive_show_loading_popup(ArchiveApp* context, bool show);

applications/main/archive/helpers/archive_files.c

@@ -134,12 +134,12 @@ FS_Error archive_rename_file_or_dir(void* context, const char* src_path, const c
         archive_favorites_rename(src_path, dst_path);
     }
 
-    if(error == FSE_OK) {
+    if(error == FSE_OK || error == FSE_EXIST) {
         FURI_LOG_I(TAG, "Rename from %s to %s is DONE", src_path, dst_path);
         archive_refresh_dir(browser);
     } else {
-        const char* error_msg = filesystem_api_error_get_desc(error);
+        FURI_LOG_E(
-        FURI_LOG_E(TAG, "Rename failed: %s, Code: %d", error_msg, error);
+            TAG, "Rename failed: %s, Code: %d", filesystem_api_error_get_desc(error), error);
     }
 
     return error;

applications/main/archive/scenes/archive_scene_browser.c

@@ -143,8 +143,9 @@ bool archive_scene_browser_on_event(void* context, SceneManagerEvent event) {
             consumed = true;
             break;
         case ArchiveBrowserEventFileMenuInfo:
+            archive_show_file_menu(browser, false);
             scene_manager_set_scene_state(
-                archive->scene_manager, ArchiveAppSceneBrowser, SCENE_STATE_NEED_REFRESH);
+                archive->scene_manager, ArchiveAppSceneBrowser, SCENE_STATE_DEFAULT);
             scene_manager_next_scene(archive->scene_manager, ArchiveAppSceneInfo);
             consumed = true;
             break;

applications/main/archive/scenes/archive_scene_info.c

@@ -13,10 +13,10 @@ void archive_scene_info_widget_callback(GuiButtonType result, InputType type, vo
 
 void archive_scene_info_on_enter(void* context) {
     furi_assert(context);
-    ArchiveApp* app = (ArchiveApp*)context;
+    ArchiveApp* instance = context;
 
     widget_add_button_element(
-        app->widget, GuiButtonTypeLeft, "Back", archive_scene_info_widget_callback, app);
+        instance->widget, GuiButtonTypeLeft, "Back", archive_scene_info_widget_callback, instance);
 
     string_t filename;
     string_t dirname;
@@ -25,7 +25,7 @@ void archive_scene_info_on_enter(void* context) {
     string_init(dirname);
     string_init(str_size);
 
-    ArchiveFile_t* current = archive_get_current_file(app->browser);
+    ArchiveFile_t* current = archive_get_current_file(instance->browser);
     char file_info_message[128];
     Storage* fs_api = furi_record_open(RECORD_STORAGE);
 
@@ -33,7 +33,7 @@ void archive_scene_info_on_enter(void* context) {
     path_extract_filename(current->path, filename, false);
     snprintf(file_info_message, sizeof(file_info_message), "\e#%s\e#", string_get_cstr(filename));
     widget_add_text_box_element(
-        app->widget, 0, 0, 128, 25, AlignLeft, AlignCenter, file_info_message, false);
+        instance->widget, 0, 0, 128, 25, AlignLeft, AlignCenter, file_info_message, false);
 
     // Directory path
     path_extract_dirname(string_get_cstr(current->path), dirname);
@@ -42,22 +42,35 @@ void archive_scene_info_on_enter(void* context) {
     // File size
     FileInfo fileinfo;
     storage_common_stat(fs_api, string_get_cstr(current->path), &fileinfo);
-    string_printf(str_size, "%d", fileinfo.size / 1024);
+    if(fileinfo.size <= 1024) {
-    snprintf(
+        string_printf(str_size, "%d", fileinfo.size);
-        file_info_message,
+        snprintf(
-        sizeof(file_info_message),
+            file_info_message,
-        "Size: \e#%s\e# Kb.\n%s",
+            sizeof(file_info_message),
-        string_get_cstr(str_size),
+            "Size: \e#%s\e# bytes\n%s",
-        string_get_cstr(dirname)
+            string_get_cstr(str_size),
-        );
+            string_get_cstr(dirname));
+    } else {
+        string_printf(str_size, "%d", fileinfo.size / 1024);
+        snprintf(
+            file_info_message,
+            sizeof(file_info_message),
+            "Size: \e#%s\e# Kb.\n%s",
+            string_get_cstr(str_size),
+            string_get_cstr(dirname));
+    }
     widget_add_text_box_element(
-        app->widget, 0, 25, 128, 25, AlignLeft, AlignCenter, file_info_message, false);
+        instance->widget, 0, 25, 128, 25, AlignLeft, AlignCenter, file_info_message, false);
+
+    // This one to return and cursor select this file
+    path_extract_filename_no_ext(string_get_cstr(current->path), filename);
+    strlcpy(instance->text_store, string_get_cstr(filename), MAX_NAME_LEN);
 
     string_clear(filename);
     string_clear(dirname);
     string_clear(str_size);
 
-    view_dispatcher_switch_to_view(app->view_dispatcher, ArchiveViewWidget);
+    view_dispatcher_switch_to_view(instance->view_dispatcher, ArchiveViewWidget);
 }
 
 bool archive_scene_info_on_event(void* context, SceneManagerEvent event) {

applications/main/archive/scenes/archive_scene_rename.c

@@ -17,7 +17,7 @@ void archive_scene_rename_text_input_callback(void* context) {
 }
 
 void archive_scene_rename_on_enter(void* context) {
-    ArchiveApp* archive = (ArchiveApp*)context;
+    ArchiveApp* archive = context;
 
     TextInput* text_input = archive->text_input;
     ArchiveFile_t* current = archive_get_current_file(archive->browser);
@@ -44,7 +44,7 @@ void archive_scene_rename_on_enter(void* context) {
     text_input_set_result_callback(
         text_input,
         archive_scene_rename_text_input_callback,
-        archive,
+        context,
         archive->text_store,
         MAX_TEXT_INPUT_LEN,
         false);
@@ -55,7 +55,7 @@ void archive_scene_rename_on_enter(void* context) {
 }
 
 bool archive_scene_rename_on_event(void* context, SceneManagerEvent event) {
-    ArchiveApp* archive = (ArchiveApp*)context;
+    ArchiveApp* archive = context;
     bool consumed = false;
 
     if(event.type == SceneManagerEventTypeCustom) {
@@ -80,6 +80,7 @@ bool archive_scene_rename_on_event(void* context, SceneManagerEvent event) {
                 string_cat_printf(path_dst, "/%s%s", archive->text_store, archive->file_extension);
             }
             // Long time process if this is directory
+            view_dispatcher_switch_to_view(archive->view_dispatcher, ArchiveViewStack);
             archive_show_loading_popup(archive, true);
             FS_Error error =
                 archive_rename_file_or_dir(archive->browser, path_src, string_get_cstr(path_dst));
@@ -88,14 +89,14 @@ bool archive_scene_rename_on_event(void* context, SceneManagerEvent event) {
 
             string_clear(path_dst);
 
-            if(error != FSE_OK) {
+            if(error == FSE_OK || error == FSE_EXIST) {
+                scene_manager_next_scene(archive->scene_manager, ArchiveAppSceneBrowser);
+            } else {
                 string_t dialog_msg;
                 string_init(dialog_msg);
                 string_cat_printf(dialog_msg, "Cannot rename\nCode: %d", error);
                 dialog_message_show_storage_error(archive->dialogs, string_get_cstr(dialog_msg));
                 string_clear(dialog_msg);
-            } else {
-                scene_manager_next_scene(archive->scene_manager, ArchiveAppSceneBrowser);
             }
             consumed = true;
         }
@@ -104,12 +105,6 @@ bool archive_scene_rename_on_event(void* context, SceneManagerEvent event) {
 }
 
 void archive_scene_rename_on_exit(void* context) {
-    ArchiveApp* archive = (ArchiveApp*)context;
+    ArchiveApp* archive = context;
-
-    // Clear view
-    void* validator_context = text_input_get_validator_callback_context(archive->text_input);
-    text_input_set_validator(archive->text_input, NULL, NULL);
-    validator_is_file_free(validator_context);
-
     text_input_reset(archive->text_input);
 }