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

chat fixes

Browse Source
This commit is contained in:
Ben Allfree
2026-02-23 04:09:27 -08:00
parent 7465e81996
commit 173fdf7168
5 changed files with 187 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/screens/chat_screen.dart
+49 -45
View File
@@ -5,6 +5,7 @@ import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter/scheduler.dart';
import 'package:flutter/services.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:flutter_linkify/flutter_linkify.dart';
import 'package:meshcore_open/screens/path_trace_map.dart';
import 'package:provider/provider.dart';
@@ -13,6 +14,7 @@ import 'package:latlong2/latlong.dart';
import '../connector/meshcore_connector.dart';
import '../connector/meshcore_protocol.dart';
import '../helpers/reaction_helper.dart';
import '../widgets/message_status_icon.dart';
import '../helpers/chat_scroll_controller.dart';
import '../helpers/link_handler.dart';
import '../helpers/utf8_length_limiter.dart';
@@ -1252,7 +1254,24 @@ class _MessageBubble extends StatelessWidget {
if (gifId == null) const SizedBox(height: 4),
],
if (poi != null)
_buildPoiMessage(context, poi, textColor, metaColor)
_buildPoiMessage(
context,
poi,
textColor,
metaColor,
trailing: (!enableTracing && isOutgoing)
? Padding(
padding: const EdgeInsets.only(bottom: 2),
child: MessageStatusIcon(
isAcked: message.status ==
MessageStatus.delivered &&
message.pathBytes.isNotEmpty,
isFailed: message.status ==
MessageStatus.failed,
),
)
: null,
)
else if (gifId != null)
Stack(
children: [
@@ -1269,35 +1288,25 @@ class _MessageBubble extends StatelessWidget {
),
if (!enableTracing && isOutgoing)
Positioned(
top: 4,
right: 4,
top: 0,
right: 0,
child: Container(
padding: const EdgeInsets.all(2),
padding: const EdgeInsets.all(3),
decoration: BoxDecoration(
color: Colors.black.withValues(
alpha: 0.3,
color: bubbleColor,
borderRadius: const BorderRadius.only(
bottomLeft: Radius.circular(10),
topRight: Radius.circular(12),
),
shape: BoxShape.circle,
),
child: Icon(
(message.status ==
MessageStatus.delivered &&
message.pathBytes.isNotEmpty)
? Icons.check_circle
: message.status ==
MessageStatus.failed
? Icons.cancel
: Icons.cloud,
size: 14,
color:
(message.status ==
MessageStatus.delivered &&
message.pathBytes.isNotEmpty)
? Colors.green
: message.status ==
MessageStatus.failed
? Colors.red
: Colors.white70,
child: MessageStatusIcon(
isAcked:
message.status ==
MessageStatus.delivered &&
message.pathBytes.isNotEmpty,
isFailed:
message.status ==
MessageStatus.failed,
),
),
),
@@ -1331,23 +1340,13 @@ class _MessageBubble extends StatelessWidget {
const SizedBox(width: 4),
Padding(
padding: const EdgeInsets.only(bottom: 2),
child: Icon(
(message.status ==
MessageStatus.delivered &&
message.pathBytes.isNotEmpty)
? Icons.check_circle
: message.status == MessageStatus.failed
? Icons.cancel
: Icons.cloud,
size: 14,
color:
(message.status ==
MessageStatus.delivered &&
message.pathBytes.isNotEmpty)
? Colors.green
: message.status == MessageStatus.failed
? Colors.red
: Colors.grey,
child: MessageStatusIcon(
isAcked:
message.status ==
MessageStatus.delivered &&
message.pathBytes.isNotEmpty,
isFailed:
message.status == MessageStatus.failed,
),
),
],
@@ -1464,8 +1463,9 @@ class _MessageBubble extends StatelessWidget {
BuildContext context,
_PoiInfo poi,
Color textColor,
Color metaColor,
) {
Color metaColor, {
Widget? trailing,
}) {
return Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
@@ -1502,6 +1502,10 @@ class _MessageBubble extends StatelessWidget {
],
),
),
if (trailing != null) ...[
const SizedBox(width: 4),
trailing,
],
],
);
}