Mirrors/MeshCore-Solo
1
0
Fork 0
mirror of https://github.com/MarekZegare4/MeshCore-Solo.git synced 2026-11-02 19:02:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(l1): Home quick panels, map page with live data, quieter status bar

Browse Source 
- Icon pages become quick panels: two or three rows (Settings, Messages,
  Bluetooth, Advert, Tools, Power) inset from the edges, the last one
  opening the full screen. Brightness and auto-advert are edited in place
  (Enter, Left/Right, Enter/Back saves once).
- Tools panel shows the two tools used last with their live state.
- Map page: preview on the left, GPS / trail / live / target on the right.
- Favourites as soft cards; Status tile with a battery spark line.
- Status bar without boxes or blinking; BT only when connected, GPS
  search glyph without a fix.
- Redrawn mini icons (advert waves, cog, wrench, messages); big hovering
  icons removed. Tools list is text only.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Jakub
2026-10-02 10:23:58 +02:00
co-authored by Claude Opus 5.5
parent 6d8e56fbd0
commit 0f635c0171
9 changed files with 521 additions and 582 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/companion_radio/ui-new/ToolsScreen.h
+58 -59
View File
@@ -4,14 +4,13 @@
//
// The flat 10-item list grew crowded, so tools are grouped into collapsible
// sections (Location / Comms / System) via the shared AccordionList helper —
// the same fold-in-place model as Settings. Each row carries a mini-icon;
// section headers show their cog/marker plus a fold indicator.
// the same fold-in-place model as Settings. Rows are text only; section
// headers carry a fold mark.
#include "AccordionList.h"
class ToolsScreen : public UIScreen {
UITask* _task;
public:
enum Action {
ACT_NEARBY, ACT_LIVESHARE, ACT_TRAIL, ACT_LOCATOR, ACT_COMPASS,
ACT_BOT, ACT_AUTOADVERT, ACT_REPEATER, ACT_ADMIN,
@@ -20,9 +19,45 @@ class ToolsScreen : public UIScreen {
, ACT_GPIO
#endif
};
struct Tool { const char* label; const MiniIcon* icon; Action action; };
struct Tool { const char* label; Action action; };
struct Section { const char* name; const Tool* tools; uint8_t count; };
// The two tools used last, newest first, for the Home Tools panel. Kept in
// RAM only: a reboot starts again from Nodes and Live Share.
static const int RECENT_MAX = 2;
static Action s_recent[RECENT_MAX];
static const char* labelOf(Action a) {
for (int i = 0; i < SECTION_COUNT; i++)
for (int j = 0; j < SECTIONS[i].count; j++)
if (SECTIONS[i].tools[j].action == a) return SECTIONS[i].tools[j].label;
return "";
}
// Opens a tool and moves it to the front of the recent list.
static void run(UITask* task, Action a) {
if (s_recent[0] != a) { s_recent[1] = s_recent[0]; s_recent[0] = a; }
switch (a) {
case ACT_NEARBY: task->gotoNearbyScreen(); break;
case ACT_LIVESHARE: task->gotoLiveShareScreen(); break;
case ACT_TRAIL: task->gotoTrailScreen(); break;
case ACT_LOCATOR: task->gotoLocatorScreen(); break;
case ACT_COMPASS: task->gotoCompassScreen(); break;
case ACT_BOT: task->gotoBotScreen(); break;
case ACT_AUTOADVERT: task->gotoAutoAdvertScreen(); break;
case ACT_REPEATER: task->gotoRepeaterScreen(); break;
case ACT_ADMIN: task->pickAdminTarget(); break; // Admin is remote-only: pick a node first
case ACT_CLOCK: task->gotoClockTools(); break;
case ACT_RINGTONE: task->gotoRingtoneEditor(); break;
#if defined(PIN_GPIO1)
case ACT_GPIO: task->gotoGpioScreen(); break;
#endif
}
}
private:
UITask* _task;
static const Tool LOCATION_TOOLS[];
static const Tool COMMS_TOOLS[];
static const Tool SYSTEM_TOOLS[];
@@ -31,41 +66,6 @@ class ToolsScreen : public UIScreen {
AccordionList _acc;
// Fixed icon gutter so labels line up whether or not a row has a glyph. Sized
// for the widest icon (the 7px cog) at the current font scale.
static int gutter(DisplayDriver& d) { return 7 * miniIconScale(d) + 2; }
// Was hand-rolling its own vertical centring against lineStep() (line height
// + the 2px inter-row gap) instead of just the line height itself -- 2px too
// much slack pushed a nearly-full-height icon (e.g. the 7px cog) low enough
// to clip against the row below, which is what "don't fit visually" meant.
// miniIconDraw() (icons.h) already centres correctly against getLineHeight()
// alone -- the same call drawAckGlyph uses for the message-list checkmark --
// so just delegate to it instead of keeping a second, subtly-wrong copy.
static void drawIcon(DisplayDriver& d, int x, int y, const MiniIcon* ic) {
if (!ic) return;
miniIconDraw(d, x, y, *ic);
}
void dispatch(Action a) {
switch (a) {
case ACT_NEARBY: _task->gotoNearbyScreen(); break;
case ACT_LIVESHARE: _task->gotoLiveShareScreen(); break;
case ACT_TRAIL: _task->gotoTrailScreen(); break;
case ACT_LOCATOR: _task->gotoLocatorScreen(); break;
case ACT_COMPASS: _task->gotoCompassScreen(); break;
case ACT_BOT: _task->gotoBotScreen(); break;
case ACT_AUTOADVERT: _task->gotoAutoAdvertScreen(); break;
case ACT_REPEATER: _task->gotoRepeaterScreen(); break;
case ACT_ADMIN: _task->pickAdminTarget(); break; // Admin is remote-only: pick a node first
case ACT_CLOCK: _task->gotoClockTools(); break;
case ACT_RINGTONE: _task->gotoRingtoneEditor(); break;
#if defined(PIN_GPIO1)
case ACT_GPIO: _task->gotoGpioScreen(); break;
#endif
}
}
public:
ToolsScreen(UITask* task) : _task(task) {}
@@ -82,22 +82,19 @@ public:
drawScreenHeader(display, "Tools");
const int cw = display.getCharWidth();
const int g = gutter(display);
_acc.render(display,
// Section header: disclosure mark + name
[&](int sec, int y, bool sel, int reserve, bool collapsed) {
drawRowSelection(display, y, sel, reserve);
drawDisclosure(display, 2, y, !collapsed);
display.setCursor(2 + 2 * cw, y); // the mark stands in for an icon, as in Settings
display.setCursor(2 + 2 * cw, y); // after the disclosure mark, as in Settings
display.print(SECTIONS[sec].name);
},
// Item: indented "<icon> Label"
// Item: its label, under its section's name
[&](int sec, int item, int y, bool sel, int reserve) {
drawRowSelection(display, y, sel, reserve);
const int icon_x = 2 + cw + 2; // align item icons under the header icon
drawIcon(display, icon_x, y, SECTIONS[sec].tools[item].icon);
display.setCursor(icon_x + g, y);
display.setCursor(2 + 2 * cw, y);
display.print(SECTIONS[sec].tools[item].label);
});
return 500;
@@ -108,7 +105,7 @@ public:
switch (_acc.handleInput(c)) {
case AccordionList::ACTIVATED: {
const AccordionList::Row& r = _acc.selected();
dispatch(SECTIONS[r.sec].tools[r.item].action);
run(_task, SECTIONS[r.sec].tools[r.item].action);
return true;
}
case AccordionList::HANDLED: return true;
@@ -118,24 +115,26 @@ public:
}
};
ToolsScreen::Action ToolsScreen::s_recent[ToolsScreen::RECENT_MAX] = { ACT_NEARBY, ACT_LIVESHARE };
const ToolsScreen::Tool ToolsScreen::LOCATION_TOOLS[] = {
{ "Nodes", &ICON_MAP_CONTACT, ACT_NEARBY },
{ "Live Share", &ICON_GPS, ACT_LIVESHARE },
{ "Trail", &ICON_TRAIL, ACT_TRAIL },
{ "Locator", &ICON_MAP_WAYPOINT, ACT_LOCATOR },
{ "Compass", &ICON_MAP_NORTH, ACT_COMPASS },
{ "Nodes", ACT_NEARBY },
{ "Live Share", ACT_LIVESHARE },
{ "Trail", ACT_TRAIL },
{ "Locator", ACT_LOCATOR },
{ "Compass", ACT_COMPASS },
};
const ToolsScreen::Tool ToolsScreen::COMMS_TOOLS[] = {
{ "Remote Bot", &ICON_BOT, ACT_BOT },
{ "Auto-Advert", &ICON_ADVERT, ACT_AUTOADVERT },
{ "Repeater", &ICON_REPEATER, ACT_REPEATER },
{ "Admin", &ICON_KEY, ACT_ADMIN },
{ "Remote Bot", ACT_BOT },
{ "Auto-Advert", ACT_AUTOADVERT },
{ "Repeater", ACT_REPEATER },
{ "Admin", ACT_ADMIN },
};
const ToolsScreen::Tool ToolsScreen::SYSTEM_TOOLS[] = {
{ "Clock Tools", &ICON_ALARM, ACT_CLOCK },
{ "Ringtone Editor", &ICON_NOTE, ACT_RINGTONE },
{ "Clock Tools", ACT_CLOCK },
{ "Ringtone Editor", ACT_RINGTONE },
#if defined(PIN_GPIO1)
{ "GPIO", &ICON_PINS, ACT_GPIO },
{ "GPIO", ACT_GPIO },
#endif
};
const ToolsScreen::Section ToolsScreen::SECTIONS[] = {