Convert the main menu screen to lua lol

10 files changed, 129 insertions, 169 deletions

diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index 8d3640e6..00b1f1f5 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -3,15 +3,15 @@
 # SPDX-License-Identifier: GPL-3.0-only
 
 idf_component_register(
-  SRCS "lvgl_task.cpp" "ui_fsm.cpp" "screen_splash.cpp" "screen_menu.cpp"
+  SRCS "lvgl_task.cpp" "ui_fsm.cpp" "screen_splash.cpp"
   "encoder_input.cpp" "screen_track_browser.cpp" "screen_playing.cpp"
   "themes.cpp" "widget_top_bar.cpp" "screen.cpp" "screen_onboarding.cpp"
   "modal_progress.cpp" "modal.cpp" "modal_confirm.cpp" "screen_settings.cpp"
-  "event_binding.cpp" "modal_add_to_queue.cpp"
+  "event_binding.cpp" "modal_add_to_queue.cpp" "screen_lua.cpp"
   "splash.c" "font_fusion.c" "font_symbols.c"
   "icons/battery_empty.c" "icons/battery_full.c" "icons/battery_20.c"
   "icons/battery_40.c" "icons/battery_60.c" "icons/battery_80.c" "icons/play.c"
   "icons/pause.c" "icons/bluetooth.c"
   INCLUDE_DIRS "include"
-  REQUIRES "drivers" "lvgl" "tinyfsm" "events" "system_fsm" "database" "esp_timer" "battery" "bindey")
+  REQUIRES "drivers" "lvgl" "tinyfsm" "events" "system_fsm" "database" "esp_timer" "battery" "bindey" "lua" "luavgl")
 target_compile_options(${COMPONENT_LIB} PRIVATE ${EXTRA_WARNINGS})
diff --git a/src/ui/include/screen_lua.hpp b/src/ui/include/screen_lua.hpp
new file mode 100644
index 00000000..df83ea8b
--- /dev/null
+++ b/src/ui/include/screen_lua.hpp
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2023 jacqueline <me@jacqueline.id.au>
+ *
+ * SPDX-License-Identifier: GPL-3.0-only
+ */
+
+#pragma once
+
+#include "lua.hpp"
+
+#include "screen.hpp"
+
+namespace ui {
+namespace screens {
+
+class Lua : public Screen {
+ public:
+  explicit Lua(lua_State* l);
+};
+
+}  // namespace screens
+}  // namespace ui
diff --git a/src/ui/include/screen_menu.hpp b/src/ui/include/screen_menu.hpp
deleted file mode 100644
index a83346f6..00000000
--- a/src/ui/include/screen_menu.hpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2023 jacqueline <me@jacqueline.id.au>
- *
- * SPDX-License-Identifier: GPL-3.0-only
- */
-
-#pragma once
-
-#include <memory>
-#include <vector>
-
-#include "index.hpp"
-#include "lvgl.h"
-
-#include "model_top_bar.hpp"
-#include "screen.hpp"
-#include "screen_settings.hpp"
-
-namespace ui {
-namespace screens {
-
-class Menu : public MenuScreen {
- public:
-  explicit Menu(models::TopBar&, std::vector<database::IndexInfo> indexes);
-  ~Menu();
-
- private:
-  std::vector<database::IndexInfo> indexes_;
-  lv_obj_t* container_;
-  lv_obj_t* label_;
-};
-
-}  // namespace screens
-}  // namespace ui
diff --git a/src/ui/include/ui_events.hpp b/src/ui/include/ui_events.hpp
index 2bee6222..b8dd459c 100644
--- a/src/ui/include/ui_events.hpp
+++ b/src/ui/include/ui_events.hpp
@@ -35,7 +35,7 @@ struct RecordSelected : tinyfsm::Event {
 };
 
 struct IndexSelected : tinyfsm::Event {
-  database::IndexInfo index;
+  database::IndexId id;
 };
 
 struct ControlSchemeChanged : tinyfsm::Event {};
diff --git a/src/ui/include/ui_fsm.hpp b/src/ui/include/ui_fsm.hpp
index da63b77f..7d1d62d6 100644
--- a/src/ui/include/ui_fsm.hpp
+++ b/src/ui/include/ui_fsm.hpp
@@ -16,6 +16,7 @@
 #include "bindey/property.h"
 #include "db_events.hpp"
 #include "gpios.hpp"
+#include "lua_thread.hpp"
 #include "lvgl_task.hpp"
 #include "model_playback.hpp"
 #include "model_top_bar.hpp"
@@ -89,7 +90,7 @@ class UiState : public tinyfsm::Fsm<UiState> {
 
  protected:
   void PushScreen(std::shared_ptr<Screen>);
-  void PopScreen();
+  int PopScreen();
 
   static std::unique_ptr<UiTask> sTask;
   static std::shared_ptr<system_fsm::ServiceLocator> sServices;
@@ -99,6 +100,9 @@ class UiState : public tinyfsm::Fsm<UiState> {
   static std::stack<std::shared_ptr<Screen>> sScreens;
   static std::shared_ptr<Screen> sCurrentScreen;
   static std::shared_ptr<Modal> sCurrentModal;
+  static std::shared_ptr<lua::LuaThread> sLua;
+
+  static std::weak_ptr<screens::Bluetooth> bluetooth_screen_;
 
   static models::Playback sPlaybackModel;
   static models::TopBar sTopBarModel;
@@ -110,6 +114,19 @@ class Splash : public UiState {
  public:
   void exit() override;
   void react(const system_fsm::BootComplete&) override;
+  void react(const system_fsm::StorageMounted&) override;
+  using UiState::react;
+};
+
+class Lua : public UiState {
+ public:
+  void entry() override;
+  void exit() override;
+
+  void react(const internal::IndexSelected&) override;
+  void react(const internal::ShowNowPlaying&) override;
+  void react(const internal::ShowSettingsPage&) override;
+
   using UiState::react;
 };
 
@@ -131,20 +148,15 @@ class Browse : public UiState {
   void entry() override;
 
   void react(const internal::RecordSelected&) override;
-  void react(const internal::IndexSelected&) override;
   void react(const internal::BackPressed&) override;
 
   void react(const internal::ShowNowPlaying&) override;
   void react(const internal::ShowSettingsPage&) override;
   void react(const internal::ReindexDatabase&) override;
 
-  void react(const system_fsm::StorageMounted&) override;
   void react(const system_fsm::BluetoothDevicesChanged&) override;
 
   using UiState::react;
-
- private:
-  std::weak_ptr<screens::Bluetooth> bluetooth_screen_;
 };
 
 class Playing : public UiState {
diff --git a/src/ui/lvgl_task.cpp b/src/ui/lvgl_task.cpp
index 817ed185..96f9bdf5 100644
--- a/src/ui/lvgl_task.cpp
+++ b/src/ui/lvgl_task.cpp
@@ -30,6 +30,7 @@
 #include "hal/gpio_types.h"
 #include "hal/lv_hal_indev.h"
 #include "hal/spi_types.h"
+#include "lua.h"
 #include "lv_api_map.h"
 #include "lvgl/lvgl.h"
 #include "misc/lv_color.h"
diff --git a/src/ui/screen_lua.cpp b/src/ui/screen_lua.cpp
new file mode 100644
index 00000000..cee5186e
--- /dev/null
+++ b/src/ui/screen_lua.cpp
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2023 jacqueline <me@jacqueline.id.au>
+ *
+ * SPDX-License-Identifier: GPL-3.0-only
+ */
+
+#include "screen_lua.hpp"
+
+#include "lua.hpp"
+#include "luavgl.h"
+
+namespace ui {
+namespace screens {
+
+Lua::Lua(lua_State* l) {
+}
+
+}  // namespace screens
+}  // namespace ui
diff --git a/src/ui/screen_menu.cpp b/src/ui/screen_menu.cpp
deleted file mode 100644
index 037e1156..00000000
--- a/src/ui/screen_menu.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright 2023 jacqueline <me@jacqueline.id.au>
- *
- * SPDX-License-Identifier: GPL-3.0-only
- */
-
-#include "screen_menu.hpp"
-
-#include "core/lv_event.h"
-#include "esp_log.h"
-
-#include "core/lv_group.h"
-#include "core/lv_obj_pos.h"
-#include "event_queue.hpp"
-#include "extra/widgets/list/lv_list.h"
-#include "extra/widgets/menu/lv_menu.h"
-#include "extra/widgets/spinner/lv_spinner.h"
-#include "hal/lv_hal_disp.h"
-#include "index.hpp"
-#include "lv_api_map.h"
-#include "misc/lv_area.h"
-#include "model_top_bar.hpp"
-#include "ui_events.hpp"
-#include "ui_fsm.hpp"
-#include "widget_top_bar.hpp"
-#include "widgets/lv_label.h"
-
-namespace ui {
-namespace screens {
-
-static void now_playing_click_cb(lv_event_t* ev) {
-  events::Ui().Dispatch(internal::ShowNowPlaying{});
-}
-
-static void settings_click_callback(lv_event_t* ev) {
-  events::Ui().Dispatch(internal::ShowSettingsPage{
-      .page = internal::ShowSettingsPage::Page::kRoot});
-}
-
-static void index_click_cb(lv_event_t* ev) {
-  if (ev->user_data == NULL) {
-    return;
-  }
-  database::IndexInfo* index =
-      reinterpret_cast<database::IndexInfo*>(ev->user_data);
-
-  events::Ui().Dispatch(internal::IndexSelected{.index = *index});
-}
-
-Menu::Menu(models::TopBar& top_bar, std::vector<database::IndexInfo> indexes)
-    : MenuScreen(top_bar, " ", false), indexes_(indexes) {
-  lv_obj_t* list = lv_list_create(content_);
-  lv_obj_set_size(list, lv_pct(100), lv_pct(100));
-
-  lv_obj_t* now_playing = lv_list_add_btn(list, NULL, "Now Playing");
-  lv_obj_add_event_cb(now_playing, now_playing_click_cb, LV_EVENT_CLICKED,
-                      NULL);
-  lv_group_add_obj(group_, now_playing);
-
-  for (database::IndexInfo& index : indexes_) {
-    lv_obj_t* item = lv_list_add_btn(list, NULL, index.name.c_str());
-    lv_obj_add_event_cb(item, index_click_cb, LV_EVENT_CLICKED, &index);
-    lv_group_add_obj(group_, item);
-  }
-
-  lv_obj_t* settings = lv_list_add_btn(list, NULL, "Settings");
-  lv_obj_add_event_cb(settings, settings_click_callback, LV_EVENT_CLICKED,
-                      NULL);
-  lv_group_add_obj(group_, settings);
-}
-
-Menu::~Menu() {}
-
-}  // namespace screens
-}  // namespace ui
diff --git a/src/ui/screen_track_browser.cpp b/src/ui/screen_track_browser.cpp
index 34abf17e..c7b035ad 100644
--- a/src/ui/screen_track_browser.cpp
+++ b/src/ui/screen_track_browser.cpp
@@ -18,7 +18,6 @@
 #include "misc/lv_anim.h"
 #include "misc/lv_color.h"
 #include "model_top_bar.hpp"
-#include "screen_menu.hpp"
 
 #include "core/lv_event.h"
 #include "esp_log.h"
diff --git a/src/ui/ui_fsm.cpp b/src/ui/ui_fsm.cpp
index 8d3fa20d..748e08f9 100644
--- a/src/ui/ui_fsm.cpp
+++ b/src/ui/ui_fsm.cpp
@@ -10,9 +10,16 @@
 
 #include "audio_fsm.hpp"
 #include "battery.hpp"
+#include "core/lv_group.h"
 #include "core/lv_obj.h"
+#include "core/lv_obj_tree.h"
 #include "database.hpp"
+#include "esp_heap_caps.h"
 #include "haptics.hpp"
+#include "lauxlib.h"
+#include "lua.hpp"
+#include "lua_thread.hpp"
+#include "luavgl.h"
 #include "misc/lv_gc.h"
 
 #include "audio_events.hpp"
@@ -28,19 +35,21 @@
 #include "nvs.hpp"
 #include "relative_wheel.hpp"
 #include "screen.hpp"
-#include "screen_menu.hpp"
+#include "screen_lua.hpp"
 #include "screen_onboarding.hpp"
 #include "screen_playing.hpp"
 #include "screen_settings.hpp"
 #include "screen_splash.hpp"
 #include "screen_track_browser.hpp"
 #include "source.hpp"
+#include "spiffs.hpp"
 #include "storage.hpp"
 #include "system_events.hpp"
 #include "touchwheel.hpp"
 #include "track_queue.hpp"
 #include "ui_events.hpp"
 #include "widget_top_bar.hpp"
+#include "widgets/lv_label.h"
 
 namespace ui {
 
@@ -56,6 +65,9 @@ std::shared_ptr<EncoderInput> UiState::sInput;
 std::stack<std::shared_ptr<Screen>> UiState::sScreens;
 std::shared_ptr<Screen> UiState::sCurrentScreen;
 std::shared_ptr<Modal> UiState::sCurrentModal;
+std::shared_ptr<lua::LuaThread> UiState::sLua;
+
+std::weak_ptr<screens::Bluetooth> UiState::bluetooth_screen_;
 
 models::Playback UiState::sPlaybackModel;
 models::TopBar UiState::sTopBarModel{{},
@@ -83,12 +95,13 @@ void UiState::PushScreen(std::shared_ptr<Screen> screen) {
   sCurrentScreen = screen;
 }
 
-void UiState::PopScreen() {
+int UiState::PopScreen() {
   if (sScreens.empty()) {
-    return;
+    return 0;
   }
   sCurrentScreen = sScreens.top();
   sScreens.pop();
+  return sScreens.size();
 }
 
 void UiState::react(const system_fsm::KeyLockChanged& ev) {
@@ -159,12 +172,48 @@ void Splash::react(const system_fsm::BootComplete& ev) {
   } else {
     ESP_LOGE(kTag, "no input devices initialised!");
   }
+}
 
-  if (sServices->nvs().HasShownOnboarding()) {
-    transit<Browse>();
-  } else {
-    transit<Onboarding>();
+void Splash::react(const system_fsm::StorageMounted&) {
+  transit<Lua>();
+}
+
+void Lua::entry() {
+  if (!sLua) {
+    sCurrentScreen.reset(new Screen());
+    lv_group_set_default(sCurrentScreen->group());
+
+    sLua.reset(lua::LuaThread::Start(*sServices, sCurrentScreen->content()));
+    sLua->RunScript("/lua/main.lua");
+
+    lv_group_set_default(NULL);
+  }
+}
+
+void Lua::exit() {}
+
+void Lua::react(const internal::IndexSelected& ev) {
+  auto db = sServices->database().lock();
+  if (!db) {
+    return;
   }
+
+  ESP_LOGI(kTag, "selected index %u", ev.id);
+  auto query = db->GetTracksByIndex(ev.id, kRecordsPerPage);
+  std::pmr::vector<std::pmr::string> crumbs = {""};
+  PushScreen(std::make_shared<screens::TrackBrowser>(
+      sTopBarModel, sServices->track_queue(), sServices->database(), crumbs,
+      std::move(query)));
+  transit<Browse>();
+}
+
+void Lua::react(const internal::ShowNowPlaying&) {
+  transit<Playing>();
+}
+
+void Lua::react(const internal::ShowSettingsPage& ev) {
+  PushScreen(std::shared_ptr<Screen>(new screens::Settings(sTopBarModel)));
+  transit<Browse>();
 }
 
 void Onboarding::entry() {
@@ -218,31 +267,7 @@ void Onboarding::react(const internal::OnboardingNavigate& ev) {
   }
 }
 
-static bool sBrowseFirstEntry = true;
-
-void Browse::entry() {
-  if (sBrowseFirstEntry) {
-    auto db = sServices->database().lock();
-    if (!db) {
-      return;
-    }
-    sCurrentScreen =
-        std::make_shared<screens::Menu>(sTopBarModel, db->GetIndexes());
-    sBrowseFirstEntry = false;
-  }
-}
-
-void Browse::react(const system_fsm::StorageMounted& ev) {
-  if (sBrowseFirstEntry) {
-    auto db = sServices->database().lock();
-    if (!db) {
-      return;
-    }
-    sCurrentScreen =
-        std::make_shared<screens::Menu>(sTopBarModel, db->GetIndexes());
-    sBrowseFirstEntry = false;
-  }
-}
+void Browse::entry() {}
 
 void Browse::react(const internal::ShowNowPlaying& ev) {
   transit<Playing>();
@@ -327,22 +352,10 @@ void Browse::react(const internal::RecordSelected& ev) {
   }
 }
 
-void Browse::react(const internal::IndexSelected& ev) {
-  auto db = sServices->database().lock();
-  if (!db) {
-    return;
-  }
-
-  ESP_LOGI(kTag, "selected index %s", ev.index.name.c_str());
-  auto query = db->GetTracksByIndex(ev.index, kRecordsPerPage);
-  std::pmr::vector<std::pmr::string> crumbs = {ev.index.name};
-  PushScreen(std::make_shared<screens::TrackBrowser>(
-      sTopBarModel, sServices->track_queue(), sServices->database(), crumbs,
-      std::move(query)));
-}
-
 void Browse::react(const internal::BackPressed& ev) {
-  PopScreen();
+  if (PopScreen() == 0) {
+    transit<Lua>();
+  }
 }
 
 void Browse::react(const system_fsm::BluetoothDevicesChanged&) {
@@ -368,11 +381,14 @@ void Playing::entry() {
 
 void Playing::exit() {
   sPlayingScreen.reset();
-  PopScreen();
 }
 
 void Playing::react(const internal::BackPressed& ev) {
-  transit<Browse>();
+  if (PopScreen() == 0) {
+    transit<Lua>();
+  } else {
+    transit<Browse>();
+  }
 }
 
 static std::shared_ptr<modals::Progress> sIndexProgress;