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

fix(extensions): support left/right navigation in Apps menu

Browse Source
This commit is contained in:
Daniel 2026-02-03 22:46:38 -08:00
parent eedc856708
commit f611cc9615
1 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/activities/apps/AppsActivity.cpp
View File

@ -1,12 +1,12 @@
#include "AppsActivity.h"
#include <Arduino.h>
#include <EInkDisplay.h>
#include <GfxRenderer.h>
#include <InputManager.h>
#include <MappedInputManager.h>
#include <SDCardManager.h>
#include <fontIds.h>
#include <GfxRenderer.h>
#include <MappedInputManager.h>
#include <Arduino.h>
AppsActivity::AppsActivity(GfxRenderer& renderer, MappedInputManager& mappedInput, ExitCallback exitCallback)
: Activity("Apps", renderer, mappedInput),
@ -24,21 +24,21 @@ void AppsActivity::onEnter() {
needsUpdate_ = true;
}
void AppsActivity::onExit() {
Activity::onExit();
}
void AppsActivity::onExit() { Activity::onExit(); }
void AppsActivity::loop() {
if (isFlashing_) {
return;
}
if (mappedInput_.wasPressed(MappedInputManager::Button::Up)) {
if (mappedInput_.wasPressed(MappedInputManager::Button::Up) ||
mappedInput_.wasPressed(MappedInputManager::Button::Left)) {
if (selectedIndex_ > 0) {
selectedIndex_--;
needsUpdate_ = true;
}
} else if (mappedInput_.wasPressed(MappedInputManager::Button::Down)) {
} else if (mappedInput_.wasPressed(MappedInputManager::Button::Down) ||
mappedInput_.wasPressed(MappedInputManager::Button::Right)) {
if (selectedIndex_ < static_cast<int>(appList_.size()) - 1) {
selectedIndex_++;
needsUpdate_ = true;
@ -62,10 +62,10 @@ void AppsActivity::loop() {
void AppsActivity::scanApps() {
appList_.clear();
selectedIndex_ = 0;
CrossPoint::AppLoader loader;
appList_ = loader.scanApps();
Serial.printf("[%lu] [AppsActivity] Found %d apps\n", millis(), appList_.size());
}
@ -73,17 +73,17 @@ void AppsActivity::launchApp() {
if (selectedIndex_ >= static_cast<int>(appList_.size())) {
return;
}
const auto& app = appList_[selectedIndex_];
String binPath = app.path + "/app.bin";
Serial.printf("[%lu] [AppsActivity] Launching app: %s\n", millis(), app.manifest.name.c_str());
isFlashing_ = true;
flashProgress_ = 0;
needsUpdate_ = true;
renderProgress();
CrossPoint::AppLoader loader;
bool success = loader.flashApp(binPath, [this](size_t written, size_t total) {
const int nextProgress = (total > 0) ? static_cast<int>((written * 100) / total) : 0;
@ -93,7 +93,7 @@ void AppsActivity::launchApp() {
renderProgress();
}
});
if (!success) {
Serial.printf("[%lu] [AppsActivity] Flash failed\n", millis());
isFlashing_ = false;
@ -103,13 +103,13 @@ void AppsActivity::launchApp() {
void AppsActivity::render() {
renderer_.clearScreen();
const int pageWidth = renderer_.getScreenWidth();
const int pageHeight = renderer_.getScreenHeight();
// Title
renderer_.drawCenteredText(UI_12_FONT_ID, 30, "Apps");
if (appList_.empty()) {
renderer_.drawCenteredText(UI_10_FONT_ID, pageHeight / 2, "No apps found");
renderer_.drawCenteredText(UI_10_FONT_ID, pageHeight / 2 + 30, "Add apps to /.crosspoint/apps/");
@ -118,20 +118,20 @@ void AppsActivity::render() {
const int startY = 70;
const int lineHeight = 35;
const int maxVisible = 10;
int startIdx = 0;
if (selectedIndex_ >= maxVisible) {
startIdx = selectedIndex_ - maxVisible + 1;
}
for (int i = 0; i < maxVisible && (startIdx + i) < static_cast<int>(appList_.size()); i++) {
int idx = startIdx + i;
int y = startY + i * lineHeight;
const auto& app = appList_[idx];
char buf[128];
snprintf(buf, sizeof(buf), "%s v%s", app.manifest.name.c_str(), app.manifest.version.c_str());
if (idx == selectedIndex_) {
// Highlight selected item
int textWidth = renderer_.getTextWidth(UI_12_FONT_ID, buf);
@ -143,7 +143,7 @@ void AppsActivity::render() {
renderer_.drawCenteredText(UI_10_FONT_ID, y, buf);
}
}
// Scroll indicator
if (appList_.size() > maxVisible) {
char scrollInfo[32];
@ -151,47 +151,47 @@ void AppsActivity::render() {
renderer_.drawCenteredText(UI_10_FONT_ID, pageHeight - 80, scrollInfo);
}
}
// Button hints
const char* btn1 = "Back";
const char* btn2 = appList_.empty() ? "" : "Launch";
const char* btn3 = "Up";
const char* btn4 = "Down";
const char* btn3 = "<";
const char* btn4 = ">";
auto labels = mappedInput_.mapLabels(btn1, btn2, btn3, btn4);
renderer_.drawButtonHints(UI_10_FONT_ID, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
renderer_.displayBuffer();
}
void AppsActivity::renderProgress() {
renderer_.clearScreen();
const int pageWidth = renderer_.getScreenWidth();
const int pageHeight = renderer_.getScreenHeight();
renderer_.drawCenteredText(UI_12_FONT_ID, pageHeight / 2 - 40, "Flashing App...");
// Progress bar
const int barWidth = 300;
const int barHeight = 30;
const int barX = (pageWidth - barWidth) / 2;
const int barY = pageHeight / 2;
// Border
renderer_.drawRect(barX, barY, barWidth, barHeight);
// Fill
int fillWidth = (flashProgress_ * barWidth) / 100;
if (fillWidth > 0) {
renderer_.fillRect(barX + 1, barY + 1, fillWidth - 2, barHeight - 2);
}
// Percentage text
char percentStr[16];
snprintf(percentStr, sizeof(percentStr), "%d%%", flashProgress_);
renderer_.drawCenteredText(UI_12_FONT_ID, barY + barHeight + 20, percentStr);
renderer_.displayBuffer();
}