From d09a8f25172326234ea76c8f0f7212c1db94eb4e Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Thu, 7 Mar 2024 23:27:55 +0000
Subject: [PATCH] Fix some imports

---
 applications/main/momentum_app/momentum_app.c            | 2 ++
 applications/main/momentum_app/momentum_app.h            | 2 ++
 .../momentum_app/scenes/momentum_app_scene_misc_screen.c | 9 ++++-----
 .../scenes/momentum_app_scene_misc_screen_color.c        | 4 ++++
 targets/f7/furi_hal/furi_hal_info.c                      | 9 ++++-----
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/applications/main/momentum_app/momentum_app.c b/applications/main/momentum_app/momentum_app.c
index 3692b08ae..550236445 100644
--- a/applications/main/momentum_app/momentum_app.c
+++ b/applications/main/momentum_app/momentum_app.c
@@ -163,6 +163,7 @@ MomentumApp* momentum_app_alloc() {
     MomentumApp* app = malloc(sizeof(MomentumApp));
     app->gui = furi_record_open(RECORD_GUI);
     app->dialogs = furi_record_open(RECORD_DIALOGS);
+    app->expansion = furi_record_open(RECORD_EXPANSION);
     app->notification = furi_record_open(RECORD_NOTIFICATION);
 
     // View Dispatcher and Scene Manager
@@ -361,6 +362,7 @@ void momentum_app_free(MomentumApp* app) {
 
     // Records
     furi_record_close(RECORD_NOTIFICATION);
+    furi_record_close(RECORD_EXPANSION);
     furi_record_close(RECORD_DIALOGS);
     furi_record_close(RECORD_GUI);
     free(app);
diff --git a/applications/main/momentum_app/momentum_app.h b/applications/main/momentum_app/momentum_app.h
index 67981177a..349364786 100644
--- a/applications/main/momentum_app/momentum_app.h
+++ b/applications/main/momentum_app/momentum_app.h
@@ -25,6 +25,7 @@
 #include <flipper_application/flipper_application.h>
 #include <notification/notification_app.h>
 #include <power/power_service/power.h>
+#include <expansion/expansion.h>
 #include <rgb_backlight.h>
 #include <m-array.h>
 #include <momentum/namespoof.h>
@@ -35,6 +36,7 @@ ARRAY_DEF(CharList, char*)
 typedef struct {
     Gui* gui;
     DialogsApp* dialogs;
+    Expansion* expansion;
     NotificationApp* notification;
     SceneManager* scene_manager;
     ViewDispatcher* view_dispatcher;
diff --git a/applications/main/momentum_app/scenes/momentum_app_scene_misc_screen.c b/applications/main/momentum_app/scenes/momentum_app_scene_misc_screen.c
index 4f39c38c0..945a3c724 100644
--- a/applications/main/momentum_app/scenes/momentum_app_scene_misc_screen.c
+++ b/applications/main/momentum_app/scenes/momentum_app_scene_misc_screen.c
@@ -1,4 +1,3 @@
-#include <expansion/expansion.h>
 #include "../momentum_app.h"
 
 enum VarItemListIndex {
@@ -56,10 +55,10 @@ static void momentum_app_scene_misc_screen_lcd_color_changed(VariableItem* item,
     variable_item_set_current_value_text(item, lcd_colors[index].name);
     rgb_backlight_set_color(led, &lcd_colors[index].color);
     app->save_backlight = true;
-
-    Expansion* expansion = furi_record_open(RECORD_EXPANSION);
-    expansion_disable(expansion);
-    expansion_enable(expansion);
+    if(momentum_settings.vgm_color_mode == VgmColorModeRgbBacklight) {
+        expansion_disable(app->expansion);
+        expansion_enable(app->expansion);
+    }
 }
 static void momentum_app_scene_misc_screen_lcd_color_0_changed(VariableItem* item) {
     momentum_app_scene_misc_screen_lcd_color_changed(item, 0);
diff --git a/applications/main/momentum_app/scenes/momentum_app_scene_misc_screen_color.c b/applications/main/momentum_app/scenes/momentum_app_scene_misc_screen_color.c
index a62dfa888..bf7840275 100644
--- a/applications/main/momentum_app/scenes/momentum_app_scene_misc_screen_color.c
+++ b/applications/main/momentum_app/scenes/momentum_app_scene_misc_screen_color.c
@@ -43,6 +43,10 @@ bool momentum_app_scene_misc_screen_color_on_event(void* context, SceneManagerEv
                 scene_manager_get_scene_state(app->scene_manager, MomentumAppSceneMiscScreenColor),
                 &app->lcd_color);
             app->save_backlight = true;
+            if(momentum_settings.vgm_color_mode == VgmColorModeRgbBacklight) {
+                expansion_disable(app->expansion);
+                expansion_enable(app->expansion);
+            }
             scene_manager_previous_scene(app->scene_manager);
             break;
         default:
diff --git a/targets/f7/furi_hal/furi_hal_info.c b/targets/f7/furi_hal/furi_hal_info.c
index 3780c96e1..9b9298b78 100644
--- a/targets/f7/furi_hal/furi_hal_info.c
+++ b/targets/f7/furi_hal/furi_hal_info.c
@@ -1,6 +1,3 @@
-#include "SK6805.h"
-#include "colors.h"
-#include "property.h"
 #include <furi_hal_info.h>
 #include <furi_hal_region.h>
 #include <furi_hal_version.h>
@@ -12,8 +9,10 @@
 #include <furi.h>
 #include <protobuf_version.h>
 
-#include "momentum/momentum.h"
-#include "rgb_backlight.h"
+#include <momentum/momentum.h>
+#include <rgb_backlight.h>
+#include <SK6805.h>
+#include <colors.h>
 #include <stdint.h>
 
 FURI_WEAK void furi_hal_info_get_api_version(uint16_t* major, uint16_t* minor) {