forked from flipperdevices/flipperzero-firmware
-
-
Notifications
You must be signed in to change notification settings - Fork 540
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #68 from derskythe/fixed-archive-app
Fixed archive app
- Loading branch information
Showing
13 changed files
with
496 additions
and
131 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,79 +1,122 @@ | ||
| #include "archive_i.h" | ||
| #include "m-string.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->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); | ||
| view_dispatcher_attach_to_gui( | ||
| archive->view_dispatcher, archive->gui, ViewDispatcherTypeFullscreen); | ||
|
|
||
| view_dispatcher_set_event_callback_context(archive->view_dispatcher, archive); | ||
| view_dispatcher_set_custom_event_callback( | ||
| archive->view_dispatcher, archive_custom_event_callback); | ||
| view_dispatcher_set_navigation_event_callback( | ||
| archive->view_dispatcher, archive_back_event_callback); | ||
| archive->gui = furi_record_open(RECORD_GUI); | ||
|
|
||
| archive->browser = browser_alloc(); | ||
| ViewDispatcher* view_dispatcher = archive->view_dispatcher; | ||
| view_dispatcher_enable_queue(view_dispatcher); | ||
| view_dispatcher_set_event_callback_context(view_dispatcher, archive); | ||
| view_dispatcher_set_custom_event_callback(view_dispatcher, archive_custom_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); | ||
|
|
||
| view_dispatcher_add_view( | ||
| archive->view_dispatcher, ArchiveViewBrowser, archive_browser_get_view(archive->browser)); | ||
| archive->dialogs = furi_record_open(RECORD_DIALOGS); | ||
|
|
||
| archive->text_input = text_input_alloc(); | ||
| view_dispatcher_add_view( | ||
| archive->view_dispatcher, ArchiveViewTextInput, text_input_get_view(archive->text_input)); | ||
| 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(); | ||
|
|
||
| return archive; | ||
| } | ||
|
|
||
| void archive_free(ArchiveApp* archive) { | ||
| furi_assert(archive); | ||
| ViewDispatcher* view_dispatcher = archive->view_dispatcher; | ||
|
|
||
| view_dispatcher_remove_view(archive->view_dispatcher, ArchiveViewBrowser); | ||
| view_dispatcher_remove_view(archive->view_dispatcher, ArchiveViewTextInput); | ||
| view_dispatcher_remove_view(archive->view_dispatcher, ArchiveViewWidget); | ||
| // Loading | ||
| loading_free(archive->loading); | ||
|
|
||
| view_dispatcher_remove_view(view_dispatcher, ArchiveViewTextInput); | ||
| text_input_free(archive->text_input); | ||
|
|
||
| view_dispatcher_remove_view(view_dispatcher, ArchiveViewWidget); | ||
| widget_free(archive->widget); | ||
|
|
||
| view_dispatcher_remove_view(view_dispatcher, ArchiveViewStack); | ||
| view_stack_free(archive->view_stack); | ||
|
|
||
| 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; | ||
|
|
||
| furi_record_close(RECORD_GUI); | ||
| archive->gui = NULL; | ||
|
|
||
| free(archive); | ||
| } | ||
|
|
||
| void archive_show_loading_popup(ArchiveApp* context, bool show) { | ||
| 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_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); | ||
| } | ||
| } | ||
|
|
||
| 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; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| #pragma once | ||
|
|
||
| #include <m-array.h> | ||
| #include <m-string.h> | ||
|
|
||
| typedef struct { | ||
| string_t text; | ||
| uint32_t event; | ||
| } ArchiveContextMenuItem_t; | ||
|
|
||
| static void ArchiveContextMenuItem_t_init(ArchiveContextMenuItem_t* obj) { | ||
| string_init(obj->text); | ||
| obj->event = 0; // ArchiveBrowserEventFileMenuNone | ||
| } | ||
|
|
||
| static void ArchiveContextMenuItem_t_init_set( | ||
| ArchiveContextMenuItem_t* obj, | ||
| const ArchiveContextMenuItem_t* src) { | ||
| string_init_set(obj->text, src->text); | ||
| obj->event = src->event; | ||
| } | ||
|
|
||
| static void ArchiveContextMenuItem_t_set( | ||
| ArchiveContextMenuItem_t* obj, | ||
| const ArchiveContextMenuItem_t* src) { | ||
| string_init_set(obj->text, src->text); | ||
| obj->event = src->event; | ||
| } | ||
|
|
||
| static void ArchiveContextMenuItem_t_clear(ArchiveContextMenuItem_t* obj) { | ||
| string_clear(obj->text); | ||
| } | ||
|
|
||
| ARRAY_DEF( | ||
| menu_array, | ||
| ArchiveContextMenuItem_t, | ||
| (INIT(API_2(ArchiveContextMenuItem_t_init)), | ||
| SET(API_6(ArchiveContextMenuItem_t_set)), | ||
| INIT_SET(API_6(ArchiveContextMenuItem_t_init_set)), | ||
| CLEAR(API_2(ArchiveContextMenuItem_t_clear)))) | ||
|
|
||
| #pragma GCC diagnostic push | ||
| #pragma GCC diagnostic ignored "-Wunused-function" | ||
| // Using in applications/archive/views/archive_browser_view.c | ||
| static void archive_menu_add_item( | ||
| ArchiveContextMenuItem_t* obj, | ||
| string_t text, | ||
| uint32_t event) { | ||
| string_init_move(obj->text, text); | ||
| obj->event = event; | ||
| } | ||
| #pragma GCC diagnostic pop |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| ADD_SCENE(archive, browser, Browser) | ||
| ADD_SCENE(archive, rename, Rename) | ||
| ADD_SCENE(archive, delete, Delete) | ||
| ADD_SCENE(archive, info, Info) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.