zjs81/meshcore-open
1
0
Fork 0
mirror of https://github.com/zjs81/meshcore-open.git synced 2026-07-25 01:59:04 +10:00
Code Issues Packages Projects Releases 2 Wiki Activity

merge from chat trace

Browse Source
This commit is contained in:
Ben Allfree
2026-02-23 04:25:04 -08:00
parent 549fc62632 bf5fadd15e
commit c34be44950
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/screens/channel_chat_screen.dart
+5 -6
View File
@@ -347,10 +347,12 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
? Padding( ? Padding(
padding: const EdgeInsets.only(bottom: 2), padding: const EdgeInsets.only(bottom: 2),
child: MessageStatusIcon( child: MessageStatusIcon(
isAcked: message.status == isAcked:
message.status ==
ChannelMessageStatus.sent && ChannelMessageStatus.sent &&
displayPath.isNotEmpty, displayPath.isNotEmpty,
isFailed: message.status == isFailed:
message.status ==
ChannelMessageStatus.failed, ChannelMessageStatus.failed,
), ),
) )
@@ -783,10 +785,7 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
], ],
), ),
), ),
if (trailing != null) ...[ if (trailing != null) ...[const SizedBox(width: 4), trailing],
const SizedBox(width: 4),
trailing,
],
], ],
); );
} }
lib/screens/chat_screen.dart
+5 -6
View File
@@ -1280,10 +1280,12 @@ class _MessageBubble extends StatelessWidget {
? Padding( ? Padding(
padding: const EdgeInsets.only(bottom: 2), padding: const EdgeInsets.only(bottom: 2),
child: MessageStatusIcon( child: MessageStatusIcon(
isAcked: message.status == isAcked:
message.status ==
MessageStatus.delivered && MessageStatus.delivered &&
message.pathBytes.isNotEmpty, message.pathBytes.isNotEmpty,
isFailed: message.status == isFailed:
message.status ==
MessageStatus.failed, MessageStatus.failed,
), ),
) )
@@ -1519,10 +1521,7 @@ class _MessageBubble extends StatelessWidget {
], ],
), ),
), ),
if (trailing != null) ...[ if (trailing != null) ...[const SizedBox(width: 4), trailing],
const SizedBox(width: 4),
trailing,
],
], ],
); );
} }