Fixes after PR

Author: demchenkoalex

doc/advanced-usage.md

@@ -284,7 +284,7 @@ class _MyHomePageState extends State<MyHomePage> {
   Widget build(BuildContext context) => Scaffold(
         body: Chat(
           messages: _messages,
-          onAttachmentPressed: _handleAtachmentPressed,
+          onAttachmentPressed: _handleAttachmentPressed,
           onMessageTap: _handleMessageTap,
           onPreviewDataFetched: _handlePreviewDataFetched,
           onSendPressed: _handleSendPressed,
@@ -298,7 +298,7 @@ class _MyHomePageState extends State<MyHomePage> {
     });
   }
 
-  void _handleAtachmentPressed() {
+  void _handleAttachmentPressed() {
     showModalBottomSheet<void>(
       context: context,
       builder: (BuildContext context) => SafeArea(

example/assets/messages.json

@@ -47,31 +47,19 @@
       "id": "82091008-a484-4a89-ae75-a22bf8d6f3ac",
       "lastName": "White"
     },
-    "createdAt": 1655648400000,
+    "createdAt": 1655648401000,
     "id": "64747b28-df19-4a0c-8c47-316dc3546e3c",
     "status": "seen",
     "text": "Here you go buddy! 💪",
     "type": "text"
   },
-  {
-    "author": {
-      "firstName": "John",
-      "id": "b4878b96-efbc-479a-8291-474ef323dec7",
-      "imageUrl": "https://avatars.githubusercontent.com/u/14123304?v=4"
-    },
-    "createdAt": 1655648399000,
-    "id": "4a202811-7d48-4ae9-8323-d764a56031ds",
-    "status": "seen",
-    "text": "FIRST UNSEEN\n\nVoluptatem voluptatum eos aut voluptatem occaecati. Quia ducimus vero molestiae molestiae illum illo nisi autem. Labore consectetur expedita illum consequatur inventore consequatur quasi voluptatem. Perspiciatis ut reprehenderit officiis animi voluptas.",
-    "type": "text"
-  },
   {
     "author": {
       "firstName": "Matthew",
       "id": "82091008-a484-4a89-ae75-a22bf8d6f3ac",
       "lastName": "White"
     },
-    "createdAt": 1655648398000,
+    "createdAt": 1655648400000,
     "id": "6a1a4351-cf05-4d0c-9d0f-47ed378b6112",
     "mimeType": "application/pdf",
     "name": "city_guide-madrid.pdf",
@@ -86,7 +74,7 @@
       "id": "4c2307ba-3d40-442f-b1ff-b271f63904ca",
       "lastName": "Doe"
     },
-    "createdAt": 1655648397000,
+    "createdAt": 1655624464000,
     "id": "38681a33-2563-42aa-957b-cfc12f791d16",
     "status": "seen",
     "text": "Matt, where is my Madrid guide?",

example/lib/main.dart

@@ -52,10 +52,6 @@ class _ChatPageState extends State<ChatPage> {
           onMessageTap: _handleMessageTap,
           onPreviewDataFetched: _handlePreviewDataFetched,
           onSendPressed: _handleSendPressed,
-          scrollToUnseenOptions: const ScrollToUnseenOptions(
-            lastSeenMessageID: '6a1a4351-cf05-4d0c-9d0f-47ed378b6112',
-            scrollOnOpen: true,
-          ),
           showUserAvatars: true,
           showUserNames: true,
           user: _user,

lib/flutter_chat_ui.dart

@@ -1,7 +1,5 @@
 library flutter_chat_ui;
 
-export 'package:scroll_to_index/scroll_to_index.dart' show AutoScrollController;
-
 export 'src/chat_l10n.dart';
 export 'src/chat_theme.dart';
 export 'src/models/bubble_rtl_alignment.dart';
@@ -21,6 +19,6 @@ export 'src/widgets/input_text_field_controller.dart';
 export 'src/widgets/message.dart';
 export 'src/widgets/send_button.dart';
 export 'src/widgets/text_message.dart';
-export 'src/widgets/unseen_message_banner.dart';
+export 'src/widgets/unread_header.dart';
 export 'src/widgets/user_avatar.dart';
 export 'src/widgets/user_name.dart';

lib/src/chat_l10n.dart

@@ -11,7 +11,7 @@ abstract class ChatL10n {
     required this.fileButtonAccessibilityLabel,
     required this.inputPlaceholder,
     required this.sendButtonAccessibilityLabel,
-    required this.unseenMessagesBannerLabel,
+    required this.unreadMessagesLabel,
   });
 
   /// Accessibility label (hint) for the attachment button.
@@ -29,8 +29,8 @@ abstract class ChatL10n {
   /// Accessibility label (hint) for the send button.
   final String sendButtonAccessibilityLabel;
 
-  /// Label for the unseen messages banner.
-  final String unseenMessagesBannerLabel;
+  /// Label for the unread messages header.
+  final String unreadMessagesLabel;
 }
 
 /// Arabic l10n which extends [ChatL10n].
@@ -45,7 +45,7 @@ class ChatL10nAr extends ChatL10n {
     super.fileButtonAccessibilityLabel = 'ملف',
     super.inputPlaceholder = 'الرسالة',
     super.sendButtonAccessibilityLabel = 'إرسال',
-    super.unseenMessagesBannerLabel = '?',
+    super.unreadMessagesLabel = 'الرسائل غير المقروءة',
   });
 }
 
@@ -61,7 +61,7 @@ class ChatL10nDe extends ChatL10n {
     super.fileButtonAccessibilityLabel = 'Datei',
     super.inputPlaceholder = 'Nachricht',
     super.sendButtonAccessibilityLabel = 'Senden',
-    super.unseenMessagesBannerLabel = 'Ungelesene Nachrichten',
+    super.unreadMessagesLabel = 'Ungelesene Nachrichten',
   });
 }
 
@@ -77,7 +77,7 @@ class ChatL10nEn extends ChatL10n {
     super.fileButtonAccessibilityLabel = 'File',
     super.inputPlaceholder = 'Message',
     super.sendButtonAccessibilityLabel = 'Send',
-    super.unseenMessagesBannerLabel = 'Unread messages',
+    super.unreadMessagesLabel = 'Unread messages',
   });
 }
 
@@ -93,7 +93,7 @@ class ChatL10nEs extends ChatL10n {
     super.fileButtonAccessibilityLabel = 'Archivo',
     super.inputPlaceholder = 'Mensaje',
     super.sendButtonAccessibilityLabel = 'Enviar',
-    super.unseenMessagesBannerLabel = '?',
+    super.unreadMessagesLabel = 'Mensajes no leídos',
   });
 }
 
@@ -109,7 +109,7 @@ class ChatL10nKo extends ChatL10n {
     super.fileButtonAccessibilityLabel = '파일',
     super.inputPlaceholder = '메시지',
     super.sendButtonAccessibilityLabel = '보내기',
-    super.unseenMessagesBannerLabel = '?',
+    super.unreadMessagesLabel = '읽지 않은 메시지',
   });
 }
 
@@ -125,7 +125,7 @@ class ChatL10nPl extends ChatL10n {
     super.fileButtonAccessibilityLabel = 'Plik',
     super.inputPlaceholder = 'Napisz wiadomość',
     super.sendButtonAccessibilityLabel = 'Wyślij',
-    super.unseenMessagesBannerLabel = '?',
+    super.unreadMessagesLabel = 'Nieprzeczytane wiadomości',
   });
 }
 
@@ -141,7 +141,7 @@ class ChatL10nPt extends ChatL10n {
     super.fileButtonAccessibilityLabel = 'Arquivo',
     super.inputPlaceholder = 'Mensagem',
     super.sendButtonAccessibilityLabel = 'Enviar',
-    super.unseenMessagesBannerLabel = '?',
+    super.unreadMessagesLabel = 'Mensagens não lidas',
   });
 }
 
@@ -157,7 +157,7 @@ class ChatL10nRu extends ChatL10n {
     super.fileButtonAccessibilityLabel = 'Файл',
     super.inputPlaceholder = 'Сообщение',
     super.sendButtonAccessibilityLabel = 'Отправить',
-    super.unseenMessagesBannerLabel = '?',
+    super.unreadMessagesLabel = 'Непрочитанные сообщения',
   });
 }
 
@@ -173,7 +173,7 @@ class ChatL10nTr extends ChatL10n {
     super.fileButtonAccessibilityLabel = 'Dosya',
     super.inputPlaceholder = 'Mesaj yazın',
     super.sendButtonAccessibilityLabel = 'Gönder',
-    super.unseenMessagesBannerLabel = '?',
+    super.unreadMessagesLabel = 'Okunmamış Mesajlar',
   });
 }
 
@@ -189,7 +189,7 @@ class ChatL10nUk extends ChatL10n {
     super.fileButtonAccessibilityLabel = 'Файл',
     super.inputPlaceholder = 'Повідомлення',
     super.sendButtonAccessibilityLabel = 'Надіслати',
-    super.unseenMessagesBannerLabel = '?',
+    super.unreadMessagesLabel = 'Непрочитанi повідомлення',
   });
 }
 
@@ -205,7 +205,7 @@ class ChatL10nZhCN extends ChatL10n {
     super.fileButtonAccessibilityLabel = '文件',
     super.inputPlaceholder = '输入消息',
     super.sendButtonAccessibilityLabel = '发送',
-    super.unseenMessagesBannerLabel = '?',
+    super.unreadMessagesLabel = '未读消息',
   });
 }
 
@@ -221,6 +221,6 @@ class ChatL10nZhTW extends ChatL10n {
     super.fileButtonAccessibilityLabel = '檔案',
     super.inputPlaceholder = '輸入訊息',
     super.sendButtonAccessibilityLabel = '傳送',
-    super.unseenMessagesBannerLabel = '?',
+    super.unreadMessagesLabel = '未讀訊息',
   });
 }

lib/src/chat_theme.dart

@@ -1,5 +1,7 @@
 import 'package:flutter/material.dart';
 
+import 'widgets/unread_header.dart';
+
 // For internal usage only. Use values from theme itself.
 
 /// See [ChatTheme.userAvatarNameColors]
@@ -96,7 +98,7 @@ abstract class ChatTheme {
     required this.sentMessageLinkDescriptionTextStyle,
     required this.sentMessageLinkTitleTextStyle,
     required this.statusIconPadding,
-    required this.unseenMessagesBannerTheme,
+    required this.unreadHeaderTheme,
     required this.userAvatarImageBackgroundColor,
     required this.userAvatarNameColors,
     required this.userAvatarTextStyle,
@@ -257,8 +259,8 @@ abstract class ChatTheme {
   /// Padding around status icons.
   final EdgeInsets statusIconPadding;
 
-  /// Theme for the unseen messages banner.
-  final UnseenMessagesBannerTheme unseenMessagesBannerTheme;
+  /// Theme for the unread header.
+  final UnreadHeaderTheme unreadHeaderTheme;
 
   /// Color used as a background for user avatar if an image is provided.
   /// Visible if the image has some transparent parts.
@@ -394,7 +396,7 @@ class DefaultChatTheme extends ChatTheme {
       height: 1.375,
     ),
     super.statusIconPadding = const EdgeInsets.symmetric(horizontal: 4),
-    super.unseenMessagesBannerTheme = const UnseenMessagesBannerTheme(
+    super.unreadHeaderTheme = const UnreadHeaderTheme(
       color: secondary,
       textStyle: TextStyle(
         color: neutral2,
@@ -536,7 +538,7 @@ class DarkChatTheme extends ChatTheme {
       height: 1.375,
     ),
     super.statusIconPadding = const EdgeInsets.symmetric(horizontal: 4),
-    super.unseenMessagesBannerTheme = const UnseenMessagesBannerTheme(
+    super.unreadHeaderTheme = const UnreadHeaderTheme(
       color: secondaryDark,
       textStyle: TextStyle(
         color: neutral7WithOpacity,
@@ -560,17 +562,3 @@ class DarkChatTheme extends ChatTheme {
     ),
   });
 }
-
-@immutable
-class UnseenMessagesBannerTheme {
-  const UnseenMessagesBannerTheme({
-    required this.color,
-    required this.textStyle,
-  });
-
-  /// Background color of the banner.
-  final Color color;
-
-  /// Text style for the unseen message banner text.
-  final TextStyle textStyle;
-}

lib/src/models/unread_header_data.dart

@@ -0,0 +1,15 @@
+import 'package:equatable/equatable.dart';
+import 'package:meta/meta.dart';
+
+/// A class that represents the header above the first unread message.
+@immutable
+class UnreadHeaderData extends Equatable {
+  const UnreadHeaderData({
+    this.marginTop,
+  });
+
+  final double? marginTop;
+
+  @override
+  List<Object?> get props => [];
+}

lib/src/models/unseen_banner.dart

@@ -5,11 +5,11 @@ import 'package:flutter/foundation.dart' show kIsWeb;
 import 'package:flutter_chat_types/flutter_chat_types.dart' as types;
 import 'package:intl/intl.dart';
 
-import './models/date_header.dart';
-import './models/emoji_enlargement_behavior.dart';
-import './models/message_spacer.dart';
-import './models/preview_image.dart';
-import 'models/unseen_banner.dart';
+import 'models/date_header.dart';
+import 'models/emoji_enlargement_behavior.dart';
+import 'models/message_spacer.dart';
+import 'models/preview_image.dart';
+import 'models/unread_header_data.dart';
 
 /// Returns text representation of a provided bytes value (e.g. 1kB, 1GB).
 String formatBytes(int size, [int fractionDigits = 2]) {
@@ -96,17 +96,17 @@ bool isConsistsOfEmojis(
   return multiEmojiRegExp.hasMatch(message.text);
 }
 
-/// Parses provided messages to chat messages (with headers, unseen banner
-/// and spacers) and returns them with a gallery
+/// Parses provided messages to chat messages (with headers and spacers)
+/// and returns them with a gallery.
 List<Object> calculateChatMessages(
   List<types.Message> messages,
   types.User user, {
   String Function(DateTime)? customDateHeaderText,
   DateFormat? dateFormat,
   required int dateHeaderThreshold,
   String? dateLocale,
-  String? lastSeenMessageID,
   required int groupMessagesThreshold,
+  String? lastReadMessageId,
   required bool showUserNames,
   DateFormat? timeFormat,
 }) {
@@ -164,7 +164,7 @@ List<Object> calculateChatMessages(
               DateTime.fromMillisecondsSinceEpoch(nextMessage.createdAt!).day;
 
       nextMessageInGroup = nextMessageSameAuthor &&
-          message.id != lastSeenMessageID &&
+          message.id != lastReadMessageId &&
           nextMessage.createdAt! - message.createdAt! <= groupMessagesThreshold;
     }
 
@@ -224,8 +224,14 @@ List<Object> calculateChatMessages(
       );
     }
 
-    if (message.id == lastSeenMessageID && !isLast) {
-      chatMessages.insert(0, const UnseenBanner());
+    if (message.id == lastReadMessageId && !isLast) {
+      chatMessages.insert(
+        0,
+        UnreadHeaderData(
+          marginTop:
+              nextMessageDifferentDay || nextMessageDateThreshold ? 0 : 8,
+        ),
+      );
     }
 
     if (message is types.ImageMessage) {