Fix flashing (#3188)

Fixed some bugs

firmware/application/ui_navigation.hpp

@@ -50,6 +50,7 @@
 #include "lfsr_random.hpp"
 #include "sd_card.hpp"
 #include "external_app.hpp"
+#include "view_factory.hpp"
 #include "battery.hpp"
 
 // for incrementing fake date when RTC battery is dead
@@ -59,9 +60,6 @@ using namespace sd_card;
 
 namespace ui {
 
-class NavigationView;
-using ViewProducer = std::unique_ptr<View> (*)(NavigationView&);
-
 void add_apps(NavigationView& nav, BtnGridView& grid, app_location_t loc);
 void add_external_items(NavigationView& nav, app_location_t location, BtnGridView& grid, uint8_t error_tile_pos, bool show_error_tile = true);
 
@@ -71,7 +69,7 @@ enum modal_t {
     ABORT
 };
 
-// Should only be used as part of the appList in NavigationView.
+// Should only be used as part of the appList in NavigationView, the viewFactory will never be destroyed.
 class AppInfo {
    public:
     const char* id;  // MUST be unique! Used by serial command to start the app so it also has to make sense
@@ -79,7 +77,7 @@ class AppInfo {
     app_location_t menuLocation;
     Color iconColor;
     const Bitmap* icon;
-    ViewProducer producer;
+    ViewFactoryBase* viewFactory;  // Never destroyed, and I believe it's ok ;) Having a unique_ptr here breaks the initializer list of appList
 };
 
 struct AppInfoConsole {
@@ -140,13 +138,6 @@ class NavigationView : public View {
     bool StartAppByName(const char* name);  // Starts a View  (app) by name stored in appListFC. This is to start apps from console
     void handle_autostart();
 
-    void store_last_menu_name(const std::string& name) { last_menu_name_ = name; }
-    std::string get_last_menu_name() const { return last_menu_name_; }
-    size_t view_stack_size() const { return view_stack.size(); }
-
-    bool get_last_menu_went_deeper() { return last_menu_went_deeper; }
-    void set_last_menu_went_deeper(bool went_deeper) { last_menu_went_deeper = went_deeper; }
-
    private:
     struct ViewState {
         std::unique_ptr<View> view;
@@ -159,8 +150,6 @@ class NavigationView : public View {
 
     void free_view();
     void update_view();
-    std::string last_menu_name_{};  // this stores the last menu name, when we replace the menu with the app, we'll know, where to navigate back
-    bool last_menu_went_deeper = false;
 };
 
 /* Holds widgets and grows dynamically toward the left.