Rework xtreme settings and assets implementation

applications/services/desktop/animations/animation_manager.c

@@ -14,7 +14,7 @@
 #include "animation_storage.h"
 #include "animation_manager.h"
 
-#include "xtreme/assets.h"
+#include <xtreme.h>
 
 #define TAG "AnimationManager"
 

applications/services/desktop/animations/animation_storage.c

@@ -11,7 +11,7 @@
 #include "animation_storage_i.h"
 #include <assets_dolphin_internal.h>
 #include <assets_dolphin_blocking.h>
-#include "xtreme/assets.h"
+#include <xtreme.h>
 #define ANIMATION_META_FILE "meta.txt"
 #define BASE_ANIMATION_DIR EXT_PATH("dolphin")
 #define TAG "AnimationStorage"
@@ -20,7 +20,7 @@
 #define ANIMATION_MANIFEST_FILE ANIMATION_DIR "/manifest.txt"
 
 */
-// 59 Max length = strlen("/ext/dolphin_custom//Anims") + MAX_PACK_NAME_LEN + 1 (Null terminator)
+// 59 Max length = strlen("/ext/dolphin_custom//Anims") + XTREME_ASSETS_PACK_NAME_LEN + 1 (Null terminator)
 char ANIMATION_DIR[59];
 // 72 Max length = ANIMATION_DIR + strlen("/manifest.txt")
 char ANIMATION_MANIFEST_FILE[72];
@@ -36,7 +36,7 @@ void animation_handler_select_manifest(bool force_stock) {
     FuriString* manifest = furi_string_alloc();
     bool use_asset_pack = !force_stock && xtreme_settings->asset_pack[0] != '\0';
     if(use_asset_pack) {
-        furi_string_printf(anim_dir, "%s/%s/Anims", PACKS_DIR, xtreme_settings->asset_pack);
+        furi_string_printf(anim_dir, "%s/%s/Anims", XTREME_ASSETS_PATH, xtreme_settings->asset_pack);
         furi_string_printf(manifest, "%s/manifest.txt", furi_string_get_cstr(anim_dir));
         Storage* storage = furi_record_open(RECORD_STORAGE);
         if(storage_common_stat(storage, furi_string_get_cstr(manifest), NULL) == FSE_OK) {

applications/services/desktop/desktop.c

@@ -15,6 +15,7 @@
 #include "desktop/views/desktop_view_pin_timeout.h"
 #include "desktop_i.h"
 #include "helpers/pin_lock.h"
+#include <xtreme/private.h>
 
 #define TAG "Desktop"
 
@@ -347,6 +348,10 @@ int32_t desktop_srv(void* p) {
         furi_hal_rtc_reset_flag(FuriHalRtcFlagResetPin);
     }
 
+    // furi_delay_ms(1000);
+    XTREME_SETTINGS_LOAD();
+    XTREME_ASSETS_LOAD();
+
     Desktop* desktop = desktop_alloc();
 
     bool loaded = DESKTOP_SETTINGS_LOAD(&desktop->settings);

applications/services/desktop/helpers/pin_lock.c

@@ -10,7 +10,7 @@
 #include "../desktop_i.h"
 #include <cli/cli.h>
 #include <cli/cli_vcp.h>
-#include <xtreme/settings.h>
+#include <xtreme.h>
 
 static const NotificationSequence sequence_pin_fail = {
     &message_display_backlight_on,

applications/services/desktop/scenes/desktop_scene_fault.c

@@ -1,7 +1,7 @@
 #include <furi_hal.h>
 
 #include "../desktop_i.h"
-#include "xtreme/assets.h"
+#include <xtreme.h>
 
 #define DesktopFaultEventExit 0x00FF00FF
 

applications/services/desktop/scenes/desktop_scene_lock_menu.c

@@ -5,7 +5,7 @@
 #include <stdbool.h>
 #include <loader/loader.h>
 // #include <loader/loader_i.h>
-#include <xtreme/settings.h>
+#include <xtreme.h>
 
 #include "../desktop_i.h"
 #include <desktop/desktop_settings.h>

applications/services/desktop/views/desktop_view_lock_menu.c

@@ -1,7 +1,7 @@
 #include <furi.h>
 #include <gui/elements.h>
 #include <assets_icons.h>
-#include <xtreme/settings.h>
+#include <xtreme.h>
 #include <furi_hal_rtc.h>
 
 #include "../desktop_i.h"

applications/services/desktop/views/desktop_view_locked.c

@@ -7,7 +7,7 @@
 #include <assets_icons.h>
 #include <portmacro.h>
 #include <locale/locale.h>
-#include <xtreme/assets.h>
+#include <xtreme.h>
 
 #include <desktop/desktop_settings.h>
 #include "../desktop_i.h"