5 files changed, 24 insertions, 22 deletions
diff --git a/src/ui/include/screen.hpp b/src/ui/include/screen.hpp
index 60939660..40284fda 100644
--- a/src/ui/include/screen.hpp
+++ b/src/ui/include/screen.hpp
@@ -27,6 +27,9 @@ class Screen {
   Screen();
   virtual ~Screen();
 
+  virtual auto onShown() -> void {}
+  virtual auto onHidden() -> void {}
+
   auto root() -> lv_obj_t* { return root_; }
   auto content() -> lv_obj_t* { return content_; }
   auto alert() -> lv_obj_t* { return alert_; }
@@ -40,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 ee9f6813..41d97a1e 100644
--- a/src/ui/include/screen_lua.hpp
+++ b/src/ui/include/screen_lua.hpp
@@ -18,6 +18,11 @@ class Lua : public Screen {
   Lua();
   ~Lua();
 
+  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/themes.hpp b/src/ui/include/themes.hpp
index 11680c0d..09b9cdce 100644
--- a/src/ui/include/themes.hpp
+++ b/src/ui/include/themes.hpp
@@ -1,5 +1,8 @@
 #pragma once
 
+#include <string>
+#include <map>
+#include <vector>
 #include "lvgl.h"
 
 namespace ui {
@@ -19,31 +22,17 @@ class Theme {
  public:
   void Apply(void);
   void Callback(lv_obj_t* obj);
-  void ApplyStyle(lv_obj_t* obj, Style style);
+  void ApplyStyle(lv_obj_t* obj, std::string style_key);
+
+  void AddStyle(std::string key, int selector, lv_style_t* style);
 
   static auto instance() -> Theme*;
 
  private:
   Theme();
-
-  lv_style_t base_style_;
-  lv_style_t base_focused_style_;
-
-  lv_style_t button_style_;
-  lv_style_t bar_style_;
-  lv_style_t dropdown_style_;
-  lv_style_t dropdown_list_style_;
-
-  lv_style_t slider_indicator_style_;
-  lv_style_t slider_knob_style_;
-  lv_style_t slider_knob_focused_style_;
-
-  lv_style_t switch_style_;
-  lv_style_t switch_indicator_style_;
-  lv_style_t switch_indicator_checked_style_;
-  lv_style_t switch_knob_style_;
-
+  std::map<std::string, std::vector<std::pair<int, lv_style_t*>>> style_map;
   lv_theme_t theme_;
+
 };
 }  // namespace themes
 }  // namespace ui
diff --git a/src/ui/include/ui_fsm.hpp b/src/ui/include/ui_fsm.hpp
index 6cf2ba4c..5e1cc487 100644
--- a/src/ui/include/ui_fsm.hpp
+++ b/src/ui/include/ui_fsm.hpp
@@ -36,7 +36,7 @@ namespace ui {
 
 class UiState : public tinyfsm::Fsm<UiState> {
  public:
-  static auto InitBootSplash(drivers::IGpios&) -> bool;
+  static auto InitBootSplash(drivers::IGpios&, drivers::NvsStorage&) -> bool;
 
   virtual ~UiState() {}
 
@@ -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&);
 
@@ -129,8 +127,11 @@ class UiState : public tinyfsm::Fsm<UiState> {
 
   static lua::Property sControlsScheme;
   static lua::Property sScrollSensitivity;
+  static lua::Property sLockSwitch;
 
   static lua::Property sDatabaseUpdating;
+
+  static lua::Property sUsbMassStorageEnabled;
 };
 
 namespace states {