Remove xtreme/private.h and rewire some things

lib/xtreme/assets.c

@@ -1,6 +1,6 @@
 #include "xtreme.h"
-#include "private.h"
 #include <furi_hal.h>
+#include <gui/icon_i.h>
 #include <assets_icons.h>
 #include <storage/storage.h>
 #include <core/dangerous_defines.h>

lib/xtreme/namespoof.h

@@ -3,3 +3,5 @@
 #define NAMESPOOF_HEADER "Flipper Name File"
 #define NAMESPOOF_VERSION 1
 #define NAMESPOOF_PATH EXT_PATH("dolphin/name.txt")
+
+void NAMESPOOF_INIT();

lib/xtreme/private.h

@@ -1,6 +0,0 @@
-#pragma once
-
-void NAMESPOOF_INIT();
-void XTREME_SETTINGS_LOAD();
-void XTREME_ASSETS_LOAD();
-void XTREME_ASSETS_FREE();

lib/xtreme/settings.c

@@ -1,5 +1,4 @@
 #include "xtreme.h"
-#include "private.h"
 #include <furi_hal.h>
 #include <flipper_format/flipper_format.h>
 

lib/xtreme/xtreme.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <gui/icon_i.h>
-#include <power/power_service/power.h>
+#include <stdint.h>
+#include <stdbool.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -12,6 +12,17 @@ extern "C" {
 #define XTREME_APPS_PATH CFG_PATH("xtreme_apps.txt")
 #define XTREME_ASSETS_PACK_NAME_LEN 32
 
+typedef enum {
+    BatteryIconOff,
+    BatteryIconBar,
+    BatteryIconPercent,
+    BatteryIconInvertedPercent,
+    BatteryIconRetro3,
+    BatteryIconRetro5,
+    BatteryIconBarPercent,
+    BatteryIconCount,
+} BatteryIcon;
+
 typedef struct {
     bool is_nsfw; // TODO: replace with packs text support
 
@@ -46,9 +57,13 @@ typedef struct {
     uint32_t charge_cap;
 } XtremeSettings;
 
+void XTREME_SETTINGS_LOAD();
 void XTREME_SETTINGS_SAVE();
 XtremeSettings* XTREME_SETTINGS();
 
+void XTREME_ASSETS_LOAD();
+void XTREME_ASSETS_FREE();
+
 #ifdef __cplusplus
 }
 #endif