Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2025-07-28 17:24:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Restore home menu order (#2384)

Browse source 
* Fix ext notice position ( No need to alter the position of the ext app notice, as there is no back button on the home screen )
* add desired position to external apps
* read and store desired location
* apply ext apps desired order
* fix memory alignment in application_information_t
This commit is contained in:
E.T. 2024-11-23 21:37:03 +01:00 • committed by GitHub
parent e6a099913a
commit 69271632ae
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
38 changed files with 130 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

18
firmware/application/ui_external_items_menu_loader.cpp
View file

@ -97,10 +97,10 @@ namespace ui {
}
}
/* static */ std::vector<GridItem> ExternalItemsMenuLoader::load_external_items(app_location_t app_location, NavigationView& nav) {
/* static */ std::vector<ExternalItemsMenuLoader::GridItemEx> ExternalItemsMenuLoader::load_external_items(app_location_t app_location, NavigationView& nav) {
bitmaps.clear();
std::vector<GridItem> external_apps;
std::vector<GridItemEx> external_apps;
auto dev = (i2cdev::I2cDev_PPmod*)i2cdev::I2CDevManager::get_dev_by_model(I2C_DEVMDL::I2CDECMDL_PPMOD);
@ -121,7 +121,7 @@ namespace ui {
if (appInfo->header_version > CURRENT_STANDALONE_APPLICATION_API_VERSION)
continue;
GridItem gridItem = {};
GridItemEx gridItem = {};
gridItem.text = reinterpret_cast<char*>(&appInfo->app_name[0]);
gridItem.color = Color((uint16_t)appInfo->icon_color);
@ -150,6 +150,8 @@ namespace ui {
nav.display_modal("Error", "Unable to download app.");
};
gridItem.desired_position = -1; // TODO: Where should we put the module's app icon? First? Last? Also configurable?
external_apps.push_back(gridItem);
}
}
@ -180,7 +182,7 @@ namespace ui {
bool versionMatches = VERSION_MD5 == application_information.app_version;
GridItem gridItem = {};
GridItemEx gridItem = {};
gridItem.text = reinterpret_cast<char*>(&application_information.app_name[0]);
if (versionMatches) {
@ -195,6 +197,8 @@ namespace ui {
nav.display_modal("Error", "The .ppma file in your " + apps_dir.string() + "\nfolder can't be read. Please\nupdate your SD Card content.");
}
};
gridItem.desired_position = application_information.desired_menu_position;
} else {
gridItem.color = Theme::getInstance()->fg_light->foreground;
@ -203,6 +207,8 @@ namespace ui {
gridItem.on_select = [&nav]() {
nav.display_modal("Error", "The .ppma file in your " + apps_dir.string() + "\nfolder is outdated. Please\nupdate your SD Card content.");
};
gridItem.desired_position = application_information.desired_menu_position;
}
external_apps.push_back(gridItem);
@ -228,7 +234,7 @@ namespace ui {
if (application_information.header_version > CURRENT_STANDALONE_APPLICATION_API_VERSION)
continue;
GridItem gridItem = {};
GridItemEx gridItem = {};
gridItem.text = reinterpret_cast<char*>(&application_information.app_name[0]);
gridItem.color = Color((uint16_t)application_information.icon_color);
@ -243,6 +249,8 @@ namespace ui {
}
};
gridItem.desired_position = -1; // No desired position support for standalone apps yet
external_apps.push_back(gridItem);
}