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

refactor(ui-lvgl,ui-new): shared segmented and text field widgets, favourites through contactctl, one age formatter

Browse Source 
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Jakub
2026-09-26 00:55:36 +02:00
co-authored by Claude Opus 5.5
parent d588193d0d
commit f502d2c619
12 changed files with 70 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/companion_radio/ui-new/LocatorScreen.h
+2 -2
View File
@@ -202,13 +202,13 @@ public:
for (int idx = 0; _target_n < TARGET_MAX; idx++) {
ContactInfo c;
if (!the_mesh.getContactByIdx(idx, c)) break;
if (!(c.flags & 0x01)) continue;
if (!contactctl::favourite(c)) continue;
addPersonTarget(c.id.pub_key, c.name, /*require_position=*/false, true);
}
for (int idx = 0; _target_n < TARGET_MAX; idx++) {
ContactInfo c;
if (!the_mesh.getContactByIdx(idx, c)) break;
addPersonTarget(c.id.pub_key, c.name, /*require_position=*/true, (c.flags & 0x01) != 0);
addPersonTarget(c.id.pub_key, c.name, /*require_position=*/true, contactctl::favourite(c));
}
WaypointStore& wp = _task->waypoints();
for (int i = 0; i < wp.count() && _target_n < TARGET_MAX; i++) {
examples/companion_radio/ui-new/MessagesScreen.h
+6 -6
View File
@@ -679,8 +679,8 @@ class MessagesScreen : public UIScreen {
// Flip a contact's/room's favourite flag and refresh the menu label. The list
// rebuild is deferred to menu close (see the channel Fav toggle for why).
void toggleContactFav(const ContactInfo& ci) {
bool now_fav = !(ci.flags & 0x01);
if (!the_mesh.setContactFavourite(ci.id.pub_key, now_fav)) return;
bool now_fav = !contactctl::favourite(ci);
if (!contactctl::setFavourite(ci.id.pub_key, now_fav)) return;
snprintf(_ctx_fav_item, sizeof(_ctx_fav_item), now_fav ? "Fav: ON" : "Fav: OFF");
}
@@ -712,7 +712,7 @@ class MessagesScreen : public UIScreen {
for (int i = 0; i < total; i++) {
if (!the_mesh.getContactByIdx(MAX_ANON_CONTACTS + i, c)) continue;
if (c.type != (rooms ? ADV_TYPE_ROOM : ADV_TYPE_CHAT)) continue;
bool fav = (c.flags & 0x01) != 0;
bool fav = contactctl::favourite(c);
if (fav_only && !fav) continue;
uint8_t k = rooms ? 0 : _history.dmHistCountForContact(c.id.pub_key);
if (k > 127) k = 127;
@@ -1234,7 +1234,7 @@ public:
uint8_t dm_unread = _task->getDMUnread(c.id.pub_key);
bool dm_overflow = dm_unread > 0 && _task->getDMUnreadOverflow(c.id.pub_key);
int bw = dm_unread > 0 ? display.unreadBadgeWidth(dm_unread, dm_overflow) + 2 : 0;
int sw = (c.flags & 0x01) ? favStarWidth(display) : 0;
int sw = contactctl::favourite(c) ? favStarWidth(display) : 0;
// See the channel/DM history bodies' identical comment: suppress this
// row's own marquee while a context menu covers it, so the two don't
// fight over DisplayDriver's single shared marquee slot.
@@ -1963,7 +1963,7 @@ public:
bool have = the_mesh.getContactByIdx(_sorted[_contact_sel], ci);
bool logged_in = have && isRoomLoggedIn(ci.id.pub_key);
snprintf(_ctx_fav_item, sizeof(_ctx_fav_item),
(have && (ci.flags & 0x01)) ? "Fav: ON" : "Fav: OFF");
(have && contactctl::favourite(ci)) ? "Fav: ON" : "Fav: OFF");
{ int pinned_slot = have ? _task->findFavouriteSlot(ci.id.pub_key) : -1;
if (pinned_slot >= 0) snprintf(_ctx_pin_item, sizeof(_ctx_pin_item), "Unpin (slot %d)", pinned_slot + 1);
else snprintf(_ctx_pin_item, sizeof(_ctx_pin_item), "Pin to dial"); }
@@ -1987,7 +1987,7 @@ public:
if (pinned_slot >= 0) snprintf(_ctx_pin_item, sizeof(_ctx_pin_item), "Unpin (slot %d)", pinned_slot + 1);
else snprintf(_ctx_pin_item, sizeof(_ctx_pin_item), "Pin to dial");
snprintf(_ctx_fav_item, sizeof(_ctx_fav_item),
(ci.flags & 0x01) ? "Fav: ON" : "Fav: OFF");
contactctl::favourite(ci) ? "Fav: ON" : "Fav: OFF");
_ctx_menu.begin("Contact options", 3);
_ctx_menu.addItem("Mark as read");
_ctx_menu.addValueItem(_ctx_notif_item);
examples/companion_radio/ui-new/NearbyScreen.h
+1 -1
View File
@@ -356,7 +356,7 @@ class NearbyScreen : public UIScreen, protected NearbyModel {
const Entry* e = selected();
if (!e || !e->has_key) return;
bool now_fav = !e->fav;
if (!the_mesh.setContactFavourite(e->pub_key, now_fav)) return;
if (!contactctl::setFavourite(e->pub_key, now_fav)) return;
snprintf(_fav_label, sizeof(_fav_label), now_fav ? "Fav: ON" : "Fav: OFF");
refreshKeepingSelection();
}