Merge branch 'dev' of https://github.com/zjs81/meshcore-open into dev

2026-07-22 16:51:05 +10:00 · 2026-04-28 16:26:42 +03:00
parent 38f6e42796 99c0ab7e22
commit ca6058eccd
67 changed files with 5771 additions and 611 deletions
@@ -4,7 +4,7 @@ import 'dart:math' as math;
 import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:flutter/services.dart';
-import 'package:latlong2/latlong.dart';
+import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';

 import '../connector/meshcore_connector.dart';
@@ -33,13 +33,19 @@ import '../widgets/message_translation_button.dart';
 import '../widgets/message_status_icon.dart';
 import '../widgets/radio_stats_entry.dart';
 import '../widgets/translated_message_content.dart';
+import '../widgets/unread_divider.dart';
 import 'channel_message_path_screen.dart';
 import 'map_screen.dart';

 class ChannelChatScreen extends StatefulWidget {
  final Channel channel;
+  final int initialUnreadCount;

-  const ChannelChatScreen({super.key, required this.channel});
+  const ChannelChatScreen({
+    super.key,
+    required this.channel,
+    this.initialUnreadCount = 0,
+  });

  @override
  State<ChannelChatScreen> createState() => _ChannelChatScreenState();
@@ -56,32 +62,46 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
  MeshCoreConnector? _connector;
  DateTime? _lastChannelSendAt;
  bool _channelSkipNextBottomSnap = false;
+  String? _unreadDividerMessageId;
+
+  String? _cachedFormatLocale;
+  late DateFormat _hmFormat;
+  late DateFormat _mdFormat;

  @override
  void initState() {
    super.initState();
    _textFieldFocusNode.addListener(_onTextFieldFocusChange);
    _scrollController.onScrollNearTop = _loadOlderMessages;
+    _scrollController.showJumpToBottom.addListener(_clearDividerAtBottom);
    SchedulerBinding.instance.addPostFrameCallback((_) {
      if (!mounted) return;
      final connector = context.read<MeshCoreConnector>();
      final settings = context.read<AppSettingsService>().settings;
      final idx = widget.channel.index;
-      final unread = connector.getUnreadCountForChannelIndex(idx);
+      final unread = widget.initialUnreadCount;
+      final messages = connector.getChannelMessages(widget.channel);
      ChannelMessage? anchor;
-      if (settings.jumpToOldestUnread && unread > 0) {
-        anchor = _findOldestUnreadChannelAnchor(
-          connector.getChannelMessages(widget.channel),
-          unread,
-        );
+      if (unread > 0) {
+        anchor = _findOldestUnreadChannelAnchor(messages, unread);
      }
+      setState(() {
+        if (anchor != null) _unreadDividerMessageId = anchor.messageId;
+      });
      connector.setActiveChannel(idx);
      _connector = connector;
-      if (anchor != null) {
+      if (anchor != null && settings.jumpToOldestUnread) {
        _channelSkipNextBottomSnap = true;
        WidgetsBinding.instance.addPostFrameCallback((_) {
          if (!mounted) return;
-          _scrollToMessage(anchor!.messageId);
+          _scrollController.jumpToEstimatedOffset(
+            unreadCount: unread,
+            totalMessages: messages.length,
+            onJumped: () {
+              if (!mounted) return;
+              _scrollToMessage(anchor!.messageId);
+            },
+          );
        });
      }
    });
@@ -103,6 +123,13 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
    return oldest;
  }

+  void _clearDividerAtBottom() {
+    if (!_scrollController.showJumpToBottom.value &&
+        _unreadDividerMessageId != null) {
+      setState(() => _unreadDividerMessageId = null);
+    }
+  }
+
  void _onTextFieldFocusChange() {
    if (_textFieldFocusNode.hasFocus && mounted) {
      _scrollController.handleKeyboardOpen();
@@ -124,6 +151,7 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
  @override
  void dispose() {
    _connector?.setActiveChannel(null);
+    _scrollController.showJumpToBottom.removeListener(_clearDividerAtBottom);
    _textFieldFocusNode.removeListener(_onTextFieldFocusChange);
    _textFieldFocusNode.dispose();
    _textController.dispose();
@@ -322,6 +350,9 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
                            if (!_messageKeys.containsKey(message.messageId)) {
                              _messageKeys[message.messageId] = GlobalKey();
                            }
+                            final isUnreadAnchor =
+                                _unreadDividerMessageId != null &&
+                                message.messageId == _unreadDividerMessageId;
                            return Container(
                              key: _messageKeys[message.messageId]!,
                              child: Builder(
@@ -330,10 +361,17 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
                                      .select<ChatTextScaleService, double>(
                                        (service) => service.scale,
                                      );
-                                  return _buildMessageBubble(
+                                  final bubble = _buildMessageBubble(
                                    message,
                                    textScale,
                                  );
+                                  if (isUnreadAnchor) {
+                                    return Column(
+                                      mainAxisSize: MainAxisSize.min,
+                                      children: [const UnreadDivider(), bubble],
+                                    );
+                                  }
+                                  return bubble;
                                },
                              ),
                            );
@@ -353,12 +391,24 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
    );
  }

+  void _markAsUnread(ChannelMessage message) {
+    final connector = context.read<MeshCoreConnector>();
+    final messages = connector.getChannelMessages(widget.channel);
+    var count = 0;
+    var found = false;
+    for (final m in messages) {
+      if (m.messageId == message.messageId) found = true;
+      if (found && !m.isOutgoing) count++;
+    }
+    connector.setChannelUnreadCount(widget.channel.index, count);
+  }
+
  Widget _buildMessageBubble(ChannelMessage message, double textScale) {
    final settingsService = context.watch<AppSettingsService>();
    final enableTracing = settingsService.settings.enableMessageTracing;
    final isOutgoing = message.isOutgoing;
    final gifId = GifHelper.parseGif(message.text);
-    final poi = _parsePoiMessage(message.text);
+    final poi = parseMarkerText(message.text);
    final translatedDisplayText =
        message.translatedText != null &&
            message.translatedText!.trim().isNotEmpty
@@ -446,6 +496,7 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
                          poi,
                          isOutgoing,
                          textScale,
+                          message.senderName,
                          trailing: (!enableTracing && isOutgoing)
                              ? Padding(
                                  padding: const EdgeInsets.only(bottom: 2),
@@ -556,7 +607,9 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
                                ? const EdgeInsets.symmetric(horizontal: 8)
                                : EdgeInsets.zero,
                            child: Text(
-                              'via ${_formatPathPrefixes(displayPath)}',
+                              context.l10n.channels_via(
+                                _formatPathPrefixes(displayPath),
+                              ),
                              style: TextStyle(
                                fontSize: 11,
                                color: Colors.grey[600],
@@ -577,7 +630,7 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
                            mainAxisSize: MainAxisSize.min,
                            children: [
                              Text(
-                                _formatTime(message.timestamp),
+                                _formatTime(context, message.timestamp),
                                style: TextStyle(
                                  fontSize: 11,
                                  color: Colors.grey[600],
@@ -702,7 +755,7 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
    final previewTextColor = colorScheme.onSurface.withValues(alpha: 0.7);

    final gifId = GifHelper.parseGif(replyText);
-    final poi = _parsePoiMessage(replyText);
+    final poi = parseMarkerText(replyText);

    Widget contentPreview;
    if (gifId != null) {
@@ -813,24 +866,12 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
    );
  }

-  _PoiInfo? _parsePoiMessage(String text) {
-    final trimmed = text.trim();
-    final match = RegExp(
-      r'm:([\-0-9.]+),([\-0-9.]+)\|([^|]*)\|',
-    ).firstMatch(trimmed);
-    if (match == null) return null;
-    final lat = double.tryParse(match.group(1) ?? '');
-    final lon = double.tryParse(match.group(2) ?? '');
-    if (lat == null || lon == null) return null;
-    final label = match.group(3) ?? '';
-    return _PoiInfo(lat: lat, lon: lon, label: label);
-  }
-
  Widget _buildPoiMessage(
    BuildContext context,
-    _PoiInfo poi,
+    MarkerPayload poi,
    bool isOutgoing,
-    double textScale, {
+    double textScale,
+    String senderName, {
    Widget? trailing,
  }) {
    final colorScheme = Theme.of(context).colorScheme;
@@ -850,12 +891,22 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
          padding: EdgeInsets.zero,
          constraints: const BoxConstraints(minWidth: 32, minHeight: 32),
          onPressed: () {
+            final selfName = context.read<MeshCoreConnector>().selfName ?? 'Me';
+            final fromName = isOutgoing ? selfName : senderName;
+            final key = buildSharedMarkerKey(
+              sourceId: 'channel:${widget.channel.index}',
+              label: poi.label,
+              fromName: fromName,
+              flags: poi.flags,
+              isChannel: true,
+            );
            Navigator.push(
              context,
              MaterialPageRoute(
                builder: (context) => MapScreen(
-                  highlightPosition: LatLng(poi.lat, poi.lon),
+                  highlightPosition: poi.position,
                  highlightLabel: poi.label,
+                  highlightMarkerKey: key,
                ),
              ),
            );
@@ -1240,14 +1291,21 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
    );
  }

-  String _formatTime(DateTime time) {
+  String _formatTime(BuildContext context, DateTime time) {
    final now = DateTime.now();
    final diff = now.difference(time);
+    final locale = Localizations.localeOf(context).toString();
+    if (locale != _cachedFormatLocale) {
+      _cachedFormatLocale = locale;
+      _hmFormat = DateFormat.Hm(locale);
+      _mdFormat = DateFormat.Md(locale);
+    }
+    final hm = _hmFormat.format(time);

    if (diff.inDays > 0) {
-      return '${time.day}/${time.month} ${time.hour}:${time.minute.toString().padLeft(2, '0')}';
+      return '${_mdFormat.format(time)} $hm';
    } else {
-      return '${time.hour}:${time.minute.toString().padLeft(2, '0')}';
+      return hm;
    }
  }

@@ -1303,6 +1361,15 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
                _copyMessageText(message.text);
              },
            ),
+            if (!message.isOutgoing)
+              ListTile(
+                leading: const Icon(Icons.mark_chat_unread_outlined),
+                title: Text(context.l10n.chat_markAsUnread),
+                onTap: () {
+                  Navigator.pop(sheetContext);
+                  _markAsUnread(message);
+                },
+              ),
            ListTile(
              leading: const Icon(Icons.delete_outline),
              title: Text(context.l10n.common_delete),
@@ -1522,11 +1589,3 @@ class _SwipeReplyBubbleState extends State<_SwipeReplyBubble> {
    );
  }
 }
-
-class _PoiInfo {
-  final double lat;
-  final double lon;
-  final String label;
-
-  const _PoiInfo({required this.lat, required this.lon, required this.label});
-}