Properly integrate xtreme apis and headers

2026-06-11 19:33:30 -07:00 · 2023-02-11 05:19:37 +00:00
parent 9cf68935e8
commit efb11dfcbd
66 changed files with 179 additions and 169 deletions
@@ -6,7 +6,7 @@
 #include <m-string.h>
 #include <storage/storage.h>
 #include "toolbox/path.h"
-#include "../../../settings/xtreme_settings/xtreme_settings.h"
+#include "xtreme/settings.h"

 #define FAP_MANIFEST_MAX_ICON_SIZE 32

@@ -1,5 +1,5 @@
 #include "../bad_usb_app_i.h"
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"

 typedef enum {
    BadUsbCustomEventErrorBack,
@@ -3,7 +3,7 @@
 #include <toolbox/path.h>
 #include <gui/elements.h>
 #include <assets_icons.h>
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"

 #define MAX_NAME_LEN 64

@@ -1,5 +1,5 @@
 #include "../ibutton_i.h"
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"

 static void ibutton_scene_delete_success_popup_callback(void* context) {
    iButton* ibutton = context;
@@ -1,6 +1,6 @@
 #include "../ibutton_i.h"
 #include <dolphin/dolphin.h>
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"

 static void ibutton_scene_read_callback(void* context) {
    iButton* ibutton = context;
@@ -1,5 +1,5 @@
 #include "../ibutton_i.h"
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"

 static void ibutton_scene_save_success_popup_callback(void* context) {
    iButton* ibutton = context;
@@ -1,5 +1,5 @@
 #include "../ibutton_i.h"
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"

 static void ibutton_scene_write_success_popup_callback(void* context) {
    iButton* ibutton = context;
@@ -1,5 +1,5 @@
 #include "../infrared_i.h"
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"

 void infrared_scene_edit_rename_done_on_enter(void* context) {
    Infrared* infrared = context;
@@ -1,5 +1,5 @@
 #include "../infrared_i.h"
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"

 void infrared_scene_learn_done_on_enter(void* context) {
    Infrared* infrared = context;
@@ -1,5 +1,5 @@
 #include "../infrared_i.h"
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"

 static void
    infrared_scene_learn_success_dialog_result_callback(DialogExResult result, void* context) {
@@ -1,6 +1,6 @@
 #include "../lfrfid_i.h"
 #include "../helpers/rfid_writer.h"
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"

 static void writer_initialize(T55xxTiming* t55xxtiming) {
    t55xxtiming->wait_time = 400;
@@ -1,5 +1,5 @@
 #include "../lfrfid_i.h"
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"

 void lfrfid_scene_delete_success_on_enter(void* context) {
    LfRfid* app = context;
@@ -1,5 +1,5 @@
 #include "../lfrfid_i.h"
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"

 void lfrfid_scene_emulate_on_enter(void* context) {
    LfRfid* app = context;
@@ -1,5 +1,5 @@
 #include "../lfrfid_i.h"
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"

 #define RAW_READ_TIME 5000

@@ -1,5 +1,5 @@
 #include "../lfrfid_i.h"
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"

 void lfrfid_scene_rpc_on_enter(void* context) {
    LfRfid* app = context;
@@ -1,5 +1,5 @@
 #include "../lfrfid_i.h"
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"

 void lfrfid_scene_save_success_on_enter(void* context) {
    LfRfid* app = context;
@@ -1,5 +1,5 @@
 #include "../lfrfid_i.h"
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"

 static void lfrfid_write_callback(LFRFIDWorkerWriteResult result, void* context) {
    LfRfid* app = context;
@@ -1,5 +1,5 @@
 #include "../lfrfid_i.h"
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"

 void lfrfid_scene_write_success_on_enter(void* context) {
    LfRfid* app = context;
@@ -1,5 +1,5 @@
 #include "../nfc_i.h"
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"

 void nfc_scene_delete_success_popup_callback(void* context) {
    Nfc* nfc = context;
@@ -1,5 +1,5 @@
 #include "../nfc_i.h"
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"

 #define NFC_SCENE_EMULATE_NFCV_LOG_SIZE_MAX (100)

@@ -1,5 +1,5 @@
 #include "../nfc_i.h"
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"

 #define NFC_SCENE_EMULATE_UID_LOG_SIZE_MAX (200)

@@ -1,5 +1,5 @@
 #include "../nfc_i.h"
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"

 #define NFC_MF_CLASSIC_DATA_NOT_CHANGED (0UL)
 #define NFC_MF_CLASSIC_DATA_CHANGED (1UL)
@@ -1,6 +1,6 @@
 #include "../nfc_i.h"
 #include <dolphin/dolphin.h>
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"

 void nfc_scene_mf_classic_update_success_popup_callback(void* context) {
    Nfc* nfc = context;
@@ -1,6 +1,6 @@
 #include "../nfc_i.h"
 #include <dolphin/dolphin.h>
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"

 void nfc_scene_mf_classic_write_success_popup_callback(void* context) {
    Nfc* nfc = context;
@@ -1,6 +1,6 @@
 #include "../nfc_i.h"
 #include <lib/nfc/protocols/mifare_ultralight.h>
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"

 #define NFC_SCENE_MF_ULTRALIGHT_EMULATE_LOG_SIZE_MAX (200)

@@ -1,5 +1,5 @@
 #include "../nfc_i.h"
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"

 void nfc_scene_restore_original_popup_callback(void* context) {
    Nfc* nfc = context;
@@ -1,5 +1,5 @@
 #include "../nfc_i.h"
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"

 void nfc_scene_rpc_on_enter(void* context) {
    Nfc* nfc = context;
@@ -1,5 +1,5 @@
 #include "../nfc_i.h"
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"

 void nfc_scene_save_success_popup_callback(void* context) {
    Nfc* nfc = context;
@@ -1,6 +1,6 @@
 #include "../subghz_i.h"
 #include "../helpers/subghz_custom_event.h"
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"

 void subghz_scene_delete_success_popup_callback(void* context) {
    SubGhz* subghz = context;
@@ -1,7 +1,7 @@
 #include "../subghz_i.h"
 #include <lib/subghz/protocols/keeloq.h>
 #include <lib/subghz/protocols/star_line.h>
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"

 typedef enum {
    SubGhzRpcStateIdle,
@@ -1,6 +1,6 @@
 #include "../subghz_i.h"
 #include "../helpers/subghz_custom_event.h"
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"

 void subghz_scene_save_success_popup_callback(void* context) {
    SubGhz* subghz = context;
@@ -7,7 +7,7 @@
 #include <assets_icons.h>
 #include <m-array.h>

-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"

 #define FRAME_HEIGHT 12
 #define MAX_LEN_PX 111
@@ -1,5 +1,5 @@
 #include "../u2f_app_i.h"
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"

 static void u2f_scene_error_event_callback(GuiButtonType result, InputType type, void* context) {
    furi_assert(context);
@@ -1,7 +1,7 @@
 #include "u2f_view.h"
 #include <gui/elements.h>
 #include <assets_icons.h>
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"

 struct U2fView {
    View* view;
@@ -5,7 +5,7 @@
 #include <notification/notification_messages.h>
 #include <gui/elements.h>
 #include <assets_icons.h>
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"

 #define TAG "BtSrv"

@@ -13,7 +13,7 @@
 #include "animation_storage.h"
 #include "animation_manager.h"

-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"

 #define TAG "AnimationManager"

@@ -11,7 +11,7 @@
 #include "animation_storage_i.h"
 #include <assets_dolphin_internal.h>
 #include <assets_dolphin_blocking.h>
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"
 #define ANIMATION_META_FILE "meta.txt"
 #define BASE_ANIMATION_DIR EXT_PATH("dolphin")
 #define TAG "AnimationStorage"
@@ -17,8 +17,6 @@
 #include "helpers/pin_lock.h"
 #include "helpers/slideshow_filename.h"

-#include "../../settings/xtreme_settings/xtreme_assets.h"
-
 static void desktop_auto_lock_arm(Desktop*);
 static void desktop_auto_lock_inhibit(Desktop*);
 static void desktop_start_auto_lock_timer(Desktop*);
@@ -307,9 +305,6 @@ static bool desktop_check_file_flag(const char* flag_path) {
 int32_t desktop_srv(void* p) {
    UNUSED(p);

-    // TODO: find a (working) way to run this at startup without hooking desktop
-    XTREME_ASSETS_LOAD();
-
    if(furi_hal_rtc_get_boot_mode() != FuriHalRtcBootModeNormal) {
        FURI_LOG_W("Desktop", "Desktop load skipped. Device is in special startup mode.");
    } else {
@@ -1,7 +1,7 @@
 #include <furi_hal.h>

 #include "../desktop_i.h"
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"

 #define DesktopFaultEventExit 0x00FF00FF

@@ -5,7 +5,7 @@

 #include "../desktop_i.h"
 #include "desktop_view_lock_menu.h"
-#include "../../../settings/xtreme_settings/xtreme_settings.h"
+#include "xtreme/settings.h"

 #define LOCK_MENU_ITEMS_NB 5

@@ -7,7 +7,7 @@ App(
    requires=[
        "input",
        "notification",
-        "xtreme_settings",
+        "xtreme",
    ],
    stack_size=2 * 1024,
    order=70,
@@ -1,4 +1,4 @@
-#include "../../settings/xtreme_settings/xtreme_settings.h"
+#include "xtreme/settings.h"
 #include "gui_i.h"
 #include <assets_icons.h>

@@ -14,7 +14,7 @@
 #include "m-string.h"
 #include "m-algo.h"
 #include <m-array.h>
-#include "../../../settings/xtreme_settings/xtreme_settings.h"
+#include "xtreme/settings.h"

 #define LIST_ITEMS 5u
 #define MAX_LEN_PX 110
@@ -2,7 +2,7 @@

 #include <furi.h>
 #include <furi_hal.h>
-#include "../../../settings/xtreme_settings/xtreme_settings.h"
+#include "xtreme/settings.h"

 #define POWER_OFF_TIMEOUT 90

@@ -0,0 +1,10 @@
+App(
+    appid="xtreme",
+    apptype=FlipperAppType.STARTUP,
+    entry_point="xtreme_on_system_start",
+    requires=["storage"],
+    order=1000,
+    provides=[
+        "xtreme",
+    ],
+)
@@ -1,5 +1,5 @@
-#include "xtreme_assets.h"
-#include "assets_icons.h"
+#include "assets.h"
+#include <assets_icons.h>
 #include <core/dangerous_defines.h>

 #define ICONS_FMT PACKS_DIR "/%s/Icons/%s"
@@ -1,7 +1,7 @@
 #pragma once

+#include "settings.h"
 #include <gui/icon_i.h>
-#include "xtreme_settings.h"
 #include <toolbox/path.h>

 #define PACKS_DIR EXT_PATH("dolphin_custom")
@@ -0,0 +1,7 @@
+#include "settings.h"
+#include "assets.h"
+
+void xtreme_on_system_start() {
+    XTREME_SETTINGS_LOAD();
+    XTREME_ASSETS_LOAD();
+}
@@ -1,4 +1,4 @@
-#include "xtreme_settings.h"
+#include "settings.h"

 XtremeSettings* xtreme_settings = NULL;

@@ -1,6 +1,6 @@
 #pragma once

-#include "xtreme_settings_filename.h"
+#include "settings_filename.h"

 #include <furi_hal.h>
 #include <stdint.h>
@@ -5,6 +5,7 @@ App(
    provides=[
        "passport",
        "system_settings",
+        "xtreme_app",
        "about",
    ],
 )
@@ -1,6 +1,6 @@
 #include "../bt_settings_app.h"
 #include "furi_hal_bt.h"
-#include "../../xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"
 #include <furi_hal_bt.h>

 void bt_settings_app_scene_forget_dev_success_popup_callback(void* context) {
@@ -6,7 +6,7 @@
 #include "../desktop_settings_app.h"
 #include <desktop/desktop_settings.h>
 #include "desktop_settings_scene.h"
-#include "../../xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"

 #define SCENE_EVENT_EXIT (0U)

@@ -6,7 +6,7 @@
 #include <gui/gui.h>
 #include <furi_hal_version.h>
 #include "dolphin/dolphin.h"
-#include "../xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"
 #include "math.h"

 typedef struct {
@@ -1,5 +1,5 @@
 #include "../power_settings_app.h"
-#include "../../xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"

 void power_settings_scene_power_off_dialog_callback(DialogExResult result, void* context) {
    furi_assert(context);
@@ -1,5 +1,5 @@
 #include "../storage_settings.h"
-#include "../../xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"

 static void
    storage_settings_scene_unmounted_dialog_callback(DialogExResult result, void* context) {
@@ -1,14 +1,12 @@
 App(
-    appid="xtreme_settings",
+    appid="xtreme_app",
    name="Xtreme FW",
    apptype=FlipperAppType.SETTINGS,
-    entry_point="xtreme_settings_app",
+    entry_point="xtreme_app",
    stack_size=2 * 1024,
    requires=[
        "gui",
+        "xtreme",
    ],
    order=90,
-    provides=[
-        "xtreme_settings",
-    ],
 )
@@ -0,0 +1,30 @@
+#include "xtreme_app_scene.h"
+
+// Generate scene on_enter handlers array
+#define ADD_SCENE(prefix, name, id) prefix##_scene_##name##_on_enter,
+void (*const xtreme_app_on_enter_handlers[])(void*) = {
+#include "xtreme_app_scene_config.h"
+};
+#undef ADD_SCENE
+
+// Generate scene on_event handlers array
+#define ADD_SCENE(prefix, name, id) prefix##_scene_##name##_on_event,
+bool (*const xtreme_app_on_event_handlers[])(void* context, SceneManagerEvent event) = {
+#include "xtreme_app_scene_config.h"
+};
+#undef ADD_SCENE
+
+// Generate scene on_exit handlers array
+#define ADD_SCENE(prefix, name, id) prefix##_scene_##name##_on_exit,
+void (*const xtreme_app_on_exit_handlers[])(void* context) = {
+#include "xtreme_app_scene_config.h"
+};
+#undef ADD_SCENE
+
+// Initialize scene handlers configuration structure
+const SceneManagerHandlers xtreme_app_scene_handlers = {
+    .on_enter_handlers = xtreme_app_on_enter_handlers,
+    .on_event_handlers = xtreme_app_on_event_handlers,
+    .on_exit_handlers = xtreme_app_on_exit_handlers,
+    .scene_num = XtremeAppSceneNum,
+};
@@ -3,27 +3,27 @@
 #include <gui/scene_manager.h>

 // Generate scene id and total number
-#define ADD_SCENE(prefix, name, id) XtremeSettingsAppScene##id,
+#define ADD_SCENE(prefix, name, id) XtremeAppScene##id,
 typedef enum {
-#include "xtreme_settings_scene_config.h"
-    XtremeSettingsAppSceneNum,
-} XtremeSettingsAppScene;
+#include "xtreme_app_scene_config.h"
+    XtremeAppSceneNum,
+} XtremeAppScene;
 #undef ADD_SCENE

-extern const SceneManagerHandlers xtreme_settings_scene_handlers;
+extern const SceneManagerHandlers xtreme_app_scene_handlers;

 // Generate scene on_enter handlers declaration
 #define ADD_SCENE(prefix, name, id) void prefix##_scene_##name##_on_enter(void*);
-#include "xtreme_settings_scene_config.h"
+#include "xtreme_app_scene_config.h"
 #undef ADD_SCENE

 // Generate scene on_event handlers declaration
 #define ADD_SCENE(prefix, name, id) \
    bool prefix##_scene_##name##_on_event(void* context, SceneManagerEvent event);
-#include "xtreme_settings_scene_config.h"
+#include "xtreme_app_scene_config.h"
 #undef ADD_SCENE

 // Generate scene on_exit handlers declaration
 #define ADD_SCENE(prefix, name, id) void prefix##_scene_##name##_on_exit(void* context);
-#include "xtreme_settings_scene_config.h"
+#include "xtreme_app_scene_config.h"
 #undef ADD_SCENE
@@ -0,0 +1 @@
+ADD_SCENE(xtreme_app, main, Main)
@@ -1,10 +1,10 @@
-#include "../xtreme_settings_app.h"
+#include "../xtreme_app.h"
 #include <lib/toolbox/value_index.h>
 #include <power/power_service/power.h>
 #include <lib/toolbox/version.h>

-static void xtreme_settings_scene_start_asset_pack_changed(VariableItem* item) {
-    XtremeSettingsApp* app = variable_item_get_context(item);
+static void xtreme_app_scene_main_asset_pack_changed(VariableItem* item) {
+    XtremeApp* app = variable_item_get_context(item);
    uint8_t index = variable_item_get_current_value_index(item);
    variable_item_set_current_value_text(
        item, index == 0 ? "SFW" : *asset_packs_get(app->asset_packs, index - 1));
@@ -20,8 +20,8 @@ const char* const anim_speed_names[] =
    {"25%", "50%", "75%", "100%", "125%", "150%", "175%", "200%", "225%", "250%", "275%", "300%"};
 const int32_t anim_speed_values[COUNT_OF(anim_speed_names)] =
    {25, 50, 75, 0, 125, 150, 175, 200, 225, 250, 275, 300};
-static void xtreme_settings_scene_start_anim_speed_changed(VariableItem* item) {
-    XtremeSettingsApp* app = variable_item_get_context(item);
+static void xtreme_app_scene_main_anim_speed_changed(VariableItem* item) {
+    XtremeApp* app = variable_item_get_context(item);
    uint8_t index = variable_item_get_current_value_index(item);
    variable_item_set_current_value_text(item, anim_speed_names[index]);
    XTREME_SETTINGS()->anim_speed = anim_speed_values[index];
@@ -44,16 +44,16 @@ const char* const cycle_anims_names[] = {
    "24 H"};
 const int32_t cycle_anims_values[COUNT_OF(cycle_anims_names)] =
    {-1, 0, 30, 60, 300, 600, 900, 1800, 3600, 7200, 21600, 43200, 86400};
-static void xtreme_settings_scene_start_cycle_anims_changed(VariableItem* item) {
-    XtremeSettingsApp* app = variable_item_get_context(item);
+static void xtreme_app_scene_main_cycle_anims_changed(VariableItem* item) {
+    XtremeApp* app = variable_item_get_context(item);
    uint8_t index = variable_item_get_current_value_index(item);
    variable_item_set_current_value_text(item, cycle_anims_names[index]);
    XTREME_SETTINGS()->cycle_anims = cycle_anims_values[index];
    app->settings_changed = true;
 }

-static void xtreme_settings_scene_start_unlock_anims_changed(VariableItem* item) {
-    XtremeSettingsApp* app = variable_item_get_context(item);
+static void xtreme_app_scene_main_unlock_anims_changed(VariableItem* item) {
+    XtremeApp* app = variable_item_get_context(item);
    bool value = variable_item_get_current_value_index(item);
    variable_item_set_current_value_text(item, value ? "ON" : "OFF");
    XTREME_SETTINGS()->unlock_anims = value;
@@ -70,32 +70,32 @@ const int32_t battery_style_values[COUNT_OF(battery_style_names)] = {
    BatteryStyleRetro3,
    BatteryStyleRetro5,
    BatteryStyleBarPercent};
-static void xtreme_settings_scene_start_battery_style_changed(VariableItem* item) {
-    XtremeSettingsApp* app = variable_item_get_context(item);
+static void xtreme_app_scene_main_battery_style_changed(VariableItem* item) {
+    XtremeApp* app = variable_item_get_context(item);
    uint8_t index = variable_item_get_current_value_index(item);
    variable_item_set_current_value_text(item, battery_style_names[index]);
    XTREME_SETTINGS()->battery_style = battery_style_values[index];
    app->settings_changed = true;
 }

-static void xtreme_settings_scene_start_status_bar_changed(VariableItem* item) {
-    XtremeSettingsApp* app = variable_item_get_context(item);
+static void xtreme_app_scene_main_status_bar_changed(VariableItem* item) {
+    XtremeApp* app = variable_item_get_context(item);
    bool value = variable_item_get_current_value_index(item);
    variable_item_set_current_value_text(item, value ? "ON" : "OFF");
    XTREME_SETTINGS()->status_bar = value;
    app->settings_changed = true;
 }

-static void xtreme_settings_scene_start_sort_folders_before_changed(VariableItem* item) {
-    XtremeSettingsApp* app = variable_item_get_context(item);
+static void xtreme_app_scene_main_sort_folders_before_changed(VariableItem* item) {
+    XtremeApp* app = variable_item_get_context(item);
    bool value = variable_item_get_current_value_index(item);
    variable_item_set_current_value_text(item, value ? "ON" : "OFF");
    XTREME_SETTINGS()->sort_ignore_dirs = !value;
    app->settings_changed = true;
 }

-static void xtreme_settings_scene_start_xp_level_changed(VariableItem* item) {
-    XtremeSettingsApp* app = variable_item_get_context(item);
+static void xtreme_app_scene_main_xp_level_changed(VariableItem* item) {
+    XtremeApp* app = variable_item_get_context(item);
    app->dolphin_level = variable_item_get_current_value_index(item) + 1;
    char level_str[4];
    snprintf(level_str, 4, "%i", app->dolphin_level);
@@ -103,22 +103,22 @@ static void xtreme_settings_scene_start_xp_level_changed(VariableItem* item) {
    app->level_changed = true;
 }

-static void xtreme_settings_scene_start_subghz_extend_changed(VariableItem* item) {
-    XtremeSettingsApp* app = variable_item_get_context(item);
+static void xtreme_app_scene_main_subghz_extend_changed(VariableItem* item) {
+    XtremeApp* app = variable_item_get_context(item);
    app->subghz_extend = variable_item_get_current_value_index(item);
    variable_item_set_current_value_text(item, app->subghz_extend ? "ON" : "OFF");
    app->subghz_changed = true;
 }

-static void xtreme_settings_scene_start_subghz_bypass_changed(VariableItem* item) {
-    XtremeSettingsApp* app = variable_item_get_context(item);
+static void xtreme_app_scene_main_subghz_bypass_changed(VariableItem* item) {
+    XtremeApp* app = variable_item_get_context(item);
    app->subghz_bypass = variable_item_get_current_value_index(item);
    variable_item_set_current_value_text(item, app->subghz_bypass ? "ON" : "OFF");
    app->subghz_changed = true;
 }

-void xtreme_settings_scene_start_on_enter(void* context) {
-    XtremeSettingsApp* app = context;
+void xtreme_app_scene_main_on_enter(void* context) {
+    XtremeApp* app = context;
    XtremeSettings* xtreme_settings = XTREME_SETTINGS();
    VariableItemList* var_item_list = app->var_item_list;
    VariableItem* item;
@@ -177,7 +177,7 @@ void xtreme_settings_scene_start_on_enter(void* context) {
        var_item_list,
        "Asset Pack",
        asset_packs_size(app->asset_packs) + 1,
-        xtreme_settings_scene_start_asset_pack_changed,
+        xtreme_app_scene_main_asset_pack_changed,
        app);
    variable_item_set_current_value_index(item, current_pack);
    variable_item_set_current_value_text(
@@ -187,7 +187,7 @@ void xtreme_settings_scene_start_on_enter(void* context) {
        var_item_list,
        "Anim Speed",
        COUNT_OF(anim_speed_names),
-        xtreme_settings_scene_start_anim_speed_changed,
+        xtreme_app_scene_main_anim_speed_changed,
        app);
    value_index = value_index_int32(
        xtreme_settings->anim_speed, anim_speed_values, COUNT_OF(anim_speed_names));
@@ -198,7 +198,7 @@ void xtreme_settings_scene_start_on_enter(void* context) {
        var_item_list,
        "Cycle Anims",
        COUNT_OF(cycle_anims_names),
-        xtreme_settings_scene_start_cycle_anims_changed,
+        xtreme_app_scene_main_cycle_anims_changed,
        app);
    value_index = value_index_int32(
        xtreme_settings->cycle_anims, cycle_anims_values, COUNT_OF(cycle_anims_names));
@@ -206,7 +206,7 @@ void xtreme_settings_scene_start_on_enter(void* context) {
    variable_item_set_current_value_text(item, cycle_anims_names[value_index]);

    item = variable_item_list_add(
-        var_item_list, "Unlock Anims", 2, xtreme_settings_scene_start_unlock_anims_changed, app);
+        var_item_list, "Unlock Anims", 2, xtreme_app_scene_main_unlock_anims_changed, app);
    variable_item_set_current_value_index(item, xtreme_settings->unlock_anims);
    variable_item_set_current_value_text(item, xtreme_settings->unlock_anims ? "ON" : "OFF");

@@ -214,7 +214,7 @@ void xtreme_settings_scene_start_on_enter(void* context) {
        var_item_list,
        "Battery Style",
        COUNT_OF(battery_style_names),
-        xtreme_settings_scene_start_battery_style_changed,
+        xtreme_app_scene_main_battery_style_changed,
        app);
    value_index = value_index_int32(
        xtreme_settings->battery_style, battery_style_values, COUNT_OF(battery_style_names));
@@ -222,7 +222,7 @@ void xtreme_settings_scene_start_on_enter(void* context) {
    variable_item_set_current_value_text(item, battery_style_names[value_index]);

    item = variable_item_list_add(
-        var_item_list, "Status Bar", 2, xtreme_settings_scene_start_status_bar_changed, app);
+        var_item_list, "Status Bar", 2, xtreme_app_scene_main_status_bar_changed, app);
    variable_item_set_current_value_index(item, xtreme_settings->status_bar);
    variable_item_set_current_value_text(item, xtreme_settings->status_bar ? "ON" : "OFF");

@@ -230,7 +230,7 @@ void xtreme_settings_scene_start_on_enter(void* context) {
        var_item_list,
        "Sort Dirs Before",
        2,
-        xtreme_settings_scene_start_sort_folders_before_changed,
+        xtreme_app_scene_main_sort_folders_before_changed,
        app);
    variable_item_set_current_value_index(item, !xtreme_settings->sort_ignore_dirs);
    variable_item_set_current_value_text(item, !xtreme_settings->sort_ignore_dirs ? "ON" : "OFF");
@@ -241,18 +241,18 @@ void xtreme_settings_scene_start_on_enter(void* context) {
        var_item_list,
        "XP Level",
        DOLPHIN_LEVEL_COUNT + 1,
-        xtreme_settings_scene_start_xp_level_changed,
+        xtreme_app_scene_main_xp_level_changed,
        app);
    variable_item_set_current_value_index(item, app->dolphin_level - 1);
    variable_item_set_current_value_text(item, level_str);

    item = variable_item_list_add(
-        var_item_list, "SubGHz Extend", 2, xtreme_settings_scene_start_subghz_extend_changed, app);
+        var_item_list, "SubGHz Extend", 2, xtreme_app_scene_main_subghz_extend_changed, app);
    variable_item_set_current_value_index(item, app->subghz_extend);
    variable_item_set_current_value_text(item, app->subghz_extend ? "ON" : "OFF");

    item = variable_item_list_add(
-        var_item_list, "SubGHz Bypass", 2, xtreme_settings_scene_start_subghz_bypass_changed, app);
+        var_item_list, "SubGHz Bypass", 2, xtreme_app_scene_main_subghz_bypass_changed, app);
    variable_item_set_current_value_index(item, app->subghz_bypass);
    variable_item_set_current_value_text(item, app->subghz_bypass ? "ON" : "OFF");

@@ -260,18 +260,18 @@ void xtreme_settings_scene_start_on_enter(void* context) {
        "%s  %s", version_get_gitbranchnum(NULL), version_get_builddate(NULL));
    item = variable_item_list_add(var_item_list, furi_string_get_cstr(version_tag), 0, NULL, app);

-    view_dispatcher_switch_to_view(app->view_dispatcher, XtremeSettingsAppViewVarItemList);
+    view_dispatcher_switch_to_view(app->view_dispatcher, XtremeAppViewVarItemList);
 }

-bool xtreme_settings_scene_start_on_event(void* context, SceneManagerEvent event) {
+bool xtreme_app_scene_main_on_event(void* context, SceneManagerEvent event) {
    UNUSED(context);
    UNUSED(event);
    bool consumed = false;
    return consumed;
 }

-void xtreme_settings_scene_start_on_exit(void* context) {
-    XtremeSettingsApp* app = context;
+void xtreme_app_scene_main_on_exit(void* context) {
+    XtremeApp* app = context;
    asset_packs_it_t it;
    for(asset_packs_it(it, app->asset_packs); !asset_packs_end_p(it); asset_packs_next(it)) {
        free(*asset_packs_cref(it));
@@ -1,19 +1,19 @@
-#include "xtreme_settings_app.h"
+#include "xtreme_app.h"

-static bool xtreme_settings_custom_event_callback(void* context, uint32_t event) {
+static bool xtreme_app_custom_event_callback(void* context, uint32_t event) {
    furi_assert(context);
-    XtremeSettingsApp* app = context;
+    XtremeApp* app = context;
    return scene_manager_handle_custom_event(app->scene_manager, event);
 }

-void xtreme_settings_reboot(void* context) {
+void xtreme_app_reboot(void* context) {
    UNUSED(context);
    power_reboot(PowerBootModeNormal);
 }

-static bool xtreme_settings_back_event_callback(void* context) {
+static bool xtreme_app_back_event_callback(void* context) {
    furi_assert(context);
-    XtremeSettingsApp* app = context;
+    XtremeApp* app = context;

    if(app->level_changed) {
        Dolphin* dolphin = furi_record_open(RECORD_DOLPHIN);
@@ -45,11 +45,11 @@ static bool xtreme_settings_back_event_callback(void* context) {
        if(app->assets_changed) {
            popup_set_header(app->popup, "Rebooting...", 64, 26, AlignCenter, AlignCenter);
            popup_set_text(app->popup, "Swapping assets...", 64, 40, AlignCenter, AlignCenter);
-            popup_set_callback(app->popup, xtreme_settings_reboot);
+            popup_set_callback(app->popup, xtreme_app_reboot);
            popup_set_context(app->popup, app);
            popup_set_timeout(app->popup, 1000);
            popup_enable_timeout(app->popup);
-            view_dispatcher_switch_to_view(app->view_dispatcher, XtremeSettingsAppViewPopup);
+            view_dispatcher_switch_to_view(app->view_dispatcher, XtremeAppViewPopup);
            return true;
        }
    }
@@ -57,20 +57,20 @@ static bool xtreme_settings_back_event_callback(void* context) {
    return scene_manager_handle_back_event(app->scene_manager);
 }

-XtremeSettingsApp* xtreme_settings_app_alloc() {
-    XtremeSettingsApp* app = malloc(sizeof(XtremeSettingsApp));
+XtremeApp* xtreme_app_alloc() {
+    XtremeApp* app = malloc(sizeof(XtremeApp));
    app->gui = furi_record_open(RECORD_GUI);

    // View Dispatcher and Scene Manager
    app->view_dispatcher = view_dispatcher_alloc();
-    app->scene_manager = scene_manager_alloc(&xtreme_settings_scene_handlers, app);
+    app->scene_manager = scene_manager_alloc(&xtreme_app_scene_handlers, app);
    view_dispatcher_enable_queue(app->view_dispatcher);
    view_dispatcher_set_event_callback_context(app->view_dispatcher, app);

    view_dispatcher_set_custom_event_callback(
-        app->view_dispatcher, xtreme_settings_custom_event_callback);
+        app->view_dispatcher, xtreme_app_custom_event_callback);
    view_dispatcher_set_navigation_event_callback(
-        app->view_dispatcher, xtreme_settings_back_event_callback);
+        app->view_dispatcher, xtreme_app_back_event_callback);

    view_dispatcher_attach_to_gui(app->view_dispatcher, app->gui, ViewDispatcherTypeFullscreen);

@@ -78,25 +78,23 @@ XtremeSettingsApp* xtreme_settings_app_alloc() {
    app->var_item_list = variable_item_list_alloc();
    view_dispatcher_add_view(
        app->view_dispatcher,
-        XtremeSettingsAppViewVarItemList,
+        XtremeAppViewVarItemList,
        variable_item_list_get_view(app->var_item_list));

    app->popup = popup_alloc();
    view_dispatcher_add_view(
-        app->view_dispatcher, XtremeSettingsAppViewPopup, popup_get_view(app->popup));
+        app->view_dispatcher, XtremeAppViewPopup, popup_get_view(app->popup));

-    // Set first scene
-    scene_manager_next_scene(app->scene_manager, XtremeSettingsAppSceneStart);
    return app;
 }

-void xtreme_settings_app_free(XtremeSettingsApp* app) {
+void xtreme_app_free(XtremeApp* app) {
    furi_assert(app);

    // Gui modules
-    view_dispatcher_remove_view(app->view_dispatcher, XtremeSettingsAppViewVarItemList);
+    view_dispatcher_remove_view(app->view_dispatcher, XtremeAppViewVarItemList);
    variable_item_list_free(app->var_item_list);
-    view_dispatcher_remove_view(app->view_dispatcher, XtremeSettingsAppViewPopup);
+    view_dispatcher_remove_view(app->view_dispatcher, XtremeAppViewPopup);
    popup_free(app->popup);

    // View Dispatcher and Scene Manager
@@ -108,10 +106,11 @@ void xtreme_settings_app_free(XtremeSettingsApp* app) {
    free(app);
 }

-extern int32_t xtreme_settings_app(void* p) {
+extern int32_t xtreme_app(void* p) {
    UNUSED(p);
-    XtremeSettingsApp* app = xtreme_settings_app_alloc();
+    XtremeApp* app = xtreme_app_alloc();
+    scene_manager_next_scene(app->scene_manager, XtremeAppSceneMain);
    view_dispatcher_run(app->view_dispatcher);
-    xtreme_settings_app_free(app);
+    xtreme_app_free(app);
    return 0;
 }
@@ -8,14 +8,14 @@
 #include <assets_icons.h>
 #include <gui/modules/variable_item_list.h>
 #include <gui/modules/popup.h>
-#include "xtreme_settings.h"
-#include "xtreme_assets.h"
-#include "scenes/xtreme_settings_scene.h"
+#include "scenes/xtreme_app_scene.h"
 #include "dolphin/helpers/dolphin_state.h"
 #include "dolphin/dolphin.h"
 #include "dolphin/dolphin_i.h"
 #include <lib/flipper_format/flipper_format.h>
 #include <m-array.h>
+#include "xtreme/settings.h"
+#include "xtreme/assets.h"

 ARRAY_DEF(asset_packs, char*)

@@ -33,9 +33,9 @@ typedef struct {
    bool subghz_changed;
    bool level_changed;
    asset_packs_t asset_packs;
-} XtremeSettingsApp;
+} XtremeApp;

 typedef enum {
-    XtremeSettingsAppViewVarItemList,
-    XtremeSettingsAppViewPopup,
-} XtremeSettingsAppView;
+    XtremeAppViewVarItemList,
+    XtremeAppViewPopup,
+} XtremeAppView;
@@ -1,30 +0,0 @@
-#include "xtreme_settings_scene.h"
-
-// Generate scene on_enter handlers array
-#define ADD_SCENE(prefix, name, id) prefix##_scene_##name##_on_enter,
-void (*const xtreme_settings_on_enter_handlers[])(void*) = {
-#include "xtreme_settings_scene_config.h"
-};
-#undef ADD_SCENE
-
-// Generate scene on_event handlers array
-#define ADD_SCENE(prefix, name, id) prefix##_scene_##name##_on_event,
-bool (*const xtreme_settings_on_event_handlers[])(void* context, SceneManagerEvent event) = {
-#include "xtreme_settings_scene_config.h"
-};
-#undef ADD_SCENE
-
-// Generate scene on_exit handlers array
-#define ADD_SCENE(prefix, name, id) prefix##_scene_##name##_on_exit,
-void (*const xtreme_settings_on_exit_handlers[])(void* context) = {
-#include "xtreme_settings_scene_config.h"
-};
-#undef ADD_SCENE
-
-// Initialize scene handlers configuration structure
-const SceneManagerHandlers xtreme_settings_scene_handlers = {
-    .on_enter_handlers = xtreme_settings_on_enter_handlers,
-    .on_event_handlers = xtreme_settings_on_event_handlers,
-    .on_exit_handlers = xtreme_settings_on_exit_handlers,
-    .scene_num = XtremeSettingsAppSceneNum,
-};
@@ -1 +0,0 @@
-ADD_SCENE(xtreme_settings, start, Start)