chore(UI): change theme to store name instead of index

Author: AndyEveritt

src/Storage.cpp

@@ -48,7 +48,7 @@ constexpr StorageKey<std::chrono::milliseconds> ID_DUET_POLL_INTERVAL = {"duet:p
 constexpr StorageKey<speed_t> ID_DUET_BAUD_RATE = {"duet:baud_rate", DEFAULT_BAUD_RATE};
 
 /* UI */
-constexpr StorageKey<size_t> ID_THEME = {"ui:theme", std::numeric_limits<size_t>::max()};
+constexpr StorageKey<std::string_view> ID_THEME = {"ui:theme", "dark"};
 constexpr StorageKey<std::string_view> ID_FONT = {"ui:font", "OpenSans"};
 constexpr StorageKey<std::string_view> ID_ICON_FOLDER = {"ui:icon_folder", DEFAULT_ICON_SET};
 constexpr StorageKey<std::string_view> ID_KEYBOARD_LAYOUT = {"ui:keyboard_layout", "us"};

src/Storage.h

@@ -131,7 +131,7 @@ extern const StorageKey<std::chrono::milliseconds> ID_DUET_POLL_INTERVAL;
 extern const StorageKey<speed_t> ID_DUET_BAUD_RATE;
 
 /* UI */
-extern const StorageKey<size_t> ID_THEME;
+extern const StorageKey<std::string_view> ID_THEME;
 extern const StorageKey<std::string_view> ID_FONT;
 extern const StorageKey<std::string_view> ID_ICON_FOLDER;
 extern const StorageKey<std::string_view> ID_KEYBOARD_LAYOUT;

src/UI/Screens/Settings/SettingsView.cpp

@@ -528,10 +528,20 @@ namespace UI
 				theme->setThemeActive();
 				updateThemePreview();
 				LOG_DBG("Finished changing theme");
-				StorageHelper::setData(ID_THEME, index);
-				// view->getMainSettingsPresenter()->setTheme(selected);
+				StorageHelper::setData(ID_THEME, theme->getName());
 			});
-		m_theme.setSelected(static_cast<uint32_t>(StorageHelper::getData(ID_THEME)));
+		{
+			const auto& allThemes = Themes::getThemes();
+			const auto stored = StorageHelper::getData(ID_THEME);
+			for (uint32_t i = 0; i < allThemes.size(); ++i)
+			{
+				if (allThemes[i]->getName() == stored)
+				{
+					m_theme.setSelected(i);
+					break;
+				}
+			}
+		}
 
 		/* Font */
 		createRow(_("settings.font"), m_font);

src/UI/Styles/Styles.cpp

@@ -1038,21 +1038,15 @@ namespace UI::Themes
 
 		lv_theme_apply(lv_screen_active());
 
-		Theme* theme = getTheme(StorageHelper::getData(ID_THEME));
+		Theme* theme = getThemeByName(StorageHelper::getData(ID_THEME));
 		if (theme == nullptr)
 		{
 			LOG_INFO("Theme not found, using default theme");
 			theme = getDefaultTheme();
-			size_t theme_id = 0;
-			for (size_t i = 0; i < themes().size(); ++i)
+			if (theme != nullptr)
 			{
-				if (themes()[i] == theme)
-				{
-					theme_id = i;
-					break;
-				}
+				StorageHelper::setData(ID_THEME, theme->getName());
 			}
-			StorageHelper::setData(ID_THEME, theme_id);
 		}
 		if (theme != nullptr)
 		{

src/utils/StorageHelper.h

@@ -99,14 +99,23 @@ class StorageHelper
 
 		auto convertor = [&key](const nlohmann::json& jval) -> typename T::value_type
 		{
-			if constexpr (std::is_enum_v<typename T::value_type>)
+			try
 			{
-				const auto val = jval.get<std::underlying_type_t<typename T::value_type>>();
-				return magic_enum::enum_cast<typename T::value_type>(val).value_or(detail::resolve_default(key));
+				if constexpr (std::is_enum_v<typename T::value_type>)
+				{
+					const auto val = jval.get<std::underlying_type_t<typename T::value_type>>();
+					return magic_enum::enum_cast<typename T::value_type>(val).value_or(
+						detail::resolve_default(key));
+				}
+				else
+				{
+					return jval.get<typename T::value_type>();
+				}
 			}
-			else
+			catch (const nlohmann::json::type_error&)
 			{
-				return jval.get<typename T::value_type>();
+				LOG_WARN("Config key \"{:s}\" has incompatible type, using default", key.id);
+				return detail::resolve_default(key);
 			}
 		};
 

tests/src/test_cases/UI/test_theme.cpp

@@ -46,7 +46,7 @@ class TestTheme : public UiTestSuite
 
 	~TestTheme()
 	{
-		Themes::Theme* default_theme = Themes::getTheme(StorageHelper::getData(ID_THEME));
+		Themes::Theme* default_theme = Themes::getThemeByName(StorageHelper::getData(ID_THEME));
 		if (default_theme == nullptr)
 		{
 			return;