Merge remote-tracking branch 'ofw/dev' into mntm-dev

This commit is contained in:
Willy-JL
2024-07-15 22:18:35 +01:00
466 changed files with 3282 additions and 3168 deletions

View File

@@ -17,14 +17,14 @@
#define TAG "AnimationManager"
#define HARDCODED_ANIMATION_NAME "L1_AnimationError_128x64"
#define NO_SD_ANIMATION_NAME "L1_NoSd_128x49"
#define HARDCODED_ANIMATION_NAME "L1_AnimationError_128x64"
#define NO_SD_ANIMATION_NAME "L1_NoSd_128x49"
#define BAD_BATTERY_ANIMATION_NAME "L1_BadBattery_128x47"
#define NO_DB_ANIMATION_NAME "L0_NoDb_128x51"
#define BAD_SD_ANIMATION_NAME "L0_SdBad_128x51"
#define SD_OK_ANIMATION_NAME "L0_SdOk_128x51"
#define URL_ANIMATION_NAME "L0_Url_128x51"
#define NO_DB_ANIMATION_NAME "L0_NoDb_128x51"
#define BAD_SD_ANIMATION_NAME "L0_SdBad_128x51"
#define SD_OK_ANIMATION_NAME "L0_SdOk_128x51"
#define URL_ANIMATION_NAME "L0_Url_128x51"
#define NEW_MAIL_ANIMATION_NAME "L0_NewMail_128x51"
typedef enum {
@@ -50,13 +50,13 @@ struct AnimationManager {
int32_t freezed_animation_time_left;
ViewStack* view_stack;
bool _dummy_mode : 1; // Unused, kept for compatibility
bool blocking_shown_url : 1;
bool _dummy_mode : 1; // Unused, kept for compatibility
bool blocking_shown_url : 1;
bool blocking_shown_sd_bad : 1;
bool blocking_shown_no_db : 1;
bool blocking_shown_sd_ok : 1;
bool levelup_pending : 1;
bool levelup_active : 1;
bool blocking_shown_no_db : 1;
bool blocking_shown_sd_ok : 1;
bool levelup_pending : 1;
bool levelup_active : 1;
};
static StorageAnimation*

View File

@@ -11,8 +11,10 @@
#include <assets_dolphin_internal.h>
#include <assets_dolphin_blocking.h>
#include <momentum/momentum.h>
#define ANIMATION_META_FILE "meta.txt"
#define TAG "AnimationStorage"
#define ANIMATION_META_FILE "meta.txt"
char ANIMATION_DIR[23 /* /ext/asset_packs//Anims */ + ASSET_PACKS_NAME_LEN + 1];
char ANIMATION_MANIFEST_FILE[sizeof(ANIMATION_DIR) + 13 /*"/manifest.txt"*/];