Merge remote-tracking branch 'ofw/dev' into mntm-dev

applications/services/desktop/desktop_i.h

@@ -1,6 +1,8 @@
 #pragma once
 
 #include "desktop.h"
+#include "desktop_settings.h"
+
 #include "animations/animation_manager.h"
 #include "views/desktop_view_pin_timeout.h"
 #include "views/desktop_view_pin_input.h"
@@ -9,9 +11,7 @@
 #include "views/desktop_view_lock_menu.h"
 #include "views/desktop_view_debug.h"
 #include "views/desktop_view_slideshow.h"
-#include <desktop/desktop_settings.h>
 
-#include <furi.h>
 #include <gui/gui.h>
 #include <gui/view_stack.h>
 #include <gui/view_dispatcher.h>
@@ -42,9 +42,8 @@ typedef struct {
 } DesktopClock;
 
 struct Desktop {
-    // Scene
     FuriThread* scene_thread;
-    // GUI
+
     Gui* gui;
     ViewDispatcher* view_dispatcher;
     SceneManager* scene_manager;
@@ -56,47 +55,42 @@ struct Desktop {
     DesktopMainView* main_view;
     DesktopViewPinTimeout* pin_timeout_view;
     DesktopSlideshowView* slideshow_view;
+    DesktopViewPinInput* pin_input_view;
 
     ViewStack* main_view_stack;
     ViewStack* locked_view_stack;
 
-    DesktopSettings settings;
-    DesktopViewPinInput* pin_input_view;
-
     ViewPort* lock_icon_viewport;
     ViewPort* _dummy_mode_icon_viewport; // Unused, kept for compatibility
     ViewPort* clock_viewport;
     ViewPort* stealth_mode_icon_viewport;
 
-    AnimationManager* animation_manager;
-
     Loader* loader;
+    Storage* storage;
     NotificationApp* notification;
 
-    FuriPubSubSubscription* app_start_stop_subscription;
+    FuriPubSub* status_pubsub;
     FuriPubSub* input_events_pubsub;
     FuriPubSubSubscription* input_events_subscription;
+
     FuriTimer* auto_lock_timer;
     FuriTimer* update_clock_timer;
 
-    FuriPubSub* status_pubsub;
-
-    DesktopClock clock;
-
-    bool in_transition : 1;
-    bool locked        : 1;
-
+    AnimationManager* animation_manager;
     FuriSemaphore* animation_semaphore;
 
-    Keybinds keybinds;
+    DesktopClock clock;
+    DesktopSettings settings;
 
+    bool in_transition;
+    bool app_running;
+    bool locked;
+
+    Keybinds keybinds;
     FuriPubSub* ascii_events_pubsub;
     FuriPubSubSubscription* ascii_events_subscription;
 };
 
-Desktop* desktop_alloc(void);
-
-void desktop_free(Desktop* desktop);
 void desktop_lock(Desktop* desktop, bool pin_lock);
 void desktop_unlock(Desktop* desktop);
 void desktop_set_stealth_mode_state(Desktop* desktop, bool enabled);