8c8ccd8783
## New features - Implement translations for apps - Created `tt::settings::setLanguage` and `::getLanguage()` - External app errors are now reported to the user via an AlertDialog - Store system settings in `/data/settings.properties` - Created a "Region & Language" app and moved the timezone setting there. ## Other changes - Change `/data` and `/system` filesystem sector size from 4096 to 512 bytes to allow for more small files (60+ files of 4kB were over the limit of 256kB for the filesystem) - Increased size of `/data` and `/system` - Moved `tt::time::*` to `tt::settings` - Removed the timezone setting from the "Time & Date" setting app - Reverse encoder direction of Lilygo T-Lora Pager - Improved partability of `Time.cpp` (removed separate set of functions for PC/sim)
77 lines
2.3 KiB
C++
77 lines
2.3 KiB
C++
#include <Tactility/Mutex.h>
|
|
#include <Tactility/file/FileLock.h>
|
|
#include <Tactility/file/PropertiesFile.h>
|
|
#include <Tactility/settings/Language.h>
|
|
#include <Tactility/settings/SettingsProperties.h>
|
|
|
|
namespace tt::settings {
|
|
|
|
constexpr auto* TAG = "SettingsProperties";
|
|
constexpr auto* FILE_PATH = "/data/settings.properties";
|
|
|
|
static Mutex mutex = Mutex();
|
|
static bool cached = false;
|
|
static SettingsProperties cachedProperties;
|
|
|
|
static bool loadSettingsPropertiesFromFile(SettingsProperties& properties) {
|
|
std::map<std::string, std::string> map;
|
|
if (!file::withLock<bool>(FILE_PATH, [&map] {
|
|
return file::loadPropertiesFile(FILE_PATH, map);
|
|
})) {
|
|
TT_LOG_E(TAG, "Failed to load %s", FILE_PATH);
|
|
return false;
|
|
}
|
|
|
|
auto language_entry = map.find("language");
|
|
if (language_entry != map.end()) {
|
|
if (!fromString(language_entry->second, properties.language)) {
|
|
TT_LOG_W(TAG, "Unknown language \"%s\" in %s", language_entry->second.c_str(), FILE_PATH);
|
|
properties.language = Language::en_US;
|
|
}
|
|
} else {
|
|
properties.language = Language::en_US;
|
|
}
|
|
|
|
auto time_format_entry = map.find("timeFormat24h");
|
|
bool time_format_24h = time_format_entry == map.end() ? true : (time_format_entry->second == "true");
|
|
properties.timeFormat24h = time_format_24h;
|
|
|
|
return true;
|
|
}
|
|
|
|
bool loadSettingsProperties(SettingsProperties& properties) {
|
|
auto scoped_lock = mutex.asScopedLock();
|
|
scoped_lock.lock();
|
|
|
|
if (!cached) {
|
|
if (!loadSettingsPropertiesFromFile(cachedProperties)) {
|
|
return false;
|
|
}
|
|
cached = true;
|
|
}
|
|
|
|
properties = cachedProperties;
|
|
return true;
|
|
}
|
|
|
|
bool saveSettingsProperties(const SettingsProperties& properties) {
|
|
auto scoped_lock = mutex.asScopedLock();
|
|
scoped_lock.lock();
|
|
|
|
return file::withLock<bool>(FILE_PATH, [&properties] {
|
|
std::map<std::string, std::string> map;
|
|
map["language"] = toString(properties.language);
|
|
map["timeFormat24h"] = properties.timeFormat24h ? "true" : "false";
|
|
|
|
if (!file::savePropertiesFile(FILE_PATH, map)) {
|
|
TT_LOG_E(TAG, "Failed to save %s", FILE_PATH);
|
|
return false;
|
|
}
|
|
|
|
cachedProperties = properties;
|
|
cached = true;
|
|
return true;
|
|
});
|
|
}
|
|
|
|
} |