chore: fixes after LinkPreview PR

Author: demchenkoalex

packages/flutter_chat_core/lib/flutter_chat_core.dart

@@ -15,5 +15,6 @@ export 'src/theme/chat_theme.dart';
 export 'src/theme/chat_theme_extension.dart';
 export 'src/utils/get_icon_for_status.dart';
 export 'src/utils/is_only_emoji.dart';
+export 'src/utils/link_preview_position.dart';
 export 'src/utils/typedefs.dart';
 export 'src/utils/user_cache.dart';

packages/flutter_chat_core/lib/src/models/link_preview_data.dart

@@ -19,7 +19,6 @@ abstract class LinkPreviewData with _$LinkPreviewData {
 
     /// The title extracted from the link source.
     String? title,
-
   }) = _LinkPreviewData;
 
   const LinkPreviewData._();
@@ -34,7 +33,6 @@ abstract class LinkPreviewData with _$LinkPreviewData {
 abstract class ImagePreviewData with _$ImagePreviewData {
   /// Creates a [ImagePreviewData] instance.
   const factory ImagePreviewData({
-
     /// The URL of an image associated with the link.
     required String url,
 
@@ -43,12 +41,11 @@ abstract class ImagePreviewData with _$ImagePreviewData {
 
     /// The image height.
     required double height,
-
   }) = _ImagePreviewData;
 
   const ImagePreviewData._();
 
   /// Creates a [ImagePreviewData] instance from a JSON map.
   factory ImagePreviewData.fromJson(Map<String, dynamic> json) =>
       _$ImagePreviewDataFromJson(json);
-}
+}

packages/flutter_chat_ui/lib/src/link_preview.dart renamed to packages/flutter_chat_core/lib/src/utils/link_preview_position.dart

@@ -9,7 +9,6 @@ export 'src/chat_message/chat_message.dart';
 export 'src/composer.dart';
 export 'src/empty_chat_list.dart';
 export 'src/is_typing.dart';
-export 'src/link_preview.dart';
 export 'src/load_more.dart';
 export 'src/scroll_to_bottom.dart';
 export 'src/simple_text_message.dart';

packages/flutter_chat_ui/lib/flutter_chat_ui.dart

@@ -89,7 +89,7 @@ class _ChatMessageInternalState extends State<ChatMessageInternal> {
 
   @override
   Widget build(BuildContext context) {
-    final builders = context.watch<Builders>();
+    final builders = context.read<Builders>();
     final child = _buildMessage(
       context,
       builders,

packages/flutter_chat_ui/lib/src/chat_message/chat_message_internal.dart

@@ -2,8 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_chat_core/flutter_chat_core.dart';
 import 'package:provider/provider.dart';
 
-import 'link_preview.dart';
-
 /// A widget that displays a simple text message.
 class SimpleTextMessage extends StatelessWidget {
   /// The text message data model.
@@ -18,6 +16,9 @@ class SimpleTextMessage extends StatelessWidget {
   /// Border radius of the message bubble.
   final BorderRadiusGeometry? borderRadius;
 
+  /// Box constraints for the message bubble.
+  final BoxConstraints? constraints;
+
   /// Font size for messages containing only emojis.
   final double? onlyEmojiFontSize;
 
@@ -45,6 +46,9 @@ class SimpleTextMessage extends StatelessWidget {
   /// Position of the timestamp and status indicator relative to the text.
   final TimeAndStatusPosition timeAndStatusPosition;
 
+  /// Insets for the timestamp and status indicator when [timeAndStatusPosition] is [TimeAndStatusPosition.inline].
+  final EdgeInsetsGeometry? timeAndStatusPositionInlineInsets;
+
   /// The position of the link preview widget relative to the text.
   /// If set to [LinkPreviewPosition.none], the link preview widget will not be displayed.
   /// A [LinkPreviewBuilder] must be provided for the preview to be displayed.
@@ -57,6 +61,7 @@ class SimpleTextMessage extends StatelessWidget {
     required this.index,
     this.padding = const EdgeInsets.symmetric(horizontal: 16, vertical: 10),
     this.borderRadius,
+    this.constraints,
     this.onlyEmojiFontSize = 48,
     this.sentBackgroundColor,
     this.receivedBackgroundColor,
@@ -66,6 +71,7 @@ class SimpleTextMessage extends StatelessWidget {
     this.showTime = true,
     this.showStatus = true,
     this.timeAndStatusPosition = TimeAndStatusPosition.end,
+    this.timeAndStatusPositionInlineInsets = const EdgeInsets.only(bottom: 2),
     this.linkPreviewPosition = LinkPreviewPosition.bottom,
   });
 
@@ -100,7 +106,7 @@ class SimpleTextMessage extends StatelessWidget {
 
     final linkPreviewWidget =
         linkPreviewPosition != LinkPreviewPosition.none
-            ? context.watch<Builders>().linkPreviewBuilder?.call(
+            ? context.read<Builders>().linkPreviewBuilder?.call(
               context,
               message,
             )
@@ -109,16 +115,11 @@ class SimpleTextMessage extends StatelessWidget {
     return ClipRRect(
       borderRadius: borderRadius ?? theme.shape,
       child: Container(
-        decoration:
-            _isOnlyEmoji
-                ? null
-                : BoxDecoration(
-                  color: backgroundColor,
-                  borderRadius: borderRadius ?? theme.shape,
-                ),
+        constraints: constraints,
+        decoration: _isOnlyEmoji ? null : BoxDecoration(color: backgroundColor),
         child: Column(
           mainAxisSize: MainAxisSize.min,
-          crossAxisAlignment: CrossAxisAlignment.end,
+          crossAxisAlignment: CrossAxisAlignment.start,
           children: [
             if (linkPreviewWidget != null &&
                 linkPreviewPosition == LinkPreviewPosition.top)
@@ -173,7 +174,10 @@ class SimpleTextMessage extends StatelessWidget {
           children: [
             Flexible(child: textContent),
             const SizedBox(width: 4),
-            timeAndStatus,
+            Padding(
+              padding: timeAndStatusPositionInlineInsets ?? EdgeInsets.zero,
+              child: timeAndStatus,
+            ),
           ],
         );
       case TimeAndStatusPosition.end:

packages/flutter_chat_ui/lib/src/simple_text_message.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_chat_core/flutter_chat_core.dart';
-import 'package:flutter_chat_ui/flutter_chat_ui.dart' show LinkPreviewPosition;
 import 'package:gpt_markdown/gpt_markdown.dart';
 import 'package:provider/provider.dart';
 
@@ -20,6 +19,9 @@ class FlyerChatTextMessage extends StatelessWidget {
   /// Border radius of the message bubble.
   final BorderRadiusGeometry? borderRadius;
 
+  /// Box constraints for the message bubble.
+  final BoxConstraints? constraints;
+
   /// Font size for messages containing only emojis.
   final double? onlyEmojiFontSize;
 
@@ -47,6 +49,9 @@ class FlyerChatTextMessage extends StatelessWidget {
   /// Position of the timestamp and status indicator relative to the text.
   final TimeAndStatusPosition timeAndStatusPosition;
 
+  /// Insets for the timestamp and status indicator when [timeAndStatusPosition] is [TimeAndStatusPosition.inline].
+  final EdgeInsetsGeometry? timeAndStatusPositionInlineInsets;
+
   /// The callback function to handle link clicks.
   final void Function(String url, String title)? onLinkTab;
 
@@ -62,6 +67,7 @@ class FlyerChatTextMessage extends StatelessWidget {
     required this.index,
     this.padding = const EdgeInsets.symmetric(horizontal: 16, vertical: 10),
     this.borderRadius,
+    this.constraints,
     this.onlyEmojiFontSize = 48,
     this.sentBackgroundColor,
     this.receivedBackgroundColor,
@@ -71,6 +77,7 @@ class FlyerChatTextMessage extends StatelessWidget {
     this.showTime = true,
     this.showStatus = true,
     this.timeAndStatusPosition = TimeAndStatusPosition.end,
+    this.timeAndStatusPositionInlineInsets = const EdgeInsets.only(bottom: 2),
     this.onLinkTab,
     this.linkPreviewPosition = LinkPreviewPosition.bottom,
   });
@@ -107,7 +114,7 @@ class FlyerChatTextMessage extends StatelessWidget {
 
     final linkPreviewWidget =
         linkPreviewPosition != LinkPreviewPosition.none
-            ? context.watch<Builders>().linkPreviewBuilder?.call(
+            ? context.read<Builders>().linkPreviewBuilder?.call(
               context,
               message,
             )
@@ -116,16 +123,11 @@ class FlyerChatTextMessage extends StatelessWidget {
     return ClipRRect(
       borderRadius: borderRadius ?? theme.shape,
       child: Container(
-        decoration:
-            _isOnlyEmoji
-                ? null
-                : BoxDecoration(
-                  color: backgroundColor,
-                  borderRadius: borderRadius ?? theme.shape,
-                ),
+        constraints: constraints,
+        decoration: _isOnlyEmoji ? null : BoxDecoration(color: backgroundColor),
         child: Column(
           mainAxisSize: MainAxisSize.min,
-          crossAxisAlignment: CrossAxisAlignment.end,
+          crossAxisAlignment: CrossAxisAlignment.start,
           children: [
             if (linkPreviewWidget != null &&
                 linkPreviewPosition == LinkPreviewPosition.top)
@@ -180,7 +182,10 @@ class FlyerChatTextMessage extends StatelessWidget {
           children: [
             Flexible(child: textContent),
             const SizedBox(width: 4),
-            timeAndStatus,
+            Padding(
+              padding: timeAndStatusPositionInlineInsets ?? EdgeInsets.zero,
+              child: timeAndStatus,
+            ),
           ],
         );
       case TimeAndStatusPosition.end:

packages/flyer_chat_text_message/lib/src/flyer_chat_text_message.dart

@@ -13,7 +13,6 @@ dependencies:
   flutter:
     sdk: flutter
   flutter_chat_core: ^2.2.1
-  flutter_chat_ui: ^2.2.1
   gpt_markdown: ^1.0.16
   provider: ^6.1.4