Add Lyra Carousel home theme

This commit is contained in:
jpirnay
2026-05-07 23:42:35 +02:00
parent 0b93445450
commit 4005bf55e5
17 changed files with 875 additions and 103 deletions
+19
View File
@@ -13,6 +13,7 @@
#include "RecentBooksStore.h"
#include "components/themes/BaseTheme.h"
#include "components/themes/lyra/Lyra3CoversTheme.h"
#include "components/themes/lyra/LyraCarouselTheme.h"
#include "components/themes/lyra/LyraTheme.h"
namespace {
@@ -66,6 +67,16 @@ void UITheme::setTheme(CrossPointSettings::UI_THEME type) {
currentTheme = std::make_unique<Lyra3CoversTheme>();
currentMetrics = &Lyra3CoversMetrics::values;
break;
case CrossPointSettings::UI_THEME::LYRA_CAROUSEL:
LOG_DBG("UI", "Using Lyra Carousel theme");
currentTheme = std::make_unique<LyraCarouselTheme>();
currentMetrics = &LyraCarouselMetrics::values;
break;
default:
LOG_ERR("UI", "Unknown theme %d, falling back to Classic", static_cast<int>(type));
currentTheme = std::make_unique<BaseTheme>();
currentMetrics = &BaseMetrics::values;
break;
}
}
@@ -161,6 +172,14 @@ std::string UITheme::getCoverThumbPath(std::string coverBmpPath, int coverHeight
return coverBmpPath;
}
std::string UITheme::getCoverThumbPath(std::string coverBmpPath, int width, int height) {
size_t pos = coverBmpPath.find("[HEIGHT]", 0);
if (pos != std::string::npos) {
coverBmpPath.replace(pos, 8, std::to_string(width) + "x" + std::to_string(height));
}
return coverBmpPath;
}
UIIcon UITheme::getFileIcon(const std::string& filename) {
if (filename.back() == '/') {
return Folder;
+1
View File
@@ -60,6 +60,7 @@ class UITheme {
// The mapping to logical edges is orientation-dependent.
static Rect getContentRect(const GfxRenderer& renderer, bool hasBottomHints, bool hasSideHints);
static std::string getCoverThumbPath(std::string coverBmpPath, int coverHeight);
static std::string getCoverThumbPath(std::string coverBmpPath, int width, int height);
static UIIcon getFileIcon(const std::string& filename);
static int getStatusBarTopHeight(bool forceStatusItems = false);
static int getStatusBarBottomHeight(bool forceStatusItems = false);
+1
View File
@@ -159,6 +159,7 @@ class BaseTheme {
const char* secondaryLabel = nullptr, KeyboardKeyType keyType = KeyboardKeyType::Normal,
bool inactiveSelection = false) const;
virtual bool showsFileIcons() const { return false; }
virtual void drawCarouselBorder(GfxRenderer& renderer, Rect coverRect, bool inCarouselRow) const {}
// Shared constants and helpers for battery drawing (used by all themes)
static constexpr int batteryPercentSpacing = 4;
@@ -0,0 +1,394 @@
#include "LyraCarouselTheme.h"
#include <Bitmap.h>
#include <GfxRenderer.h>
#include <HalStorage.h>
#include <string>
#include <vector>
#include "RecentBooksStore.h"
#include "components/UITheme.h"
#include "components/icons/book.h"
#include "components/icons/book24.h"
#include "components/icons/cover.h"
#include "components/icons/file24.h"
#include "components/icons/folder.h"
#include "components/icons/folder24.h"
#include "components/icons/hotspot.h"
#include "components/icons/image24.h"
#include "components/icons/library.h"
#include "components/icons/recent.h"
#include "components/icons/settings2.h"
#include "components/icons/text24.h"
#include "components/icons/transfer.h"
#include "components/icons/wifi.h"
#include "fontIds.h"
namespace {
// Cover layout — centre cover dominates, sides slide kOverlap px behind it
constexpr int kCenterCoverMaxW = LyraCarouselTheme::kCenterCoverW;
constexpr int kCenterCoverMaxH = LyraCarouselTheme::kCenterCoverH;
constexpr int kSideCoverMaxW = LyraCarouselTheme::kSideCoverW;
constexpr int kSideCoverMaxH = LyraCarouselTheme::kSideCoverH;
constexpr int kOverlap = 60;
constexpr int kCoverTopPad = 10;
constexpr int kTitleFontId = UI_12_FONT_ID;
constexpr int kDotSize = 8; // px square dot
constexpr int kDotGap = 6; // px between dots
constexpr int kCornerRadius = 6;
constexpr int kThinOutlineW = 1; // always-visible outline around centre cover
constexpr int kSelectionLineW = 3; // thicker outline when centre cover is selected
constexpr int kCenterOutlineW = 4; // white ring around centre cover
// Icon row — icons are 32×32 bitmaps; drawIcon does NOT scale
constexpr int kMenuIconSize = 32; // must match actual bitmap dimensions
constexpr int kMenuIconPad = 14; // symmetric vertical padding → tile height = 60
constexpr int kHighlightPad = 12; // horizontal padding around the icon on each side
// Row is anchored to the bottom of the screen, just above button hints
constexpr int kButtonHintsH = LyraCarouselMetrics::values.buttonHintsHeight;
int lastCarouselSelectorIndex = -1;
const uint8_t* iconBitmapFor(UIIcon icon) {
switch (icon) {
case UIIcon::Folder:
return FolderIcon;
case UIIcon::Recent:
return RecentIcon;
case UIIcon::Transfer:
return TransferIcon;
case UIIcon::Settings:
return Settings2Icon;
case UIIcon::Book:
return BookIcon;
case UIIcon::Library:
return LibraryIcon;
default:
return nullptr;
}
}
} // namespace
// ---------------------------------------------------------------------------
// Static helpers
// ---------------------------------------------------------------------------
void LyraCarouselTheme::setPreRenderIndex(int idx) { lastCarouselSelectorIndex = idx; }
void LyraCarouselTheme::drawCarouselBorder(GfxRenderer& renderer, Rect coverRect, bool inCarouselRow) const {
if (!inCarouselRow) return;
const int screenW = renderer.getScreenWidth();
const int centerX = (screenW - kCenterCoverMaxW) / 2;
const int centerTileY = coverRect.y + kCoverTopPad;
renderer.drawRoundedRect(centerX, centerTileY, kCenterCoverMaxW, kCenterCoverMaxH, kSelectionLineW, kCornerRadius,
true);
}
// ---------------------------------------------------------------------------
// Carousel cover strip
// ---------------------------------------------------------------------------
void LyraCarouselTheme::drawRecentBookCover(GfxRenderer& renderer, Rect rect,
const std::vector<RecentBook>& recentBooks, const int selectorIndex,
bool& coverRendered, bool& coverBufferStored, bool& bufferRestored,
std::function<bool()> storeCoverBuffer) const {
if (recentBooks.empty()) {
drawEmptyRecents(renderer, rect);
return;
}
const int bookCount = static_cast<int>(recentBooks.size());
// When navigating the icon row, keep showing the last carousel position —
// falling back to 0 on first use (lastCarouselSelectorIndex == -1).
const bool inCarouselRow = (selectorIndex < bookCount);
int centerIdx = inCarouselRow ? selectorIndex : (lastCarouselSelectorIndex >= 0 ? lastCarouselSelectorIndex : 0);
if (centerIdx >= bookCount) {
centerIdx = bookCount - 1;
coverRendered = false;
coverBufferStored = false;
}
// cppcheck-suppress knownConditionTrueFalse
// Reachable as false when navigating the icon row with a previously-set
// lastCarouselSelectorIndex; cppcheck only models the inCarouselRow=true path.
if (centerIdx != lastCarouselSelectorIndex) {
coverRendered = false;
coverBufferStored = false;
}
const int screenW = renderer.getScreenWidth();
const int centerTileY = rect.y + kCoverTopPad;
const int sideTileY = centerTileY + (kCenterCoverMaxH - kSideCoverMaxH) / 2;
const int centerX = (screenW - kCenterCoverMaxW) / 2;
const int leftX = centerX - kSideCoverMaxW + kOverlap;
const int rightX = centerX + kCenterCoverMaxW - kOverlap;
// Returns true if a book exists at bookIdx (cover image or placeholder drawn).
// Returns false only when the slot has no book — caller skips the border too.
auto drawCover = [&](int bookIdx, int x, int y, int maxW, int maxH) -> bool {
if (bookIdx < 0 || bookIdx >= bookCount) return false;
const RecentBook& book = recentBooks[bookIdx];
bool hasCover = false;
if (!book.coverBmpPath.empty()) {
const std::string thumbPath = UITheme::getCoverThumbPath(book.coverBmpPath, maxW, maxH);
FsFile file;
if (Storage.openFileForRead("HOME", thumbPath, file)) {
Bitmap bitmap(file);
if (bitmap.parseHeaders() == BmpReaderError::Ok) {
// Height always fills the tile. Only crop horizontally if the cover is
// wider than the tile; narrow covers get white space on the sides.
const float bmpRatio = static_cast<float>(bitmap.getWidth()) / static_cast<float>(bitmap.getHeight());
const float tileRatio = static_cast<float>(maxW) / static_cast<float>(maxH);
const float cropX = (bmpRatio > tileRatio) ? (1.0f - tileRatio / bmpRatio) : 0.0f;
renderer.drawBitmap(bitmap, x, y, maxW, maxH, cropX, 0.0f);
renderer.maskRoundedRectOutsideCorners(x, y, maxW, maxH, kCornerRadius, Color::White);
hasCover = true;
}
file.close();
}
}
if (!hasCover) {
renderer.drawRoundedRect(x, y, maxW, maxH, 1, kCornerRadius, true);
renderer.fillRoundedRect(x, y + maxH / 3, maxW, 2 * maxH / 3, kCornerRadius, /*roundTopLeft=*/false,
/*roundTopRight=*/false, /*roundBottomLeft=*/true, /*roundBottomRight=*/true,
Color::Black);
renderer.drawIcon(CoverIcon, x + maxW / 2 - 16, y + 8, 32, 32);
}
return true;
};
if (!coverRendered) {
lastCarouselSelectorIndex = centerIdx;
// Clear the entire cover tile to white so stale pixels from old positions
// don't persist (drawBitmap only sets black pixels, never clears).
renderer.fillRect(rect.x, rect.y, rect.width, rect.height, false);
// Sides first so centre renders on top.
// Left side only when there are 3+ books; right side when there are 2+ books.
// Border only drawn if a cover image was actually rendered (no placeholders).
const int prevIdx = (centerIdx + bookCount - 1) % bookCount;
const int nextIdx = (centerIdx + 1) % bookCount;
if (bookCount >= 3) {
if (drawCover(prevIdx, leftX, sideTileY, kSideCoverMaxW, kSideCoverMaxH))
renderer.drawRoundedRect(leftX, sideTileY, kSideCoverMaxW, kSideCoverMaxH, 1, kCornerRadius, true);
}
if (bookCount >= 2) {
if (drawCover(nextIdx, rightX, sideTileY, kSideCoverMaxW, kSideCoverMaxH))
renderer.drawRoundedRect(rightX, sideTileY, kSideCoverMaxW, kSideCoverMaxH, 1, kCornerRadius, true);
}
// Clear a white outline ring around the centre cover, then draw the cover
// inside it. The white ring always separates the centre from the sides.
renderer.fillRect(centerX - kCenterOutlineW, centerTileY - kCenterOutlineW, kCenterCoverMaxW + 2 * kCenterOutlineW,
kCenterCoverMaxH + 2 * kCenterOutlineW, false);
drawCover(centerIdx, centerX, centerTileY, kCenterCoverMaxW, kCenterCoverMaxH);
// Dots — centred over the cover tile, count = actual book count
const int dotsY = centerTileY + kCenterCoverMaxH + 8;
const int totalDotsW = bookCount * kDotSize + (bookCount - 1) * kDotGap;
int dotX = centerX + (kCenterCoverMaxW - totalDotsW) / 2;
for (int i = 0; i < bookCount; ++i) {
if (i == centerIdx)
renderer.fillRect(dotX, dotsY, kDotSize, kDotSize, true);
else
renderer.drawRect(dotX, dotsY, kDotSize, kDotSize, true);
dotX += kDotSize + kDotGap;
}
// Author then title below dots
const int authorY = dotsY + kDotSize + 6;
const std::string authorTrunc =
renderer.truncatedText(kTitleFontId, recentBooks[centerIdx].author.c_str(), kCenterCoverMaxW);
const int authorW = renderer.getTextWidth(kTitleFontId, authorTrunc.c_str());
renderer.drawText(kTitleFontId, centerX + (kCenterCoverMaxW - authorW) / 2, authorY, authorTrunc.c_str(), true);
const int titleY = authorY + renderer.getLineHeight(kTitleFontId) + 2;
const std::string titleTrunc =
renderer.truncatedText(kTitleFontId, recentBooks[centerIdx].title.c_str(), kCenterCoverMaxW);
const int titleW = renderer.getTextWidth(kTitleFontId, titleTrunc.c_str());
renderer.drawText(kTitleFontId, centerX + (kCenterCoverMaxW - titleW) / 2, titleY, titleTrunc.c_str(), true);
coverBufferStored = storeCoverBuffer();
coverRendered = coverBufferStored;
}
// Always outline the centre cover at its own edge (white ring sits outside the black line);
// thicker when the carousel row is active
const int outlineW = inCarouselRow ? kSelectionLineW : kThinOutlineW;
renderer.drawRoundedRect(centerX, centerTileY, kCenterCoverMaxW, kCenterCoverMaxH, outlineW, kCornerRadius, true);
}
// ---------------------------------------------------------------------------
// Horizontal icon-only menu row — anchored to bottom of screen
// ---------------------------------------------------------------------------
void LyraCarouselTheme::drawButtonMenu(GfxRenderer& renderer, Rect rect, int buttonCount, int selectedIndex,
const std::function<std::string(int index)>& buttonLabel,
const std::function<UIIcon(int index)>& rowIcon) const {
if (buttonCount <= 0) return;
(void)buttonLabel;
const int tileH = kMenuIconPad + kMenuIconSize + kMenuIconPad;
const int tileW = renderer.getScreenWidth() / buttonCount;
// Anchor row just above button hints, ignoring rect.y which may be off-screen
// for large cover tiles
const int rowY = renderer.getScreenHeight() - kButtonHintsH - tileH;
for (int i = 0; i < buttonCount; ++i) {
const int tileX = i * tileW;
const int iconX = tileX + (tileW - kMenuIconSize) / 2;
const int iconY = rowY + kMenuIconPad;
const bool selected = (selectedIndex == i);
if (selected) {
const int highlightSize = kMenuIconSize + 2 * kHighlightPad;
const int highlightY = rowY + (tileH - highlightSize) / 2;
renderer.fillRoundedRect(iconX - kHighlightPad, highlightY, highlightSize, highlightSize, kCornerRadius,
Color::Black);
}
if (rowIcon != nullptr) {
const uint8_t* bmp = iconBitmapFor(rowIcon(i));
if (bmp != nullptr) {
if (selected)
renderer.drawIconInverted(bmp, iconX, iconY, kMenuIconSize, kMenuIconSize);
else
renderer.drawIcon(bmp, iconX, iconY, kMenuIconSize, kMenuIconSize);
}
}
}
}
// ---------------------------------------------------------------------------
// List — solid black highlight, inverted text and icons on selected row
// ---------------------------------------------------------------------------
void LyraCarouselTheme::drawList(const GfxRenderer& renderer, Rect rect, int itemCount, int selectedIndex,
const std::function<std::string(int index)>& rowTitle,
const std::function<std::string(int index)>& rowSubtitle,
const std::function<UIIcon(int index)>& rowIcon,
const std::function<std::string(int index)>& rowValue, bool highlightValue) const {
constexpr int hPad = 8;
constexpr int listIconSz = 24;
constexpr int mainMenuIconSz = 32;
constexpr int maxValWidth = 200;
constexpr int cornerRadius = 6;
const int rowHeight = (rowSubtitle != nullptr) ? LyraCarouselMetrics::values.listWithSubtitleRowHeight
: LyraCarouselMetrics::values.listRowHeight;
const int pageItems = rect.height / rowHeight;
if (pageItems <= 0 || itemCount <= 0) return;
const int totalPages = (itemCount + pageItems - 1) / pageItems;
if (totalPages > 1) {
const int scrollAreaHeight = rect.height;
const int scrollBarHeight = (scrollAreaHeight * pageItems) / itemCount;
const int currentPage = selectedIndex / pageItems;
const int scrollBarY = rect.y + ((scrollAreaHeight - scrollBarHeight) * currentPage) / (totalPages - 1);
const int scrollBarX = rect.x + rect.width - LyraCarouselMetrics::values.scrollBarRightOffset;
renderer.drawLine(scrollBarX, rect.y, scrollBarX, rect.y + scrollAreaHeight, true);
renderer.fillRect(scrollBarX - LyraCarouselMetrics::values.scrollBarWidth, scrollBarY,
LyraCarouselMetrics::values.scrollBarWidth, scrollBarHeight, true);
}
int contentWidth =
rect.width -
(totalPages > 1 ? (LyraCarouselMetrics::values.scrollBarWidth + LyraCarouselMetrics::values.scrollBarRightOffset)
: 1);
// Solid black highlight bar
if (selectedIndex >= 0) {
renderer.fillRoundedRect(
rect.x + LyraCarouselMetrics::values.contentSidePadding, rect.y + selectedIndex % pageItems * rowHeight,
contentWidth - LyraCarouselMetrics::values.contentSidePadding * 2, rowHeight, kCornerRadius, Color::Black);
}
int textX = rect.x + LyraCarouselMetrics::values.contentSidePadding + hPad;
int textWidth = contentWidth - LyraCarouselMetrics::values.contentSidePadding * 2 - hPad * 2;
int iconSize = 0;
if (rowIcon != nullptr) {
iconSize = (rowSubtitle != nullptr) ? mainMenuIconSz : listIconSz;
textX += iconSize + hPad;
textWidth -= iconSize + hPad;
}
const auto pageStartIndex = selectedIndex / pageItems * pageItems;
const int iconY = (rowSubtitle != nullptr) ? 16 : 10;
for (int i = pageStartIndex; i < itemCount && i < pageStartIndex + pageItems; i++) {
const int itemY = rect.y + (i % pageItems) * rowHeight;
const bool sel = (i == selectedIndex);
int rowTextWidth = textWidth;
int valueWidth = 0;
std::string valueText;
if (rowValue != nullptr) {
valueText = rowValue(i);
valueText = renderer.truncatedText(UI_10_FONT_ID, valueText.c_str(), maxValWidth);
valueWidth = renderer.getTextWidth(UI_10_FONT_ID, valueText.c_str()) + hPad;
rowTextWidth -= valueWidth;
}
auto itemName = rowTitle(i);
auto item = renderer.truncatedText(UI_10_FONT_ID, itemName.c_str(), rowTextWidth);
renderer.drawText(UI_10_FONT_ID, textX, itemY + 7, item.c_str(), !sel);
if (rowIcon != nullptr) {
const uint8_t* iconBitmap = iconForName(rowIcon(i), iconSize);
if (iconBitmap != nullptr) {
const int ix = rect.x + LyraCarouselMetrics::values.contentSidePadding + hPad;
if (sel)
renderer.drawIconInverted(iconBitmap, ix, itemY + iconY, iconSize, iconSize);
else
renderer.drawIcon(iconBitmap, ix, itemY + iconY, iconSize, iconSize);
}
}
if (rowSubtitle != nullptr) {
std::string subtitleText = rowSubtitle(i);
auto subtitle = renderer.truncatedText(SMALL_FONT_ID, subtitleText.c_str(), rowTextWidth);
renderer.drawText(SMALL_FONT_ID, textX, itemY + 30, subtitle.c_str(), !sel);
}
if (!valueText.empty()) {
if (sel && highlightValue) {
renderer.fillRoundedRect(
rect.x + contentWidth - LyraCarouselMetrics::values.contentSidePadding - hPad - valueWidth, itemY,
valueWidth + hPad, rowHeight, cornerRadius, Color::Black);
}
renderer.drawText(UI_10_FONT_ID,
rect.x + contentWidth - LyraCarouselMetrics::values.contentSidePadding - valueWidth, itemY + 6,
valueText.c_str(), !sel);
}
}
}
// ---------------------------------------------------------------------------
// Tab bar — solid black background + solid black active tab, inverted text
// ---------------------------------------------------------------------------
void LyraCarouselTheme::drawTabBar(const GfxRenderer& renderer, Rect rect, const std::vector<TabInfo>& tabs,
bool selected) const {
constexpr int hPad = 8;
int currentX = rect.x + LyraCarouselMetrics::values.contentSidePadding;
for (const auto& tab : tabs) {
const int textWidth = renderer.getTextWidth(UI_10_FONT_ID, tab.label, EpdFontFamily::REGULAR);
if (tab.selected) {
if (selected) {
renderer.fillRoundedRect(currentX, rect.y + 1, textWidth + 2 * hPad, rect.height - 4, kCornerRadius,
Color::Black);
} else {
renderer.drawRoundedRect(currentX, rect.y, textWidth + 2 * hPad, rect.height - 3, 1, kCornerRadius, true);
}
}
renderer.drawText(UI_10_FONT_ID, currentX + hPad, rect.y + 6, tab.label, !(tab.selected && selected),
EpdFontFamily::REGULAR);
currentX += textWidth + LyraCarouselMetrics::values.tabSpacing + 2 * hPad;
}
renderer.drawLine(rect.x, rect.y + rect.height - 1, rect.x + rect.width - 1, rect.y + rect.height - 1, true);
}
@@ -0,0 +1,73 @@
#pragma once
#include "components/themes/lyra/LyraTheme.h"
class GfxRenderer;
// Lyra Carousel theme metrics (zero runtime cost)
namespace LyraCarouselMetrics {
constexpr ThemeMetrics values = {.batteryWidth = 16,
.batteryHeight = 12,
.topPadding = 5,
.batteryBarHeight = 40,
.headerHeight = 84,
.verticalSpacing = 16,
.contentSidePadding = 20,
.listRowHeight = 40,
.listWithSubtitleRowHeight = 60,
.menuRowHeight = 64,
.menuSpacing = 8,
.tabSpacing = 8,
.tabBarHeight = 40,
.scrollBarWidth = 4,
.scrollBarRightOffset = 5,
.homeTopPadding = 56,
.homeCoverHeight = 600,
.homeCoverTileHeight = 660,
.homeRecentBooksCount = 5,
.homeContinueReadingInMenu = false,
.homeMenuTopOffset = 16,
.buttonHintsHeight = 40,
.sideButtonHintsWidth = 30,
.progressBarHeight = 16,
.progressBarMarginTop = 1,
.statusBarHorizontalMargin = 5,
.statusBarVerticalMargin = 19,
.keyboardKeyWidth = 31,
.keyboardKeyHeight = 50,
.keyboardKeySpacing = 0,
.keyboardBottomKeyHeight = 35,
.keyboardBottomKeySpacing = 5,
.keyboardBottomAligned = true,
.keyboardCenteredText = true,
.keyboardVerticalOffset = -7,
.keyboardTextFieldWidthPercent = 85,
.keyboardWidthPercent = 90,
.keyboardKeyCornerRadius = 6};
}
class LyraCarouselTheme : public LyraTheme {
public:
// Exact pixel dimensions for each carousel slot — used for exact-size thumbnail generation
static constexpr int kCenterCoverW = 340;
static constexpr int kCenterCoverH = LyraCarouselMetrics::values.homeCoverHeight - 60; // 540
static constexpr int kSideCoverW = 200;
static constexpr int kSideCoverH = LyraCarouselMetrics::values.homeCoverHeight - 210; // 390
static void setPreRenderIndex(int idx);
void drawRecentBookCover(GfxRenderer& renderer, Rect rect, const std::vector<RecentBook>& recentBooks,
const int selectorIndex, bool& coverRendered, bool& coverBufferStored, bool& bufferRestored,
std::function<bool()> storeCoverBuffer) const override;
void drawButtonMenu(GfxRenderer& renderer, Rect rect, int buttonCount, int selectedIndex,
const std::function<std::string(int index)>& buttonLabel,
const std::function<UIIcon(int index)>& rowIcon) const override;
void drawCarouselBorder(GfxRenderer& renderer, Rect coverRect, bool inCarouselRow) const override;
void drawList(const GfxRenderer& renderer, Rect rect, int itemCount, int selectedIndex,
const std::function<std::string(int index)>& rowTitle,
const std::function<std::string(int index)>& rowSubtitle,
const std::function<UIIcon(int index)>& rowIcon, const std::function<std::string(int index)>& rowValue,
bool highlightValue) const override;
void drawTabBar(const GfxRenderer& renderer, Rect rect, const std::vector<TabInfo>& tabs,
bool selected) const override;
};
+3 -2
View File
@@ -81,7 +81,9 @@ void drawLyraBatteryIcon(const GfxRenderer& renderer, int x, int y, int battWidt
}
}
const uint8_t* iconForName(UIIcon icon, int size) {
} // namespace
const uint8_t* LyraTheme::iconForName(UIIcon icon, int size) {
if (size == 24) {
switch (icon) {
case UIIcon::Folder:
@@ -125,7 +127,6 @@ const uint8_t* iconForName(UIIcon icon, int size) {
}
return nullptr;
}
} // namespace
// Reads the overall progress percent stored as the last byte of progress.bin.
// The cache path is derived from the book path alone (no epub/xtc/txt loading needed).
+1
View File
@@ -81,4 +81,5 @@ class LyraTheme : public BaseTheme {
protected:
static int getRecentBookProgressPercent(const RecentBook& book);
static void drawProgressBadge(const GfxRenderer& renderer, Rect anchorRect, int progressPercent);
static const uint8_t* iconForName(UIIcon icon, int size);
};