James WhyteandArthur Tazhitdinov
8af0173d5b
## 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>
106 lines
3.6 KiB
C++
106 lines
3.6 KiB
C++
#include "UITheme.h"
|
|
|
|
#include <GfxRenderer.h>
|
|
#include <Logging.h>
|
|
|
|
#include <memory>
|
|
|
|
#include "MappedInputManager.h"
|
|
#include "RecentBooksStore.h"
|
|
#include "components/themes/BaseTheme.h"
|
|
#include "components/themes/lyra/Lyra3CoversTheme.h"
|
|
#include "components/themes/lyra/LyraTheme.h"
|
|
#include "util/StringUtils.h"
|
|
|
|
namespace {
|
|
constexpr int SKIP_PAGE_MS = 700;
|
|
} // namespace
|
|
|
|
UITheme UITheme::instance;
|
|
|
|
UITheme::UITheme() {
|
|
auto themeType = static_cast<CrossPointSettings::UI_THEME>(SETTINGS.uiTheme);
|
|
setTheme(themeType);
|
|
}
|
|
|
|
void UITheme::reload() {
|
|
auto themeType = static_cast<CrossPointSettings::UI_THEME>(SETTINGS.uiTheme);
|
|
setTheme(themeType);
|
|
}
|
|
|
|
void UITheme::setTheme(CrossPointSettings::UI_THEME type) {
|
|
switch (type) {
|
|
case CrossPointSettings::UI_THEME::CLASSIC:
|
|
LOG_DBG("UI", "Using Classic theme");
|
|
currentTheme = std::make_unique<BaseTheme>();
|
|
currentMetrics = &BaseMetrics::values;
|
|
break;
|
|
case CrossPointSettings::UI_THEME::LYRA:
|
|
LOG_DBG("UI", "Using Lyra theme");
|
|
currentTheme = std::make_unique<LyraTheme>();
|
|
currentMetrics = &LyraMetrics::values;
|
|
break;
|
|
case CrossPointSettings::UI_THEME::LYRA_3_COVERS:
|
|
LOG_DBG("UI", "Using Lyra 3 Covers theme");
|
|
currentTheme = std::make_unique<Lyra3CoversTheme>();
|
|
currentMetrics = &Lyra3CoversMetrics::values;
|
|
break;
|
|
}
|
|
}
|
|
|
|
int UITheme::getNumberOfItemsPerPage(const GfxRenderer& renderer, bool hasHeader, bool hasTabBar, bool hasButtonHints,
|
|
bool hasSubtitle) {
|
|
const ThemeMetrics& metrics = UITheme::getInstance().getMetrics();
|
|
int reservedHeight = metrics.topPadding;
|
|
if (hasHeader) {
|
|
reservedHeight += metrics.headerHeight + metrics.verticalSpacing;
|
|
}
|
|
if (hasTabBar) {
|
|
reservedHeight += metrics.tabBarHeight;
|
|
}
|
|
if (hasButtonHints) {
|
|
reservedHeight += metrics.verticalSpacing + metrics.buttonHintsHeight;
|
|
}
|
|
const int availableHeight = renderer.getScreenHeight() - reservedHeight;
|
|
int rowHeight = hasSubtitle ? metrics.listWithSubtitleRowHeight : metrics.listRowHeight;
|
|
return availableHeight / rowHeight;
|
|
}
|
|
|
|
std::string UITheme::getCoverThumbPath(std::string coverBmpPath, int coverHeight) {
|
|
size_t pos = coverBmpPath.find("[HEIGHT]", 0);
|
|
if (pos != std::string::npos) {
|
|
coverBmpPath.replace(pos, 8, std::to_string(coverHeight));
|
|
}
|
|
return coverBmpPath;
|
|
}
|
|
|
|
UIIcon UITheme::getFileIcon(std::string filename) {
|
|
if (filename.back() == '/') {
|
|
return Folder;
|
|
}
|
|
if (StringUtils::checkFileExtension(filename, ".epub") || StringUtils::checkFileExtension(filename, ".xtch") ||
|
|
StringUtils::checkFileExtension(filename, ".xtc")) {
|
|
return Book;
|
|
}
|
|
if (StringUtils::checkFileExtension(filename, ".txt") || StringUtils::checkFileExtension(filename, ".md")) {
|
|
return Text;
|
|
}
|
|
if (StringUtils::checkFileExtension(filename, ".bmp")) {
|
|
return Image;
|
|
}
|
|
return File;
|
|
}
|
|
|
|
int UITheme::getStatusBarHeight() {
|
|
const ThemeMetrics& metrics = UITheme::getInstance().getMetrics();
|
|
|
|
// Add status bar margin
|
|
const bool showStatusBar = SETTINGS.statusBarChapterPageCount || SETTINGS.statusBarBookProgressPercentage ||
|
|
SETTINGS.statusBarTitle != CrossPointSettings::STATUS_BAR_TITLE::HIDE_TITLE ||
|
|
SETTINGS.statusBarBattery;
|
|
const bool showProgressBar =
|
|
SETTINGS.statusBarProgressBar != CrossPointSettings::STATUS_BAR_PROGRESS_BAR::HIDE_PROGRESS;
|
|
return (showStatusBar ? (metrics.statusBarVerticalMargin) : 0) +
|
|
(showProgressBar ? (((SETTINGS.statusBarProgressBarThickness + 1) * 2) + metrics.progressBarMarginTop) : 0);
|
|
}
|