snark13/Xteink-X4-crosspoint-reader
1
0
Fork 0
mirror of https://github.com/daveallie/crosspoint-reader.git synced 2026-02-06 23:57:39 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Compare commits

base: snark13:18e14d03276f57b962e85c06d96af44f190a5979
Branches Tags
snark13:master
snark13:release/1.0.0
snark13:feature/crosspoint-font
snark13:0.16.0
snark13:0.15.0
snark13:0.14.0
snark13:0.13.1
snark13:0.13.0
snark13:0.12.0
snark13:0.11.2
snark13:0.11.1
snark13:0.11.0
snark13:0.10.0
snark13:0.9.0
snark13:0.8.1
snark13:0.8.0
snark13:0.7.0
snark13:0.6.0
snark13:0.5.1
snark13:0.5.0
snark13:0.4.0
snark13:0.3.0
snark13:0.2.4
snark13:0.2.3
snark13:0.2.2
snark13:0.2.1
snark13:0.2.0
snark13:0.1.1
snark13:0.1.0
..
compare: snark13:9fe7c8f8c185b998307dff4b51bd552f34a1e8a9
Branches Tags
snark13:release/1.0.0
snark13:master
snark13:feature/crosspoint-font
snark13:0.16.0
snark13:0.15.0
snark13:0.14.0
snark13:0.13.1
snark13:0.13.0
snark13:0.12.0
snark13:0.11.2
snark13:0.11.1
snark13:0.11.0
snark13:0.10.0
snark13:0.9.0
snark13:0.8.1
snark13:0.8.0
snark13:0.7.0
snark13:0.6.0
snark13:0.5.1
snark13:0.5.0
snark13:0.4.0
snark13:0.3.0
snark13:0.2.4
snark13:0.2.3
snark13:0.2.2
snark13:0.2.1
snark13:0.2.0
snark13:0.1.1
snark13:0.1.0

3 Commits
18e14d0327 ... 9fe7c8f8c1

Author SHA1 Message Date
CaptainFrito
9fe7c8f8c1
Merge a3a9f8a2af into 3ce11f14ce 2026-01-24 03:27:22 +00:00
CaptainFrito
a3a9f8a2af Clang format fix 2026-01-24 10:26:55 +07:00
CaptainFrito
927c3c1f9f feat: UI themes, Lyra 2026-01-24 10:04:15 +07:00
2 changed files with 9 additions and 14 deletions
Show Stats Expand all files Collapse all files

12
src/components/themes/BaseTheme.cpp
View File

@ -22,11 +22,9 @@ void BaseTheme::drawBattery(const GfxRenderer& renderer, Rect rect, const bool s
// Left aligned battery icon and percentage
// TODO refactor this so the percentage doesnt change after we position it
const uint16_t percentage = battery.readPercentage();
if (showPercentage) {
const auto percentageText = std::to_string(percentage) + "%";
renderer.drawText(SMALL_FONT_ID, rect.x + batteryPercentSpacing + BaseMetrics::values.batteryWidth, rect.y,
percentageText.c_str());
}
const auto percentageText = showPercentage ? std::to_string(percentage) + "%" : "";
renderer.drawText(SMALL_FONT_ID, rect.x + batteryPercentSpacing + BaseMetrics::values.batteryWidth, rect.y,
percentageText.c_str());
// 1 column on left, 2 columns on right, 5 columns of battery body
const int x = rect.x;
const int y = rect.y + 6;
@ -212,8 +210,8 @@ void BaseTheme::drawHeader(const GfxRenderer& renderer, Rect rect, const char* t
const auto percentageText = std::to_string(percentage) + "%";
batteryX -= renderer.getTextWidth(SMALL_FONT_ID, percentageText.c_str());
}
drawBattery(renderer, Rect{batteryX, rect.y + 5, BaseMetrics::values.batteryWidth, BaseMetrics::values.batteryHeight},
showBatteryPercentage);
drawBattery(renderer,
Rect{batteryX, rect.y + 5, BaseMetrics::values.batteryWidth, BaseMetrics::values.batteryHeight});
if (title) {
renderer.drawCenteredText(UI_12_FONT_ID, rect.y + 5, title, true, EpdFontFamily::BOLD);

11
src/components/themes/lyra/LyraTheme.cpp
View File

@ -22,11 +22,9 @@ constexpr int topHintButtonY = 345;
void LyraTheme::drawBattery(const GfxRenderer& renderer, Rect rect, const bool showPercentage) {
// Left aligned battery icon and percentage
const uint16_t percentage = battery.readPercentage();
if (showPercentage) {
const auto percentageText = std::to_string(percentage) + "%";
renderer.drawText(SMALL_FONT_ID, rect.x + batteryPercentSpacing + LyraMetrics::values.batteryWidth, rect.y,
percentageText.c_str());
}
const auto percentageText = showPercentage ? std::to_string(percentage) + "%" : "";
renderer.drawText(SMALL_FONT_ID, rect.x + batteryPercentSpacing + LyraMetrics::values.batteryWidth, rect.y,
percentageText.c_str());
// 1 column on left, 2 columns on right, 5 columns of battery body
const int x = rect.x;
const int y = rect.y + 6;
@ -66,8 +64,7 @@ void LyraTheme::drawHeader(const GfxRenderer& renderer, Rect rect, const char* t
batteryX -= renderer.getTextWidth(SMALL_FONT_ID, percentageText.c_str());
}
drawBattery(renderer,
Rect{batteryX, rect.y + 10, LyraMetrics::values.batteryWidth, LyraMetrics::values.batteryHeight},
showBatteryPercentage);
Rect{batteryX, rect.y + 10, LyraMetrics::values.batteryWidth, LyraMetrics::values.batteryHeight});
if (title) {
renderer.drawText(UI_12_FONT_ID, rect.x + LyraMetrics::values.contentSidePadding,