Mirrors/MeshCore-Solo
1
0
Fork 0
mirror of https://github.com/MarekZegare4/MeshCore-Solo.git synced 2026-08-03 10:46:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: extract on-screen keyboard into reusable KeyboardWidget module

Browse Source 
All three keyboard implementations (SettingsScreen, QuickMsgScreen, BotScreen)
now share a single KeyboardWidget struct defined in KeyboardWidget.h, eliminating
~480 lines of duplicated render/input logic. Also fixes the SettingsScreen bug
where navigation keys were checked before the placeholder overlay, causing cursor
movement when the overlay was open.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Jakub
2026-05-13 21:09:47 +02:00
co-authored by Claude Sonnet 4.6
parent 60867a4c9e
commit 07bd5f1167
3 changed files with 265 additions and 543 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/companion_radio/ui-new/BotScreen.h
+31 -169
View File
@@ -1,6 +1,6 @@
#pragma once
// Custom screen — not part of upstream UITask.cpp
// Included by UITask.cpp after the global KB_* constants are defined.
// Included by UITask.cpp after KeyboardWidget.h is defined.
class BotScreen : public UIScreen {
UITask* _task;
@@ -15,14 +15,8 @@ class BotScreen : public UIScreen {
int _sel;
// keyboard state (reused for trigger and reply fields)
int _kb_field; // -1=off, 2=trigger, 3=reply
char _kb_buf[KB_MAX_LEN + 1];
int _kb_len;
int _kb_maxlen;
int _kb_row, _kb_col;
bool _kb_caps;
bool _kb_ph_mode;
int _kb_ph_sel;
int _kb_field; // -1=off, 2=trigger, 3=reply DM, 4=reply Ch
KeyboardWidget _kb;
// channel cache (refreshed on enter)
int _num_channels;
@@ -59,76 +53,7 @@ public:
display.setColor(DisplayDriver::LIGHT);
if (_kb_field >= 0) {
const char* label = (_kb_field == 2) ? "Trigger:" : "Reply:";
const char* disp_start = _kb_buf;
int disp_len = _kb_len;
if (disp_len > 20) { disp_start = _kb_buf + (disp_len - 20); disp_len = 20; }
char preview[28];
snprintf(preview, sizeof(preview), "%s%.*s_", label, disp_len, disp_start);
display.setCursor(0, KB_TEXT_Y);
display.print(preview);
display.fillRect(0, KB_SEP_Y, display.width(), 1);
for (int row = 0; row < KB_ROWS_CHAR; row++) {
int y = KB_CHARS_Y + row * KB_CELL_H;
for (int col = 0; col < KB_COLS_CHAR; col++) {
bool sel = (_kb_row == row && _kb_col == col);
char ch = KB_CHARS[row][col];
if (_kb_caps && ch >= 'a' && ch <= 'z') ch = ch - 'a' + 'A';
char ch_buf[2] = { ch == ' ' ? '_' : ch, '\0' };
int cx = col * KB_CELL_W;
if (sel) {
display.setColor(DisplayDriver::LIGHT);
display.fillRect(cx, y - 1, KB_CELL_W - 1, KB_CELL_H);
display.setColor(DisplayDriver::DARK);
} else {
display.setColor(DisplayDriver::LIGHT);
}
display.setCursor(cx + 3, y);
display.print(ch_buf);
}
}
const char* spec[] = { "[^]", "[Sp]", "[Del]", "[{}]", "[OK]" };
for (int i = 0; i < KB_SPECIAL; i++) {
bool sel = (_kb_row == KB_ROWS_CHAR && _kb_col == i);
bool active = (i == 0 && _kb_caps);
int sx = i * 25;
if (sel || active) {
display.setColor(DisplayDriver::LIGHT);
display.fillRect(sx, KB_SPECIAL_Y - 1, 24, KB_CELL_H);
display.setColor(DisplayDriver::DARK);
} else {
display.setColor(DisplayDriver::LIGHT);
}
display.setCursor(sx + 1, KB_SPECIAL_Y);
display.print(spec[i]);
display.setColor(DisplayDriver::LIGHT);
}
if (_kb_ph_mode) {
display.setColor(DisplayDriver::DARK);
display.fillRect(20, 20, 88, 12 + KB_PH_COUNT * 10);
display.setColor(DisplayDriver::LIGHT);
display.drawRect(20, 20, 88, 12 + KB_PH_COUNT * 10);
display.setCursor(24, 21);
display.print("Placeholder:");
display.fillRect(20, 30, 88, 1);
for (int i = 0; i < KB_PH_COUNT; i++) {
int py = 33 + i * 10;
if (i == _kb_ph_sel) {
display.setColor(DisplayDriver::LIGHT);
display.fillRect(21, py - 1, 86, 10);
display.setColor(DisplayDriver::DARK);
} else {
display.setColor(DisplayDriver::LIGHT);
}
display.setCursor(24, py);
display.print(KB_PH_LIST[i]);
}
display.setColor(DisplayDriver::LIGHT);
}
return 50;
return _kb.render(display);
}
display.drawTextCentered(display.width() / 2, 0, "AUTO-REPLY BOT");
@@ -182,84 +107,21 @@ public:
bool cancel = (c == KEY_CANCEL || c == KEY_CONTEXT_MENU);
if (_kb_field >= 0) {
if (_kb_ph_mode) {
if (c == KEY_UP && _kb_ph_sel > 0) { _kb_ph_sel--; return true; }
if (c == KEY_DOWN && _kb_ph_sel < KB_PH_COUNT - 1) { _kb_ph_sel++; return true; }
if (c == KEY_ENTER) {
const char* ph = KB_PH_LIST[_kb_ph_sel];
int ph_len = strlen(ph);
if (_kb_len + ph_len <= _kb_maxlen) {
memcpy(_kb_buf + _kb_len, ph, ph_len);
_kb_len += ph_len;
_kb_buf[_kb_len] = '\0';
}
_kb_ph_mode = false;
return true;
}
if (cancel) { _kb_ph_mode = false; return true; }
return true;
}
if (cancel) { _kb_field = -1; return true; }
if (up) {
if (_kb_row > 0) {
_kb_row--;
if (_kb_row == KB_ROWS_CHAR - 1)
_kb_col = _kb_col * KB_COLS_CHAR / KB_SPECIAL;
}
return true;
}
if (down) {
if (_kb_row < KB_ROWS_CHAR) {
_kb_row++;
if (_kb_row == KB_ROWS_CHAR)
_kb_col = _kb_col * KB_SPECIAL / KB_COLS_CHAR;
}
return true;
}
if (left) { if (_kb_col > 0) _kb_col--; return true; }
if (right) {
int max_col = (_kb_row == KB_ROWS_CHAR) ? KB_SPECIAL - 1 : KB_COLS_CHAR - 1;
if (_kb_col < max_col) _kb_col++;
return true;
}
if (enter) {
if (_kb_row < KB_ROWS_CHAR) {
if (_kb_len < _kb_maxlen) {
char ch = KB_CHARS[_kb_row][_kb_col];
if (_kb_caps && ch >= 'a' && ch <= 'z') ch = ch - 'a' + 'A';
_kb_buf[_kb_len++] = ch;
_kb_buf[_kb_len] = '\0';
}
auto res = _kb.handleInput(c);
if (res == KeyboardWidget::DONE) {
if (_kb_field == 2) {
strncpy(_prefs->bot_trigger, _kb.buf, sizeof(_prefs->bot_trigger) - 1);
_prefs->bot_trigger[sizeof(_prefs->bot_trigger) - 1] = '\0';
} else if (_kb_field == 3) {
strncpy(_prefs->bot_reply_dm, _kb.buf, sizeof(_prefs->bot_reply_dm) - 1);
_prefs->bot_reply_dm[sizeof(_prefs->bot_reply_dm) - 1] = '\0';
} else {
switch (_kb_col) {
case 0: _kb_caps = !_kb_caps; break;
case 1:
if (_kb_len < _kb_maxlen) { _kb_buf[_kb_len++] = ' '; _kb_buf[_kb_len] = '\0'; }
break;
case 2:
if (_kb_len > 0) _kb_buf[--_kb_len] = '\0';
break;
case 3:
_kb_ph_mode = true;
_kb_ph_sel = 0;
break;
case 4:
if (_kb_field == 2) {
strncpy(_prefs->bot_trigger, _kb_buf, sizeof(_prefs->bot_trigger) - 1);
_prefs->bot_trigger[sizeof(_prefs->bot_trigger) - 1] = '\0';
} else if (_kb_field == 3) {
strncpy(_prefs->bot_reply_dm, _kb_buf, sizeof(_prefs->bot_reply_dm) - 1);
_prefs->bot_reply_dm[sizeof(_prefs->bot_reply_dm) - 1] = '\0';
} else {
strncpy(_prefs->bot_reply_ch, _kb_buf, sizeof(_prefs->bot_reply_ch) - 1);
_prefs->bot_reply_ch[sizeof(_prefs->bot_reply_ch) - 1] = '\0';
}
_kb_field = -1;
break;
}
strncpy(_prefs->bot_reply_ch, _kb.buf, sizeof(_prefs->bot_reply_ch) - 1);
_prefs->bot_reply_ch[sizeof(_prefs->bot_reply_ch) - 1] = '\0';
}
return true;
_kb_field = -1;
} else if (res == KeyboardWidget::CANCELLED) {
_kb_field = -1;
}
return true;
}
@@ -299,24 +161,24 @@ public:
}
}
if ((_sel == 2 || _sel == 3 || _sel == 4) && enter) {
_kb_field = _sel;
_kb_row = 0;
_kb_col = 0;
_kb_caps = false;
_kb_ph_mode = false;
_kb_ph_sel = 0;
_kb_field = _sel;
const char* initial;
int max;
const char* lbl;
if (_sel == 2) {
strncpy(_kb_buf, _prefs->bot_trigger, sizeof(_kb_buf) - 1);
_kb_maxlen = sizeof(_prefs->bot_trigger) - 1;
initial = _prefs->bot_trigger;
max = sizeof(_prefs->bot_trigger) - 1;
lbl = "Trigger:";
} else if (_sel == 3) {
strncpy(_kb_buf, _prefs->bot_reply_dm, sizeof(_kb_buf) - 1);
_kb_maxlen = sizeof(_prefs->bot_reply_dm) - 1;
initial = _prefs->bot_reply_dm;
max = sizeof(_prefs->bot_reply_dm) - 1;
lbl = "Reply:";
} else {
strncpy(_kb_buf, _prefs->bot_reply_ch, sizeof(_kb_buf) - 1);
_kb_maxlen = sizeof(_prefs->bot_reply_ch) - 1;
initial = _prefs->bot_reply_ch;
max = sizeof(_prefs->bot_reply_ch) - 1;
lbl = "Reply:";
}
_kb_buf[sizeof(_kb_buf) - 1] = '\0';
_kb_len = strlen(_kb_buf);
_kb.begin(initial, max, lbl);
return true;
}
return false;