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

Use mainmenu icons for main external apps

Browse Source
This commit is contained in:
Willy-JL
2023-03-05 01:55:14 +00:00
parent 2e09232499
commit d1bbcb8f64
2 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/main/fap_loader/fap_loader_app.c
+1 -1
View File
@@ -36,7 +36,7 @@ bool fap_loader_load_name_and_icon(
if(preload_res == FlipperApplicationPreloadStatusSuccess) {
const FlipperApplicationManifest* manifest = flipper_application_get_manifest(app);
if(manifest->has_icon) {
if(manifest->has_icon && icon_ptr != NULL) {
memcpy(*icon_ptr, manifest->icon, FAP_MANIFEST_MAX_ICON_SIZE);
}
furi_string_set(item_name, manifest->name);
applications/services/loader/loader.c
+6 -12
View File
@@ -419,6 +419,10 @@ static void loader_free(Loader* instance) {
instance = NULL;
}
const Icon* loader_get_main_icon(char* name) {
return NULL;
}
static void loader_build_menu() {
FURI_LOG_I(TAG, "Building main menu");
size_t i;
@@ -441,18 +445,8 @@ static void loader_build_menu() {
while(storage_dir_read(folder, &info, name, 100)) {
if(file_info_is_dir(&info)) continue;
furi_string_printf(path, EXT_PATH("apps/.Main/%s"), name);
uint8_t* icondata = malloc(FAP_MANIFEST_MAX_ICON_SIZE);
if(!fap_loader_load_name_and_icon(path, storage, &icondata, appname)) {
free(icondata);
continue;
}
Icon* 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);
icon->frames = malloc(sizeof(const uint8_t*));
FURI_CONST_ASSIGN_PTR(icon->frames[0], icondata);
if(!fap_loader_load_name_and_icon(path, storage, NULL, appname)) continue;
const Icon* icon = loader_get_main_icon(name);
menu_add_item(
loader_instance->primary_menu,
strdup(furi_string_get_cstr(appname)),