eric/Crosspoint
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor visual appearance of SystemInformation

Browse Source
This commit is contained in:
jpirnay
2026-04-16 11:57:40 +02:00
parent 0a472d9dbb
commit 3f1b9d0964
5 changed files with 269 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/activities/settings/SystemInformationActivity.cpp
+90 -38
View File
@@ -3,21 +3,53 @@
#include <GfxRenderer.h>
#include <I18n.h>
#include <algorithm>
#include "MappedInputManager.h"
#include "SystemStatus.h"
#include "components/UITheme.h"
#include "fontIds.h"
static const char* pickUnit(uint64_t maxBytes, double& outDivisor) {
if (maxBytes >= 1024ULL * 1024 * 1024) {
outDivisor = 1024.0 * 1024.0 * 1024.0;
return "GB";
}
if (maxBytes >= 1024ULL * 1024) {
outDivisor = 1024.0 * 1024.0;
return "MB";
}
if (maxBytes >= 1024ULL) {
outDivisor = 1024.0;
return "KB";
}
outDivisor = 1.0;
return "B";
}
static std::string formatBytes(uint64_t bytes) {
double div;
const char* unit = pickUnit(bytes, div);
char buf[16];
if (bytes >= 1024ULL * 1024 * 1024) {
snprintf(buf, sizeof(buf), "%.1f GB", bytes / (1024.0 * 1024.0 * 1024.0));
} else if (bytes >= 1024ULL * 1024) {
snprintf(buf, sizeof(buf), "%.1f MB", bytes / (1024.0 * 1024.0));
} else if (bytes >= 1024ULL) {
snprintf(buf, sizeof(buf), "%.1f KB", bytes / 1024.0);
if (div == 1.0) {
snprintf(buf, sizeof(buf), "%llu %s", static_cast<unsigned long long>(bytes), unit);
} else {
snprintf(buf, sizeof(buf), "%llu B", static_cast<unsigned long long>(bytes));
snprintf(buf, sizeof(buf), "%.1f %s", bytes / div, unit);
}
return buf;
}
// Format three byte values on a single line sharing one trailing unit. The
// unit is chosen from the largest of the three so all values fit sensibly.
static std::string formatBytesTriple(uint64_t a, uint64_t b, uint64_t c) {
double div;
const char* unit = pickUnit(std::max({a, b, c}), div);
char buf[48];
if (div == 1.0) {
snprintf(buf, sizeof(buf), "%llu / %llu / %llu %s", static_cast<unsigned long long>(a),
static_cast<unsigned long long>(b), static_cast<unsigned long long>(c), unit);
} else {
snprintf(buf, sizeof(buf), "%.1f / %.1f / %.1f %s", a / div, b / div, c / div, unit);
}
return buf;
}
@@ -62,29 +94,40 @@ void SystemInformationActivity::loop() {
void SystemInformationActivity::render(RenderLock&&) {
const auto& metrics = UITheme::getInstance().getMetrics();
const auto pageWidth = renderer.getScreenWidth();
const Rect contentRect = UITheme::getContentRect(renderer, /*hasBottomHints=*/true, /*hasSideHints=*/false);
renderer.clearScreen();
GUI.drawHeader(renderer, Rect{0, metrics.topPadding, pageWidth, metrics.headerHeight}, tr(STR_SYSTEM_INFO),
CROSSPOINT_VERSION);
GUI.drawHeader(renderer,
Rect{contentRect.x, contentRect.y + metrics.topPadding, contentRect.width, metrics.headerHeight},
tr(STR_SYSTEM_INFO), CROSSPOINT_VERSION);
// Layout: label on the left, value right of the midpoint
const int leftX = metrics.verticalSpacing * 3;
const int valueX = pageWidth / 2;
// Two-column layout with interleaved section headers (drawn via the theme's
// subheader so the full-width underline is consistent with the rest of the
// UI). Data rows use a bold label on the left and the value at the column
// midpoint; row step is tightened so all sections fit on one screen.
const int leftX = contentRect.x + metrics.verticalSpacing * 3;
const int valueX = contentRect.x + contentRect.width / 2;
const int lineH = renderer.getLineHeight(UI_10_FONT_ID);
const int startY = metrics.topPadding + metrics.headerHeight + metrics.verticalSpacing * 3;
const int rowStep = lineH + 2;
const int subHeaderHeight = lineH + 6;
int y = contentRect.y + metrics.topPadding + metrics.headerHeight + metrics.verticalSpacing;
auto drawRow = [&](int row, const char* label, const std::string& value) {
const int y = startY + row * (lineH + metrics.verticalSpacing);
auto drawSection = [&](const char* title) {
GUI.drawSubHeader(renderer, Rect{contentRect.x, y, contentRect.width, subHeaderHeight}, title);
y += subHeaderHeight + 2;
};
auto drawRow = [&](const char* label, const std::string& value) {
renderer.drawText(UI_10_FONT_ID, leftX, y, label, true, EpdFontFamily::BOLD);
renderer.drawText(UI_10_FONT_ID, valueX, y, value.c_str());
y += rowStep;
};
if (!status_.has_value()) {
// Stats not yet collected — show a placeholder so the screen updates immediately
drawRow(0, tr(STR_FW_VERSION), CROSSPOINT_VERSION);
drawRow(2, "", tr(STR_GATHERING_DATA));
drawRow(tr(STR_FW_VERSION), CROSSPOINT_VERSION);
y += rowStep;
drawRow("", tr(STR_GATHERING_DATA));
const auto labels = mappedInput.mapLabels(tr(STR_BACK), "", "", "");
GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
renderer.displayBuffer();
@@ -93,37 +136,46 @@ void SystemInformationActivity::render(RenderLock&&) {
const auto& status = *status_;
drawRow(0, tr(STR_FW_VERSION), status.version);
drawRow(1, tr(STR_CHIP), status.chipVersion);
drawRow(2, tr(STR_CPU), std::to_string(status.cpuFreqMHz) + " " + tr(STR_MHZ));
drawRow(3, tr(STR_FREE_RAM), formatBytes(status.freeHeapBytes));
drawRow(4, tr(STR_MIN_FREE), formatBytes(status.minFreeHeapBytes));
drawRow(5, tr(STR_MAX_BLOCK), formatBytes(status.maxAllocHeapBytes));
drawRow(
6, tr(STR_FLASH_USED),
formatBytes(status.flashAppUsedBytes) + " / " + formatBytes(status.flashAppUsedBytes + status.flashAppFreeBytes));
drawSection(tr(STR_SEC_VERSION));
drawRow(tr(STR_FW_VERSION), status.version);
drawRow(tr(STR_DEVICE), std::string(status.deviceType) + " (" + std::to_string(status.displayWidth) + " x " +
std::to_string(status.displayHeight) + " px)");
drawSection(tr(STR_SEC_CHIP));
drawRow(tr(STR_CHIP), status.chipVersion);
drawRow(tr(STR_CPU), std::to_string(status.cpuFreqMHz) + " " + tr(STR_MHZ));
drawSection(tr(STR_SEC_MEMORY));
drawRow(tr(STR_MEM_COMBINED),
formatBytesTriple(status.freeHeapBytes, status.minFreeHeapBytes, status.maxAllocHeapBytes));
drawSection(tr(STR_SEC_FLASH));
drawRow(tr(STR_APP_PARTITION), formatBytes(status.flashAppPartitionSize));
drawRow(tr(STR_FLASH_TOTAL), formatBytes(status.flashBytes));
drawSection(tr(STR_SEC_RUNTIME));
const uint32_t h = status.uptimeSeconds / 3600;
const uint32_t m = (status.uptimeSeconds % 3600) / 60;
const uint32_t s = status.uptimeSeconds % 60;
char uptimeBuf[16];
snprintf(uptimeBuf, sizeof(uptimeBuf), "%uh %02um %02us", h, m, s);
drawRow(tr(STR_UPTIME), uptimeBuf);
std::string batteryLabel = std::to_string(status.batteryPercent) + "%";
if (status.charging) {
batteryLabel += " (";
batteryLabel += tr(STR_CHARGING);
batteryLabel += ")";
}
drawRow(7, tr(STR_BATTERY), batteryLabel);
const uint32_t h = status.uptimeSeconds / 3600;
const uint32_t m = (status.uptimeSeconds % 3600) / 60;
const uint32_t s = status.uptimeSeconds % 60;
char uptimeBuf[16];
snprintf(uptimeBuf, sizeof(uptimeBuf), "%uh %02um %02us", h, m, s);
drawRow(8, tr(STR_UPTIME), uptimeBuf);
drawRow(tr(STR_BATTERY), batteryLabel);
drawSection(tr(STR_SEC_STORAGE));
if (!sdStatusReady_) {
const char* sdMessage = sdLoadRequested_ ? tr(STR_READING) : tr(STR_SD_UPDATE_PROMPT);
drawRow(9, tr(STR_SD_CARD), sdMessage);
drawRow(tr(STR_SD_CARD), sdMessage);
} else if (status.sdTotalBytes > 0) {
drawRow(9, tr(STR_SD_CARD), formatBytes(status.sdUsedBytes) + " / " + formatBytes(status.sdTotalBytes));
drawRow(tr(STR_SD_CARD), formatBytes(status.sdUsedBytes) + " / " + formatBytes(status.sdTotalBytes));
} else {
drawRow(9, tr(STR_SD_CARD), tr(STR_NOT_SET));
drawRow(tr(STR_SD_CARD), tr(STR_NOT_SET));
}
const auto labels = mappedInput.mapLabels(tr(STR_BACK), sdStatusReady_ ? "" : tr(STR_UPDATE), "", "");