Skip to content

Commit cf01dcc

Browse files
committed
fix(build): normalize settings includes
1 parent 10accda commit cf01dcc

3 files changed

Lines changed: 328 additions & 307 deletions

File tree

app/apps/app_launcher/view/view.cpp

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,17 @@
44
* SPDX-License-Identifier: MIT
55
*/
66
#include "view.h"
7-
#include <lvgl.h>
7+
8+
#include <apps/utils/audio/audio.h>
9+
#include <assets/assets.h>
810
#include <hal/hal.h>
11+
#include <lvgl.h>
912
#include <mooncake_log.h>
10-
#include <assets/assets.h>
1113
#include <smooth_lvgl.h>
1214
#include <smooth_ui_toolkit.h>
13-
#include <apps/utils/audio/audio.h>
1415

15-
#include "custom/integration/settings_controller.h"
16-
#include "custom/ui/pages/ui_page_settings.h"
16+
#include "integration/settings_controller.h"
17+
#include "ui/pages/ui_page_settings.h"
1718
#include "ui/ui_root.h"
1819

1920
using namespace launcher_view;
@@ -57,17 +58,20 @@ void LauncherView::init()
5758
_panels.push_back(std::make_unique<PanelMusic>());
5859
_panels.push_back(std::make_unique<PanelComMonitor>());
5960

60-
for (auto& panel : _panels) {
61+
for (auto& panel : _panels)
62+
{
6163
panel->init();
6264
}
6365

64-
if (_ui_root != nullptr) {
66+
if (_ui_root != nullptr)
67+
{
6568
_settings_controller.reset();
6669
ui_root_destroy(_ui_root);
6770
_ui_root = nullptr;
6871
}
6972
_ui_root = ui_root_create();
70-
if (_ui_root != nullptr) {
73+
if (_ui_root != nullptr)
74+
{
7175
_settings_controller = std::make_unique<SettingsController>();
7276

7377
ui_page_settings_actions_t actions{};
@@ -185,15 +189,17 @@ void LauncherView::update()
185189
{
186190
LvglLockGuard lock;
187191

188-
for (auto& panel : _panels) {
192+
for (auto& panel : _panels)
193+
{
189194
panel->update(_is_stacked);
190195
}
191196
}
192197

193198
LauncherView::~LauncherView()
194199
{
195200
_settings_controller.reset();
196-
if (_ui_root != nullptr) {
201+
if (_ui_root != nullptr)
202+
{
197203
ui_root_destroy(_ui_root);
198204
_ui_root = nullptr;
199205
}

0 commit comments

Comments
 (0)