Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into mntm-dev

2026-05-12 18:08:36 -07:00 · 2024-06-04 03:01:51 +01:00
parent 9b748ea792 03196fa110
commit 23da827361
132 changed files with 120 additions and 188 deletions
--- a/applications/services/dialogs/dialogs.c
+++ b/applications/services/dialogs/dialogs.c
@@ -1,5 +1,4 @@
 #include "dialogs/dialogs_message.h"
-#include "dialogs_i.h"
 #include <toolbox/api_lock.h>
 #include "dialogs_module_file_browser.h"
 #include "dialogs_module_message.h"
--- a/applications/services/dialogs/dialogs_api.c
+++ b/applications/services/dialogs/dialogs_api.c
@@ -1,5 +1,4 @@
 #include "dialogs_message.h"
-#include "dialogs_i.h"
 #include <toolbox/api_lock.h>
 #include <assets_icons.h>
 #include <storage/storage.h>
--- a/applications/services/dialogs/dialogs_module_file_browser.c
+++ b/applications/services/dialogs/dialogs_module_file_browser.c
@@ -1,5 +1,4 @@
-#include "dialogs_i.h"
-
+#include "dialogs_message.h"
 #include <gui/modules/file_browser.h>
 #include <toolbox/api_lock.h>

--- a/applications/services/dialogs/dialogs_module_message.c
+++ b/applications/services/dialogs/dialogs_module_message.c
@@ -1,4 +1,6 @@
-#include "dialogs_i.h"
+#include "dialogs.h"
+#include "dialogs_message.h"
+#include <gui/view_holder.h>
 #include <toolbox/api_lock.h>
 #include <gui/modules/dialog_ex.h>