mirror of
https://github.com/MarekZegare4/MeshCore-Solo.git
synced 2026-08-03 10:46:12 +00:00
JakubandClaude Sonnet 4.6
744f263932
Add lineStep(), headerH(), listStart(), listVisible(), valCol() to DisplayDriver so layout derives from getLineHeight() instead of fixed OLED constants. Refactor all screens (SettingsScreen, NearbyScreen, FullscreenMsgView, QuickMsgScreen, BotScreen, DashboardConfigScreen, AutoAdvertScreen, RingtoneEditorScreen) and all HomeScreen pages plus the lock screen and splash screen in UITask.cpp. On OLED (lh=8) positions are unchanged; on landscape e-ink (lh=16) all text and widgets now scale correctly to the 250×122 display. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
91 lines
2.9 KiB
C++
91 lines
2.9 KiB
C++
#pragma once
|
|
// Configures which data fields appear on the clock home page.
|
|
// Included by UITask.cpp after BotScreen.h.
|
|
|
|
// Field type constants — used here and in UITask.cpp HP_CLOCK render.
|
|
static const uint8_t DASH_NONE = 0;
|
|
static const uint8_t DASH_BATT = 1;
|
|
static const uint8_t DASH_TEMP = 2;
|
|
static const uint8_t DASH_HUM = 3;
|
|
static const uint8_t DASH_PRES = 4;
|
|
static const uint8_t DASH_GPS = 5;
|
|
static const uint8_t DASH_ALT = 6;
|
|
static const uint8_t DASH_LUX = 7;
|
|
static const uint8_t DASH_CO2 = 8;
|
|
static const uint8_t DASH_NODES = 9;
|
|
static const uint8_t DASH_MSGS = 10;
|
|
static const uint8_t DASH_COUNT = 11;
|
|
|
|
class DashboardConfigScreen : public UIScreen {
|
|
UITask* _task;
|
|
NodePrefs* _prefs;
|
|
|
|
static const int FIELD_SLOTS = 3;
|
|
|
|
static const char* OPTION_NAMES[DASH_COUNT];
|
|
|
|
int _sel;
|
|
bool _dirty;
|
|
|
|
void cycle(int slot, int dir) {
|
|
uint8_t& f = _prefs->dashboard_fields[slot];
|
|
f = (uint8_t)((f + DASH_COUNT + dir) % DASH_COUNT);
|
|
_dirty = true;
|
|
}
|
|
|
|
public:
|
|
DashboardConfigScreen(UITask* task, NodePrefs* prefs) : _task(task), _prefs(prefs) {}
|
|
|
|
void enter() { _sel = 0; _dirty = false; }
|
|
|
|
int render(DisplayDriver& display) override {
|
|
display.setTextSize(1);
|
|
display.setColor(DisplayDriver::LIGHT);
|
|
int item_h = display.lineStep();
|
|
int start_y = display.listStart();
|
|
int val_x = display.valCol();
|
|
|
|
display.drawTextCentered(display.width() / 2, 0, "CLOCK FIELDS");
|
|
display.fillRect(0, display.headerH() - 1, display.width(), 1);
|
|
|
|
static const char* labels[] = { "Field 1", "Field 2", "Field 3" };
|
|
for (int i = 0; i < FIELD_SLOTS; i++) {
|
|
int y = start_y + i * item_h;
|
|
bool sel = (i == _sel);
|
|
if (sel) {
|
|
display.setColor(DisplayDriver::LIGHT);
|
|
display.fillRect(0, y - 1, display.width(), item_h);
|
|
display.setColor(DisplayDriver::DARK);
|
|
} else {
|
|
display.setColor(DisplayDriver::LIGHT);
|
|
}
|
|
display.setCursor(2, y);
|
|
display.print(labels[i]);
|
|
display.setCursor(val_x, y);
|
|
uint8_t f = _prefs->dashboard_fields[i];
|
|
display.print(OPTION_NAMES[f < DASH_COUNT ? f : DASH_NONE]);
|
|
display.setColor(DisplayDriver::LIGHT);
|
|
}
|
|
return 500;
|
|
}
|
|
|
|
bool handleInput(char c) override {
|
|
if (c == KEY_CANCEL || c == KEY_CONTEXT_MENU) {
|
|
if (_dirty) the_mesh.savePrefs();
|
|
_task->gotoHomeScreen();
|
|
return true;
|
|
}
|
|
if (c == KEY_UP && _sel > 0) { _sel--; return true; }
|
|
if (c == KEY_DOWN && _sel < FIELD_SLOTS - 1){ _sel++; return true; }
|
|
if (c == KEY_LEFT || c == KEY_PREV) { cycle(_sel, -1); return true; }
|
|
if (c == KEY_RIGHT || c == KEY_NEXT) { cycle(_sel, 1); return true; }
|
|
if (c == KEY_ENTER) { cycle(_sel, 1); return true; }
|
|
return false;
|
|
}
|
|
};
|
|
|
|
const char* DashboardConfigScreen::OPTION_NAMES[DASH_COUNT] = {
|
|
"None", "Battery", "Temp", "Humidity", "Pressure",
|
|
"GPS", "Altitude", "Lux", "CO2", "Contacts", "Messages"
|
|
};
|