Make theme use objects instead of arrays

Also some minor tweaks to make things less redundant and safer
This commit is contained in:
Pk11
2021-03-23 18:00:04 -05:00
parent cabe2f13f4
commit b45adba858
4 changed files with 88 additions and 93 deletions
+2 -2
View File
@@ -34,10 +34,10 @@
class Theme {
public:
Theme(const std::string &ThemeJSON = "sdmc:/3ds/Universal-Updater/Themes.json");
void InitWithDefaultColors(const std::string &ThemePath = "sdmc:/3ds/Universal-Updater/Themes.json");
nlohmann::json InitWithDefaultColors(const std::string &ThemePath = "sdmc:/3ds/Universal-Updater/Themes.json");
void LoadTheme(const std::string &ThemeName);
std::vector<std::string> ThemeNames();
uint32_t GetThemeColor(const std::string &colorString, const uint32_t DefaultColor);
uint32_t GetThemeColor(const std::string &ThemeName, const std::string &Key, const uint32_t DefaultColor);
uint32_t BarColor() const { return this->vBarColor; };
uint32_t BGColor() const { return this->vBGColor; };