Merge branch 'ofwdev' into 420

applications/services/bt/bt_service/bt.c

@@ -4,6 +4,7 @@
 
 #include <notification/notification_messages.h>
 #include <gui/elements.h>
+#include <assets_icons.h>
 
 #define TAG "BtSrv"
 

applications/services/desktop/views/desktop_view_lock_menu.c

@@ -1,6 +1,7 @@
 #include <furi.h>
 #include <gui/elements.h>
 #include <dolphin/dolphin.h>
+#include <assets_icons.h>
 
 #include "../desktop_i.h"
 #include "desktop_view_lock_menu.h"

applications/services/desktop/views/desktop_view_locked.c

@@ -4,6 +4,7 @@
 #include <gui/elements.h>
 #include <gui/icon.h>
 #include <gui/view.h>
+#include <assets_icons.h>
 #include <portmacro.h>
 
 #include <desktop/desktop_settings.h>

applications/services/desktop/views/desktop_view_pin_input.c

@@ -2,6 +2,7 @@
 #include <furi.h>
 #include <gui/view.h>
 #include <gui/elements.h>
+#include <assets_icons.h>
 #include <stdint.h>
 #include <portmacro.h>
 

applications/services/dialogs/dialogs_api.c

@@ -1,6 +1,7 @@
 #include "dialogs/dialogs_message.h"
 #include "dialogs_i.h"
 #include "dialogs_api_lock.h"
+#include <assets_icons.h>
 
 /****************** File browser ******************/
 

applications/services/gui/canvas.h

@@ -7,7 +7,7 @@
 
 #include <stdint.h>
 #include <gui/icon_animation.h>
-#include <assets_icons.h>
+#include <gui/icon.h>
 
 #ifdef __cplusplus
 extern "C" {

applications/services/gui/gui.c

@@ -1,5 +1,6 @@
 #include "gui/canvas.h"
 #include "gui_i.h"
+#include <assets_icons.h>
 
 #define TAG "GuiSrv"
 

applications/services/gui/icon_animation.h

@@ -7,7 +7,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <assets_icons.h>
+#include <gui/icon.h>
 
 #ifdef __cplusplus
 extern "C" {

applications/services/gui/modules/button_menu.c

@@ -5,6 +5,7 @@
 #include <m-array.h>
 #include <furi.h>
 #include <stdint.h>
+#include <assets_icons.h>
 
 #define ITEM_FIRST_OFFSET 17
 #define ITEM_NEXT_OFFSET 4

applications/services/gui/modules/byte_input.c

@@ -1,6 +1,7 @@
-#include "byte_input.h"
-#include <gui/elements.h>
 #include <furi.h>
+#include <gui/elements.h>
+#include <assets_icons.h>
+#include "byte_input.h"
 
 struct ByteInput {
     View* view;

applications/services/gui/modules/menu.c

@@ -2,6 +2,7 @@
 
 #include <m-array.h>
 #include <gui/elements.h>
+#include <assets_icons.h>
 #include <furi.h>
 
 struct Menu {

applications/services/gui/modules/text_input.c

@@ -1,5 +1,6 @@
 #include "text_input.h"
 #include <gui/elements.h>
+#include <assets_icons.h>
 #include <furi.h>
 
 struct TextInput {

applications/services/power/power_service/power_i.h

@@ -5,6 +5,7 @@
 #include <stdint.h>
 #include <gui/view_dispatcher.h>
 #include <gui/gui.h>
+#include <assets_icons.h>
 
 #include <gui/modules/popup.h>
 #include "views/power_off.h"

applications/services/power/power_service/views/power_off.c

@@ -1,6 +1,7 @@
 #include "power_off.h"
 #include <furi.h>
 #include <gui/elements.h>
+#include <assets_icons.h>
 
 struct PowerOff {
     View* view;

applications/services/power/power_service/views/power_unplug_usb.c

@@ -1,6 +1,7 @@
 #include "power_unplug_usb.h"
 #include <furi.h>
 #include <gui/elements.h>
+#include <assets_icons.h>
 
 struct PowerUnplugUsb {
     View* view;

applications/services/storage/storage.c

@@ -5,6 +5,7 @@
 #include "storage/storage_glue.h"
 #include "storages/storage_int.h"
 #include "storages/storage_ext.h"
+#include <assets_icons.h>
 
 #define STORAGE_TICK 1000