4 files changed, 22 insertions, 22 deletions

diff --git a/src/ui/components/Input.cpp b/src/ui/components/Input.cpp
index 6a53b938..e75eccc5 100644
--- a/src/ui/components/Input.cpp
+++ b/src/ui/components/Input.cpp
@@ -1,13 +1,13 @@
 #include "cru/ui/components/Input.h"
-#include "cru/base/Format.h"
 #include "cru/base/StringToNumberConverter.h"
 #include "cru/ui/controls/Control.h"
 
 #include <cmath>
 #include <optional>
+#include <string>
 
 namespace cru::ui::components {
-Input::Input() : last_validate_result_{true, u"Good value"} {
+Input::Input() : last_validate_result_{true, "Good value"} {
   text_box_.TextChangeEvent()->AddSpyOnlyHandler([this] {
     auto text = text_box_.GetText();
     auto validate_result = Validate();
@@ -20,9 +20,9 @@ Input::~Input() {}
 
 controls::Control* Input::GetRootControl() { return &text_box_; }
 
-String Input::GetText() const { return text_box_.GetText(); }
+std::string Input::GetText() const { return text_box_.GetText(); }
 
-void Input::SetText(String text) { text_box_.SetText(std::move(text)); }
+void Input::SetText(std::string text) { text_box_.SetText(std::move(text)); }
 
 IInputValidator* Input::GetValidator() const { return validator_; }
 
@@ -35,7 +35,7 @@ InputValidateResult Input::Validate() {
   if (validator_)
     last_validate_result_ = validator_->Validate(text_box_.GetTextView());
   else
-    last_validate_result_ = {true, u"Good value"};
+    last_validate_result_ = {true, "Good value"};
   return last_validate_result_;
 }
 
@@ -43,23 +43,23 @@ InputValidateResult Input::GetLastValidateResult() const {
   return last_validate_result_;
 }
 
-InputValidateResult FloatInputValidator::Validate(StringView text) const {
-  auto result =
-      text.ParseToFloat(nullptr, StringToNumberFlags::kAllowLeadingSpaces &
-                                     StringToNumberFlags::kAllowTrailingSpaces);
+InputValidateResult FloatInputValidator::Validate(std::string_view text) const {
+  auto result = String::FromUtf8(text).ParseToFloat(
+      nullptr, StringToNumberFlags::kAllowLeadingSpaces &
+                   StringToNumberFlags::kAllowTrailingSpaces);
   if (std::isnan(result)) {
-    return InputValidateResult{false, u"Invalid number."};
+    return InputValidateResult{false, "Invalid number."};
   }
 
   if (min && result < *min) {
-    return InputValidateResult{false, u"Value is less than minimum."};
+    return InputValidateResult{false, "Value is less than minimum."};
   }
 
   if (max && result > *max) {
-    return InputValidateResult{false, u"Value is greater than maximum."};
+    return InputValidateResult{false, "Value is greater than maximum."};
   }
 
-  return InputValidateResult{true, u"Good number"};
+  return InputValidateResult{true, "Good number"};
 }
 
 FloatInput::FloatInput() {
@@ -67,7 +67,7 @@ FloatInput::FloatInput() {
 
   ChangeEvent()->AddHandler([this](const InputChangeEventArgs& args) {
     if (args.valid) {
-      value_ = args.text.ParseToFloat(
+      value_ = String::FromUtf8(args.text).ParseToFloat(
           nullptr, StringToNumberFlags::kAllowLeadingSpaces &
                        StringToNumberFlags::kAllowTrailingSpaces);
     }
@@ -78,7 +78,7 @@ FloatInput::~FloatInput() {}
 
 float FloatInput::GetValue() const { return value_; }
 
-void FloatInput::SetValue(float value) { SetText(ToString(value)); }
+void FloatInput::SetValue(float value) { SetText(std::to_string(value)); }
 
 std::optional<float> FloatInput::GetMin() const { return validator_.min; }
 
diff --git a/src/ui/components/Menu.cpp b/src/ui/components/Menu.cpp
index 2da38990..59bcf8ec 100644
--- a/src/ui/components/Menu.cpp
+++ b/src/ui/components/Menu.cpp
@@ -14,17 +14,17 @@ namespace cru::ui::components {
 MenuItem::MenuItem() {
   container_.SetChild(&text_);
   container_.GetStyleRuleSet()->SetParent(
-      ThemeManager::GetInstance()->GetResourceStyleRuleSet(u"menuitem.style"));
+      ThemeManager::GetInstance()->GetResourceStyleRuleSet("menuitem.style"));
   container_.ClickEvent()->AddHandler([this](const helper::ClickEventArgs&) {
     if (this->on_click_) this->on_click_();
   });
 }
 
-MenuItem::MenuItem(String text) : MenuItem() { SetText(std::move(text)); }
+MenuItem::MenuItem(std::string text) : MenuItem() { SetText(std::move(text)); }
 
 MenuItem::~MenuItem() {}
 
-void MenuItem::SetText(String text) { text_.SetText(std::move(text)); }
+void MenuItem::SetText(std::string text) { text_.SetText(std::move(text)); }
 
 Menu::Menu() {
   container_.SetFlexDirection(controls::FlexDirection::Vertical);
@@ -65,7 +65,7 @@ void Menu::ClearItems() {
   container_.ClearChildren();
 }
 
-void Menu::AddTextItemAt(String text, Index index,
+void Menu::AddTextItemAt(std::string text, Index index,
                          std::function<void()> on_click) {
   MenuItem* item = new MenuItem(std::move(text));
   item->SetOnClick([this, index, on_click = std::move(on_click)] {
diff --git a/src/ui/components/PopupButton.cpp b/src/ui/components/PopupButton.cpp
index 41e0ad6c..5ea41d78 100644
--- a/src/ui/components/PopupButton.cpp
+++ b/src/ui/components/PopupButton.cpp
@@ -14,7 +14,7 @@ PopupMenuTextButton::PopupMenuTextButton() : popup_menu_(&button_) {
 
 PopupMenuTextButton::~PopupMenuTextButton() {}
 
-void PopupMenuTextButton::SetMenuItems(std::vector<String> items) {
+void PopupMenuTextButton::SetMenuItems(std::vector<std::string> items) {
   popup_menu_.GetMenu()->ClearItems();
   for (Index i = 0; i < items.size(); i++) {
     popup_menu_.GetMenu()->AddTextItem(
@@ -31,7 +31,7 @@ PopupMenuIconButton::PopupMenuIconButton() : popup_menu_(&button_) {
 
 PopupMenuIconButton::~PopupMenuIconButton() {}
 
-void PopupMenuIconButton::SetMenuItems(std::vector<String> items) {
+void PopupMenuIconButton::SetMenuItems(std::vector<std::string> items) {
   popup_menu_.GetMenu()->ClearItems();
   for (Index i = 0; i < items.size(); i++) {
     popup_menu_.GetMenu()->AddTextItem(
diff --git a/src/ui/components/Select.cpp b/src/ui/components/Select.cpp
index 90b49d30..5dbb727c 100644
--- a/src/ui/components/Select.cpp
+++ b/src/ui/components/Select.cpp
@@ -15,7 +15,7 @@ Select::Select() {
 
 Select::~Select() {}
 
-void Select::SetItems(std::vector<String> items) {
+void Select::SetItems(std::vector<std::string> items) {
   items_ = items;
   popup_menu_.GetMenu()->ClearItems();
   for (Index i = 0; i < items.size(); i++) {