2d49c7b7b4
## Summary This PR aims to reduce the complexity of the status bar by splitting the setting into 5: - Chapter Page Count - Book Progress % - Progress Bar - Chapter Title - Battery Indicator These are located within the new StausBarSettings activity, which also shows a preview of the bar the user has created <img width="513" height="806" alt="image" src="https://github.com/user-attachments/assets/cdf852fb-15d8-4da2-a74f-fd69294d7b05" /> <img width="483" height="797" alt="image" src="https://github.com/user-attachments/assets/66fc0c0d-ee51-4d31-b70d-e2bc043205d1" /> When updating from a previous version, the user's past settings are honoured. ## Additional Context The PR aims to remove any duplication of status bar code where possible, and extracts the status bar rendering into a new component - StatusBar It also adds a new (optional) padding option to the progress bar to allow the status bar to be shifted upwards - this is only intended for use in the settings. --- ### AI Usage While CrossPoint doesn't have restrictions on AI tools in contributing, please be transparent about their usage as it helps set the right context for reviewers. Did you use AI tools to help write this code? No - although did help to decode some C++ errors --------- Co-authored-by: Arthur Tazhitdinov <lisnake@gmail.com>
97 lines
2.4 KiB
C++
97 lines
2.4 KiB
C++
#include "I18n.h"
|
|
|
|
#include <HalStorage.h>
|
|
#include <HardwareSerial.h>
|
|
#include <Serialization.h>
|
|
|
|
#include "I18nStrings.h"
|
|
|
|
using namespace i18n_strings;
|
|
|
|
// Settings file path
|
|
static constexpr const char* SETTINGS_FILE = "/.crosspoint/language.bin";
|
|
static constexpr uint8_t SETTINGS_VERSION = 1;
|
|
|
|
I18n& I18n::getInstance() {
|
|
static I18n instance;
|
|
return instance;
|
|
}
|
|
|
|
const char* I18n::get(StrId id) const {
|
|
const auto index = static_cast<size_t>(id);
|
|
if (index >= static_cast<size_t>(StrId::_COUNT)) {
|
|
return "???";
|
|
}
|
|
|
|
// Use generated helper function - no hardcoded switch needed!
|
|
const char* const* strings = getStringArray(_language);
|
|
return strings[index];
|
|
}
|
|
|
|
void I18n::setLanguage(Language lang) {
|
|
if (lang >= Language::_COUNT) {
|
|
return;
|
|
}
|
|
_language = lang;
|
|
saveSettings();
|
|
}
|
|
|
|
const char* I18n::getLanguageName(Language lang) const {
|
|
const auto index = static_cast<size_t>(lang);
|
|
if (index >= static_cast<size_t>(Language::_COUNT)) {
|
|
return "???";
|
|
}
|
|
return LANGUAGE_NAMES[index];
|
|
}
|
|
|
|
void I18n::saveSettings() {
|
|
Storage.mkdir("/.crosspoint");
|
|
|
|
FsFile file;
|
|
if (!Storage.openFileForWrite("I18N", SETTINGS_FILE, file)) {
|
|
Serial.printf("[I18N] Failed to save settings\n");
|
|
return;
|
|
}
|
|
|
|
serialization::writePod(file, SETTINGS_VERSION);
|
|
serialization::writePod(file, static_cast<uint8_t>(_language));
|
|
|
|
file.close();
|
|
Serial.printf("[I18N] Settings saved: language=%d\n", static_cast<int>(_language));
|
|
}
|
|
|
|
void I18n::loadSettings() {
|
|
FsFile file;
|
|
if (!Storage.openFileForRead("I18N", SETTINGS_FILE, file)) {
|
|
Serial.printf("[I18N] No settings file, using default (English)\n");
|
|
return;
|
|
}
|
|
|
|
uint8_t version;
|
|
serialization::readPod(file, version);
|
|
if (version != SETTINGS_VERSION) {
|
|
Serial.printf("[I18N] Settings version mismatch\n");
|
|
file.close();
|
|
return;
|
|
}
|
|
|
|
uint8_t lang;
|
|
serialization::readPod(file, lang);
|
|
if (lang < static_cast<size_t>(Language::_COUNT)) {
|
|
_language = static_cast<Language>(lang);
|
|
Serial.printf("[I18N] Loaded language: %d\n", static_cast<int>(_language));
|
|
}
|
|
|
|
file.close();
|
|
}
|
|
|
|
// Generate character set for a specific language
|
|
const char* I18n::getCharacterSet(Language lang) {
|
|
const auto langIndex = static_cast<size_t>(lang);
|
|
if (langIndex >= static_cast<size_t>(Language::_COUNT)) {
|
|
lang = Language::ENGLISH; // Fallback to first language
|
|
}
|
|
|
|
return CHARACTER_SETS[static_cast<size_t>(lang)];
|
|
}
|