Merge branch 'main' into themes

4 files changed, 8 insertions, 2 deletions

diff --git a/src/ui/include/screen.hpp b/src/ui/include/screen.hpp
index 4241c712..40284fda 100644
--- a/src/ui/include/screen.hpp
+++ b/src/ui/include/screen.hpp
@@ -43,6 +43,8 @@ class Screen {
     return group_;
   }
 
+  virtual auto canPop() -> bool = 0;
+
  protected:
   lv_obj_t* const root_;
   lv_obj_t* content_;
diff --git a/src/ui/include/screen_lua.hpp b/src/ui/include/screen_lua.hpp
index 0ed3a508..41d97a1e 100644
--- a/src/ui/include/screen_lua.hpp
+++ b/src/ui/include/screen_lua.hpp
@@ -21,6 +21,8 @@ class Lua : public Screen {
   auto onShown() -> void override;
   auto onHidden() -> void override;
 
+  auto canPop() -> bool override;
+
   auto SetObjRef(lua_State*) -> void;
 
  private:
diff --git a/src/ui/include/screen_splash.hpp b/src/ui/include/screen_splash.hpp
index 1ee7dd89..6e746345 100644
--- a/src/ui/include/screen_splash.hpp
+++ b/src/ui/include/screen_splash.hpp
@@ -20,6 +20,8 @@ class Splash : public Screen {
   Splash();
   ~Splash();
 
+  auto canPop() -> bool override { return false; }
+
  private:
   lv_obj_t* container_;
   lv_obj_t* label_;
diff --git a/src/ui/include/ui_fsm.hpp b/src/ui/include/ui_fsm.hpp
index 579cc2bb..5e1cc487 100644
--- a/src/ui/include/ui_fsm.hpp
+++ b/src/ui/include/ui_fsm.hpp
@@ -57,8 +57,6 @@ class UiState : public tinyfsm::Fsm<UiState> {
   virtual void react(const system_fsm::StorageMounted&) {}
 
   void react(const system_fsm::BatteryStateChanged&);
-  void react(const audio::PlaybackStarted&);
-  void react(const audio::PlaybackStopped&);
   void react(const audio::PlaybackUpdate&);
   void react(const audio::QueueUpdate&);
 
@@ -132,6 +130,8 @@ class UiState : public tinyfsm::Fsm<UiState> {
   static lua::Property sLockSwitch;
 
   static lua::Property sDatabaseUpdating;
+
+  static lua::Property sUsbMassStorageEnabled;
 };
 
 namespace states {