From 69f5cab7cf9833d7ef4636868330c6e2cefcb840 Mon Sep 17 00:00:00 2001 From: liu weikai Date: Mon, 15 Jun 2026 22:35:44 +0800 Subject: [PATCH] fix(chat): remove reply wording from send entry --- modules/ui_mono/src/runtime.cpp | 2 +- .../src/ui/screens/chat/chat_conversation_components.cpp | 4 ++-- .../src/ui/screens/chat/chat_conversation_layout.cpp | 6 +++--- .../src/chat/infra/meshcore/meshcore_radio_adapter.cpp | 3 ++- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/modules/ui_mono/src/runtime.cpp b/modules/ui_mono/src/runtime.cpp index 05244115..7efb10b0 100644 --- a/modules/ui_mono/src/runtime.cpp +++ b/modules/ui_mono/src/runtime.cpp @@ -7729,7 +7729,7 @@ const char* Runtime::nodeActionLabel(size_t index) const case 0: return "DETAIL"; case 1: - return can_reply ? "REPLY" : "VIEW ONLY"; + return can_reply ? "SEND" : "VIEW ONLY"; case 2: return "ADD CONTACT"; case 3: diff --git a/modules/ui_shared/src/ui/screens/chat/chat_conversation_components.cpp b/modules/ui_shared/src/ui/screens/chat/chat_conversation_components.cpp index 5a578586..1807469e 100644 --- a/modules/ui_shared/src/ui/screens/chat/chat_conversation_components.cpp +++ b/modules/ui_shared/src/ui/screens/chat/chat_conversation_components.cpp @@ -299,8 +299,8 @@ ChatConversationScreen::ChatConversationScreen(lv_obj_t* parent, chat::Conversat chat::ui::conversation::styles::apply_action_bar(action_bar_); chat::ui::conversation::styles::apply_reply_btn(reply_btn_); - // Reply label text + style - ::ui::i18n::set_label_text(w.reply_label, "Reply"); + // Primary compose entry label. + ::ui::i18n::set_label_text(w.reply_label, "Send"); chat::ui::conversation::styles::apply_reply_label(w.reply_label); ::ui::fonts::apply_localized_font(w.reply_label, lv_label_get_text(w.reply_label), ::ui::fonts::ui_chrome_font()); diff --git a/modules/ui_shared/src/ui/screens/chat/chat_conversation_layout.cpp b/modules/ui_shared/src/ui/screens/chat/chat_conversation_layout.cpp index d69cfaf5..020ef495 100644 --- a/modules/ui_shared/src/ui/screens/chat/chat_conversation_layout.cpp +++ b/modules/ui_shared/src/ui/screens/chat/chat_conversation_layout.cpp @@ -24,7 +24,7 @@ * | | * | Action Bar (fixed height = 30, non-scrollable) | * | +------------------------------------------------------------+ | - * | | [ Reply ] | | + * | | [ Send ] | | * | +------------------------------------------------------------+ | * +----------------------------------------------------------------+ * @@ -34,7 +34,7 @@ * - MsgList(COL, scroll V, grow=1) * - MsgRow*(repeat, ROW, full) * - Bubble(COL, content) -> TextLabel(WRAP) - * - ActionBar(ROW, fixed=30) -> ReplyBtn -> ReplyLabel + * - ActionBar(ROW, fixed=30) -> ComposeBtn -> ComposeLabel * * Notes: * - Structure/layout only: create objects, set size/flex/align/flags. @@ -88,7 +88,7 @@ ConversationWidgets create_conversation_base(lv_obj_t* parent) LV_FLEX_ALIGN_CENTER); make_non_scrollable(w.action_bar); - // Reply button + // Primary compose button w.reply_btn = lv_btn_create(w.action_bar); lv_obj_set_size(w.reply_btn, profile.dense ? 92 : 120, diff --git a/platform/nrf52/arduino_common/src/chat/infra/meshcore/meshcore_radio_adapter.cpp b/platform/nrf52/arduino_common/src/chat/infra/meshcore/meshcore_radio_adapter.cpp index f8a61012..ea200c55 100644 --- a/platform/nrf52/arduino_common/src/chat/infra/meshcore/meshcore_radio_adapter.cpp +++ b/platform/nrf52/arduino_common/src/chat/infra/meshcore/meshcore_radio_adapter.cpp @@ -164,7 +164,8 @@ bool MeshCoreRadioAdapter::sendTextWithId(::chat::ChannelId channel, const std:: if (!want_ack) { - sys::EventBus::publish(new sys::ChatSendResultEvent(msg_id, true), 0); + Serial.printf("[MESHCORE] TX text id=%08lX no delivery ACK for broadcast\n", + static_cast(msg_id)); } return ::chat::MeshSendResult::success(msg_id); }