Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-06-07 19:01:54 -07:00
Code Issues Packages Projects Releases Wiki Activity

Dont reload ext main apps data on each menu open

Browse Source
This commit is contained in:
Willy-JL
2023-05-06 02:53:21 +01:00
parent a27f5cb110
commit 24dd4336c4
6 changed files with 82 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/services/loader/loader.c
+53 -1
View File
@@ -3,6 +3,11 @@
#include "loader_menu.h"
#include <applications.h>
#include <furi_hal.h>
#include <core/dangerous_defines.h>
#include <gui/modules/file_browser.h>
#include <toolbox/stream/file_stream.h>
#include "applications/main/fap_loader/fap_loader_app.h"
#include <xtreme.h>
#define TAG "Loader"
#define LOADER_MAGIC_THREAD_VALUE 0xDEADBEEF
@@ -107,6 +112,28 @@ static void loader_thread_state_callback(FuriThreadState thread_state, void* con
}
}
bool loader_menu_load_fap_meta(
Storage* storage,
FuriString* path,
FuriString* name,
const Icon** icon) {
*icon = NULL;
uint8_t* icon_buf = malloc(CUSTOM_ICON_MAX_SIZE);
if(!fap_loader_load_name_and_icon(path, storage, &icon_buf, name)) {
free(icon_buf);
icon_buf = NULL;
return false;
}
*icon = malloc(sizeof(Icon));
FURI_CONST_ASSIGN((*icon)->frame_count, 1);
FURI_CONST_ASSIGN((*icon)->frame_rate, 0);
FURI_CONST_ASSIGN((*icon)->width, 10);
FURI_CONST_ASSIGN((*icon)->height, 10);
FURI_CONST_ASSIGN_PTR((*icon)->frames, malloc(sizeof(const uint8_t*)));
FURI_CONST_ASSIGN_PTR((*icon)->frames[0], icon_buf);
return true;
}
// implementation
static Loader* loader_alloc() {
@@ -118,6 +145,31 @@ static Loader* loader_alloc() {
loader->app.name = NULL;
loader->app.thread = NULL;
loader->app.insomniac = false;
Storage* storage = furi_record_open(RECORD_STORAGE);
FuriString* path = furi_string_alloc();
FuriString* name = furi_string_alloc();
Stream* stream = file_stream_alloc(storage);
ExtMainAppList_init(loader->ext_main_apps);
if(file_stream_open(stream, XTREME_APPS_PATH, FSAM_READ, FSOM_OPEN_EXISTING)) {
while(stream_read_line(stream, path)) {
furi_string_replace_all(path, "\r", "");
furi_string_replace_all(path, "\n", "");
const Icon* icon;
if(!loader_menu_load_fap_meta(storage, path, name, &icon)) continue;
ExtMainAppList_push_back(
loader->ext_main_apps,
(ExtMainApp){
.name = strdup(furi_string_get_cstr(name)),
.path = strdup(furi_string_get_cstr(path)),
.icon = icon});
}
}
file_stream_close(stream);
stream_free(stream);
furi_string_free(name);
furi_string_free(path);
furi_record_close(RECORD_STORAGE);
return loader;
}
@@ -204,7 +256,7 @@ static void loader_do_menu_show(Loader* loader, bool settings) {
loader->loader_menu = loader_menu_alloc();
loader_menu_set_closed_callback(loader->loader_menu, loader_menu_closed_callback, loader);
loader_menu_set_click_callback(loader->loader_menu, loader_menu_click_callback, loader);
loader_menu_start(loader->loader_menu, settings);
loader_menu_start(loader->loader_menu, settings, &loader->ext_main_apps);
}
}
applications/services/loader/loader.h
+1
View File
@@ -1,5 +1,6 @@
#pragma once
#include <furi.h>
#include "loader_extmainapp.h"
#ifdef __cplusplus
extern "C" {
applications/services/loader/loader_extmainapp.h
+12
View File
@@ -0,0 +1,12 @@
#pragma once
#include <gui/icon.h>
#include <m-list.h>
typedef struct {
const char* name;
const char* path;
const Icon* icon;
} ExtMainApp;
LIST_DEF(ExtMainAppList, ExtMainApp, M_POD_OPLIST)
applications/services/loader/loader_i.h
+1
View File
@@ -16,6 +16,7 @@ struct Loader {
FuriMessageQueue* queue;
LoaderMenu* loader_menu;
LoaderAppData app;
ExtMainAppList_t ext_main_apps;
};
typedef enum {
applications/services/loader/loader_menu.c
+13 -51
View File
@@ -4,11 +4,6 @@
#include <gui/modules/submenu.h>
#include <assets_icons.h>
#include <applications.h>
#include <core/dangerous_defines.h>
#include <gui/modules/file_browser.h>
#include <toolbox/stream/file_stream.h>
#include "applications/main/fap_loader/fap_loader_app.h"
#include <xtreme.h>
#include "loader_menu.h"
@@ -19,7 +14,9 @@ struct LoaderMenu {
ViewDispatcher* view_dispatcher;
Menu* primary_menu;
Submenu* settings_menu;
bool settings;
ExtMainAppList_t* ext_main_apps;
void (*closed_callback)(void*);
void* closed_callback_context;
@@ -59,10 +56,11 @@ void loader_menu_free(LoaderMenu* loader_menu) {
free(loader_menu);
}
void loader_menu_start(LoaderMenu* loader_menu, bool settings) {
void loader_menu_start(LoaderMenu* loader_menu, bool settings, ExtMainAppList_t* ext_main_apps) {
furi_assert(loader_menu);
furi_assert(!loader_menu->thread);
loader_menu->settings = settings;
loader_menu->ext_main_apps = ext_main_apps;
loader_menu->thread = furi_thread_alloc_ex(TAG, 1024, loader_menu_thread, loader_menu);
furi_thread_start(loader_menu->thread);
}
@@ -132,28 +130,6 @@ static uint32_t loader_menu_exit(void* context) {
return VIEW_NONE;
}
bool loader_menu_load_fap_meta(
Storage* storage,
FuriString* path,
FuriString* name,
const Icon** icon) {
*icon = NULL;
uint8_t* icon_buf = malloc(CUSTOM_ICON_MAX_SIZE);
if(!fap_loader_load_name_and_icon(path, storage, &icon_buf, name)) {
free(icon_buf);
icon_buf = NULL;
return false;
}
*icon = malloc(sizeof(Icon));
FURI_CONST_ASSIGN((*icon)->frame_count, 1);
FURI_CONST_ASSIGN((*icon)->frame_rate, 0);
FURI_CONST_ASSIGN((*icon)->width, 10);
FURI_CONST_ASSIGN((*icon)->height, 10);
FURI_CONST_ASSIGN_PTR((*icon)->frames, malloc(sizeof(const uint8_t*)));
FURI_CONST_ASSIGN_PTR((*icon)->frames[0], icon_buf);
return true;
}
static void loader_menu_build_menu(LoaderMenu* loader_menu) {
size_t i;
for(i = 0; i < FLIPPER_APPS_COUNT; i++) {
@@ -173,30 +149,16 @@ static void loader_menu_build_menu(LoaderMenu* loader_menu) {
loader_menu_switch_to_settings,
loader_menu);
Storage* storage = furi_record_open(RECORD_STORAGE);
FuriString* path = furi_string_alloc();
FuriString* name = furi_string_alloc();
Stream* stream = file_stream_alloc(storage);
if(file_stream_open(stream, XTREME_APPS_PATH, FSAM_READ, FSOM_OPEN_EXISTING)) {
while(stream_read_line(stream, path)) {
furi_string_replace_all(path, "\r", "");
furi_string_replace_all(path, "\n", "");
const Icon* icon;
if(!loader_menu_load_fap_meta(storage, path, name, &icon)) continue;
menu_add_item(
loader_menu->primary_menu,
strdup(furi_string_get_cstr(name)),
icon,
(uint32_t)strdup(furi_string_get_cstr(path)),
loader_menu_external_callback,
(void*)loader_menu);
}
for(i = 0; i < ExtMainAppList_size(*loader_menu->ext_main_apps); i++) {
const ExtMainApp* app = ExtMainAppList_get(*loader_menu->ext_main_apps, i);
menu_add_item(
loader_menu->primary_menu,
app->name,
app->icon,
(uint32_t)app->path,
loader_menu_external_callback,
(void*)loader_menu);
}
file_stream_close(stream);
stream_free(stream);
furi_string_free(name);
furi_string_free(path);
furi_record_close(RECORD_STORAGE);
};
static void loader_menu_build_submenu(LoaderMenu* loader_menu) {
applications/services/loader/loader_menu.h
+2 -1
View File
@@ -1,5 +1,6 @@
#pragma once
#include <furi.h>
#include "loader_extmainapp.h"
#ifdef __cplusplus
extern "C" {
@@ -11,7 +12,7 @@ LoaderMenu* loader_menu_alloc();
void loader_menu_free(LoaderMenu* loader_menu);
void loader_menu_start(LoaderMenu* loader_menu, bool settings);
void loader_menu_start(LoaderMenu* loader_menu, bool settings, ExtMainAppList_t* ext_main_apps);
void loader_menu_stop(LoaderMenu* loader_menu);