mirror of
https://github.com/zjs81/meshcore-open.git
synced 2026-04-20 22:13:48 +00:00
merge from chat trace
This commit is contained in:
commit
c34be44950
2 changed files with 10 additions and 12 deletions
|
|
@ -347,10 +347,12 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
|
|||
? Padding(
|
||||
padding: const EdgeInsets.only(bottom: 2),
|
||||
child: MessageStatusIcon(
|
||||
isAcked: message.status ==
|
||||
isAcked:
|
||||
message.status ==
|
||||
ChannelMessageStatus.sent &&
|
||||
displayPath.isNotEmpty,
|
||||
isFailed: message.status ==
|
||||
isFailed:
|
||||
message.status ==
|
||||
ChannelMessageStatus.failed,
|
||||
),
|
||||
)
|
||||
|
|
@ -783,10 +785,7 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
|
|||
],
|
||||
),
|
||||
),
|
||||
if (trailing != null) ...[
|
||||
const SizedBox(width: 4),
|
||||
trailing,
|
||||
],
|
||||
if (trailing != null) ...[const SizedBox(width: 4), trailing],
|
||||
],
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1280,10 +1280,12 @@ class _MessageBubble extends StatelessWidget {
|
|||
? Padding(
|
||||
padding: const EdgeInsets.only(bottom: 2),
|
||||
child: MessageStatusIcon(
|
||||
isAcked: message.status ==
|
||||
isAcked:
|
||||
message.status ==
|
||||
MessageStatus.delivered &&
|
||||
message.pathBytes.isNotEmpty,
|
||||
isFailed: message.status ==
|
||||
isFailed:
|
||||
message.status ==
|
||||
MessageStatus.failed,
|
||||
),
|
||||
)
|
||||
|
|
@ -1519,10 +1521,7 @@ class _MessageBubble extends StatelessWidget {
|
|||
],
|
||||
),
|
||||
),
|
||||
if (trailing != null) ...[
|
||||
const SizedBox(width: 4),
|
||||
trailing,
|
||||
],
|
||||
if (trailing != null) ...[const SizedBox(width: 4), trailing],
|
||||
],
|
||||
);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue