std::string -> std::pmr::string in psram

15 files changed, 24 insertions, 18 deletions

diff --git a/src/ui/include/modal_confirm.hpp b/src/ui/include/modal_confirm.hpp
index 4be6b68e..29d80041 100644
--- a/src/ui/include/modal_confirm.hpp
+++ b/src/ui/include/modal_confirm.hpp
@@ -19,7 +19,7 @@ namespace modals {
 
 class Confirm : public Modal {
  public:
-  Confirm(Screen*, const std::string& title, bool has_cancel);
+  Confirm(Screen*, const std::pmr::string& title, bool has_cancel);
 
  private:
   lv_obj_t* container_;
diff --git a/src/ui/include/modal_progress.hpp b/src/ui/include/modal_progress.hpp
index 96897029..f312d509 100644
--- a/src/ui/include/modal_progress.hpp
+++ b/src/ui/include/modal_progress.hpp
@@ -19,7 +19,7 @@ namespace modals {
 
 class Progress : public Modal {
  public:
-  Progress(Screen*, std::string title);
+  Progress(Screen*, std::pmr::string title);
 
  private:
   lv_obj_t* container_;
diff --git a/src/ui/include/screen.hpp b/src/ui/include/screen.hpp
index f93d17a5..76251a72 100644
--- a/src/ui/include/screen.hpp
+++ b/src/ui/include/screen.hpp
@@ -64,7 +64,7 @@ class Screen {
 
 class MenuScreen : public Screen {
  public:
-  MenuScreen(const std::string& title, bool show_back_button = true);
+  MenuScreen(const std::pmr::string& title, bool show_back_button = true);
 };
 
 }  // namespace ui
diff --git a/src/ui/include/screen_onboarding.hpp b/src/ui/include/screen_onboarding.hpp
index 81ce6d3a..0c3c61fb 100644
--- a/src/ui/include/screen_onboarding.hpp
+++ b/src/ui/include/screen_onboarding.hpp
@@ -18,7 +18,7 @@ namespace screens {
 
 class Onboarding : public Screen {
  public:
-  Onboarding(const std::string& title, bool show_prev, bool show_next);
+  Onboarding(const std::pmr::string& title, bool show_prev, bool show_next);
 
  private:
   lv_obj_t* window_;
diff --git a/src/ui/include/screen_playing.hpp b/src/ui/include/screen_playing.hpp
index f2998c88..2e29130c 100644
--- a/src/ui/include/screen_playing.hpp
+++ b/src/ui/include/screen_playing.hpp
@@ -45,7 +45,8 @@ class Playing : public Screen {
 
  private:
   auto control_button(lv_obj_t* parent, char* icon) -> lv_obj_t*;
-  auto next_up_label(lv_obj_t* parent, const std::string& text) -> lv_obj_t*;
+  auto next_up_label(lv_obj_t* parent, const std::pmr::string& text)
+      -> lv_obj_t*;
 
   auto BindTrack(const database::Track& track) -> void;
   auto ApplyNextUp(const std::vector<database::Track>& tracks) -> void;
diff --git a/src/ui/include/screen_track_browser.hpp b/src/ui/include/screen_track_browser.hpp
index 3d347158..fdeb3afe 100644
--- a/src/ui/include/screen_track_browser.hpp
+++ b/src/ui/include/screen_track_browser.hpp
@@ -23,7 +23,7 @@ class TrackBrowser : public Screen {
  public:
   TrackBrowser(
       std::weak_ptr<database::Database> db,
-      const std::string& title,
+      const std::pmr::string& title,
       std::future<database::Result<database::IndexRecord>*>&& initial_page);
   ~TrackBrowser() {}
 
diff --git a/src/ui/include/widget_top_bar.hpp b/src/ui/include/widget_top_bar.hpp
index 87920338..1a2c826a 100644
--- a/src/ui/include/widget_top_bar.hpp
+++ b/src/ui/include/widget_top_bar.hpp
@@ -11,6 +11,8 @@
 
 #include "lvgl.h"
 
+#include "memory_resource.hpp"
+
 namespace ui {
 
 namespace widgets {
@@ -19,7 +21,7 @@ class TopBar {
  public:
   struct Configuration {
     bool show_back_button;
-    std::string title;
+    std::pmr::string title;
   };
 
   enum class PlaybackState {
diff --git a/src/ui/modal_confirm.cpp b/src/ui/modal_confirm.cpp
index 14d56123..dfb1b1eb 100644
--- a/src/ui/modal_confirm.cpp
+++ b/src/ui/modal_confirm.cpp
@@ -37,7 +37,9 @@ static void button_confirm_cb(lv_event_t* e) {
   events::Ui().Dispatch(internal::ModalConfirmPressed{});
 }
 
-Confirm::Confirm(Screen* host, const std::string& title_text, bool has_cancel)
+Confirm::Confirm(Screen* host,
+                 const std::pmr::string& title_text,
+                 bool has_cancel)
     : Modal(host) {
   lv_obj_set_layout(root_, LV_LAYOUT_FLEX);
   lv_obj_set_flex_flow(root_, LV_FLEX_FLOW_COLUMN);
diff --git a/src/ui/modal_progress.cpp b/src/ui/modal_progress.cpp
index f60b324a..1213de7e 100644
--- a/src/ui/modal_progress.cpp
+++ b/src/ui/modal_progress.cpp
@@ -28,7 +28,7 @@
 namespace ui {
 namespace modals {
 
-Progress::Progress(Screen* host, std::string title_text) : Modal(host) {
+Progress::Progress(Screen* host, std::pmr::string title_text) : Modal(host) {
   lv_obj_set_layout(root_, LV_LAYOUT_FLEX);
   lv_obj_set_flex_flow(root_, LV_FLEX_FLOW_COLUMN);
   lv_obj_set_flex_align(root_, LV_FLEX_ALIGN_SPACE_EVENLY, LV_FLEX_ALIGN_CENTER,
diff --git a/src/ui/screen.cpp b/src/ui/screen.cpp
index c9933042..48bffff7 100644
--- a/src/ui/screen.cpp
+++ b/src/ui/screen.cpp
@@ -57,7 +57,7 @@ auto Screen::CreateTopBar(lv_obj_t* parent,
   return top_bar_.get();
 }
 
-MenuScreen::MenuScreen(const std::string& title, bool show_back_button)
+MenuScreen::MenuScreen(const std::pmr::string& title, bool show_back_button)
     : Screen() {
   lv_group_set_wrap(group_, false);
 
diff --git a/src/ui/screen_onboarding.cpp b/src/ui/screen_onboarding.cpp
index 15f610a7..f5ce004f 100644
--- a/src/ui/screen_onboarding.cpp
+++ b/src/ui/screen_onboarding.cpp
@@ -32,7 +32,7 @@ static void prev_btn_cb(lv_event_t* ev) {
   events::Ui().Dispatch(internal::OnboardingNavigate{.forwards = false});
 }
 
-Onboarding::Onboarding(const std::string& title,
+Onboarding::Onboarding(const std::pmr::string& title,
                        bool show_prev,
                        bool show_next) {
   window_ = lv_win_create(root_, 18);
@@ -68,7 +68,8 @@ LinkToManual::LinkToManual() : Onboarding("Welcome!", false, true) {
   lv_qrcode_update(qr, kManualUrl, sizeof(kManualUrl));
 }
 
-static void create_radio_button(lv_obj_t* parent, const std::string& text) {
+static void create_radio_button(lv_obj_t* parent,
+                                const std::pmr::string& text) {
   lv_obj_t* obj = lv_checkbox_create(parent);
   lv_checkbox_set_text(obj, text.c_str());
   // TODO: radio styling
diff --git a/src/ui/screen_playing.cpp b/src/ui/screen_playing.cpp
index e0fff095..bd55924d 100644
--- a/src/ui/screen_playing.cpp
+++ b/src/ui/screen_playing.cpp
@@ -96,7 +96,7 @@ auto Playing::control_button(lv_obj_t* parent, char* icon) -> lv_obj_t* {
   return button;
 }
 
-auto Playing::next_up_label(lv_obj_t* parent, const std::string& text)
+auto Playing::next_up_label(lv_obj_t* parent, const std::pmr::string& text)
     -> lv_obj_t* {
   lv_obj_t* button = lv_list_add_btn(parent, NULL, text.c_str());
   lv_label_set_long_mode(lv_obj_get_child(button, -1), LV_LABEL_LONG_DOT);
diff --git a/src/ui/screen_settings.cpp b/src/ui/screen_settings.cpp
index faeac865..63964da3 100644
--- a/src/ui/screen_settings.cpp
+++ b/src/ui/screen_settings.cpp
@@ -56,7 +56,7 @@ static void open_sub_menu_cb(lv_event_t* e) {
 
 static void sub_menu(lv_obj_t* list,
                      lv_group_t* group,
-                     const std::string& text,
+                     const std::pmr::string& text,
                      Page page) {
   lv_obj_t* item = lv_list_add_btn(list, NULL, text.c_str());
   lv_group_add_obj(group, item);
@@ -93,8 +93,8 @@ static auto settings_container(lv_obj_t* parent) -> lv_obj_t* {
 }
 
 static auto label_pair(lv_obj_t* parent,
-                       const std::string& left,
-                       const std::string& right) -> lv_obj_t* {
+                       const std::pmr::string& left,
+                       const std::pmr::string& right) -> lv_obj_t* {
   lv_obj_t* container = settings_container(parent);
   lv_obj_t* left_label = lv_label_create(container);
   lv_label_set_text(left_label, left.c_str());
diff --git a/src/ui/screen_track_browser.cpp b/src/ui/screen_track_browser.cpp
index 67c47628..6cd92a04 100644
--- a/src/ui/screen_track_browser.cpp
+++ b/src/ui/screen_track_browser.cpp
@@ -60,7 +60,7 @@ static void item_select_cb(lv_event_t* ev) {
 
 TrackBrowser::TrackBrowser(
     std::weak_ptr<database::Database> db,
-    const std::string& title,
+    const std::pmr::string& title,
     std::future<database::Result<database::IndexRecord>*>&& initial_page)
     : db_(db),
       list_(nullptr),
diff --git a/src/ui/ui_fsm.cpp b/src/ui/ui_fsm.cpp
index 18e9caf4..62fd46f1 100644
--- a/src/ui/ui_fsm.cpp
+++ b/src/ui/ui_fsm.cpp
@@ -297,7 +297,7 @@ void Browse::react(const internal::RecordSelected& ev) {
       return;
     }
     auto query = db->GetPage(&cont.value());
-    std::string title = record.text().value_or("TODO");
+    std::pmr::string title = record.text().value_or("TODO");
     PushScreen(std::make_shared<screens::TrackBrowser>(
         sServices->database(), title, std::move(query)));
   }