feat: remove sentinel values

Author: demchenkoalex

examples/flyer_chat/lib/gemini.dart

@@ -127,7 +127,7 @@ class GeminiState extends State<Gemini> {
                   index: index,
                   showTime: false,
                   showStatus: false,
-                  receivedBackgroundColor: null,
+                  receivedBackgroundColor: Colors.transparent,
                   padding:
                       message.authorId == _agent.id
                           ? EdgeInsets.zero
@@ -149,7 +149,7 @@ class GeminiState extends State<Gemini> {
                 chunkAnimationDuration: _kChunkAnimationDuration,
                 showTime: false,
                 showStatus: false,
-                receivedBackgroundColor: null,
+                receivedBackgroundColor: Colors.transparent,
                 padding:
                     message.authorId == _agent.id
                         ? EdgeInsets.zero

examples/flyer_chat/lib/gemini_stream_manager.dart

@@ -41,13 +41,16 @@ class GeminiStreamManager extends ChangeNotifier {
       return; // Stream might have finished
     }
 
-    final trimmedChunk = chunk.trim(); // Trim the chunk
-    if (trimmedChunk.isEmpty) {
-      return; // Don't process empty chunks after trimming
+    // Trim single trailing newline from the incoming chunk if present.
+    var processedChunk = chunk;
+    if (processedChunk.endsWith('\n') && !processedChunk.endsWith('\n\n')) {
+      processedChunk = processedChunk.substring(0, processedChunk.length - 1);
     }
 
+    // Use the potentially processed chunk
     _accumulatedTexts[streamId] =
-        (_accumulatedTexts[streamId] ?? '') + trimmedChunk;
+        (_accumulatedTexts[streamId] ?? '') + processedChunk;
+
     _streamStates[streamId] = StreamStateStreaming(
       _accumulatedTexts[streamId]!,
     );

examples/flyer_chat/lib/local.dart

@@ -56,7 +56,7 @@ class LocalState extends State<Local> {
     return Scaffold(
       appBar: AppBar(title: const Text('Local')),
       body: Chat(
-        backgroundColor: null,
+        backgroundColor: Colors.transparent,
         builders: Builders(
           chatAnimatedListBuilder: (context, itemBuilder) {
             return ChatAnimatedList(

packages/flutter_chat_ui/CHANGELOG.md

@@ -8,6 +8,7 @@
 - The `sending` field has been removed from the message model; instead, you can set `sending: true` in the metadata of the Message model to achieve the same functionality.
 - The `isOnlyEmoji` property has been removed from the text message model; to indicate that a message contains only emojis, use `isOnlyEmoji: true` in the metadata of the text message.
 - The `firstName` and `lastName` fields in the `User` model have been consolidated into a single `name` field for improved simplicity.
+- The default sentinel values that previously allowed users to set specific properties to `null` have been removed. Instead, please use `Colors.transparent`, `BorderRadius.zero`, or `TextStyle()` to achieve the desired effect. Passing `null` will now use the standard configuration.
 
 **⚠️ New Features ⚠️**
 

packages/flutter_chat_ui/lib/src/chat.dart

@@ -10,8 +10,6 @@ import 'utils/load_more_notifier.dart';
 import 'utils/typedefs.dart';
 
 class Chat extends StatefulWidget {
-  static const Color _sentinelColor = Colors.transparent;
-
   final UserID currentUserId;
   final ResolveUserCallback resolveUser;
   final ChatController chatController;
@@ -38,7 +36,7 @@ class Chat extends StatefulWidget {
     this.onMessageTap,
     this.onMessageLongPress,
     this.onAttachmentTap,
-    this.backgroundColor = _sentinelColor,
+    this.backgroundColor,
     this.decoration,
     this.timeFormat,
   });
@@ -109,9 +107,9 @@ class _ChatState extends State<Chat> with WidgetsBindingObserver {
       ],
       child: Container(
         color:
-            widget.backgroundColor == Chat._sentinelColor
-                ? _theme.colors.surface
-                : widget.backgroundColor,
+            widget.decoration != null
+                ? null
+                : (widget.backgroundColor ?? _theme.colors.surface),
         decoration: widget.decoration,
         child: Stack(
           children: [

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

@@ -5,8 +5,6 @@ import 'package:provider/provider.dart';
 import '../utils/typedefs.dart';
 
 class ChatMessage extends StatelessWidget {
-  static const EdgeInsetsGeometry _sentinelPadding = EdgeInsets.zero;
-
   final Message message;
   final int index;
   final Animation<double> animation;
@@ -55,7 +53,7 @@ class ChatMessage extends StatelessWidget {
     this.receivedMessageRowAlignment = CrossAxisAlignment.end,
     this.scaleAnimationAlignment,
     this.alignment,
-    this.padding = _sentinelPadding,
+    this.padding,
     this.paddingChangeAnimationDuration = const Duration(milliseconds: 250),
     this.isRemoved,
     this.groupStatus,
@@ -75,8 +73,7 @@ class ChatMessage extends StatelessWidget {
       curve: Curves.linearToEaseOut,
     );
 
-    final resolvedPadding =
-        padding == _sentinelPadding ? _resolveDefaultPadding(context) : padding;
+    final resolvedPadding = padding ?? _resolveDefaultPadding(context);
 
     final Widget messageWidget = Column(
       mainAxisSize: MainAxisSize.min,
@@ -126,16 +123,18 @@ class ChatMessage extends StatelessWidget {
       ],
     );
 
-    return padding != null
-        ? paddingChangeAnimationDuration != null
-            ? AnimatedPadding(
-              padding: resolvedPadding!,
-              duration: paddingChangeAnimationDuration!,
-              curve: Curves.linearToEaseOut,
-              child: messageWidget,
-            )
-            : Padding(padding: resolvedPadding!, child: messageWidget)
-        : messageWidget;
+    if (resolvedPadding != EdgeInsets.zero) {
+      return paddingChangeAnimationDuration != null
+          ? AnimatedPadding(
+            padding: resolvedPadding,
+            duration: paddingChangeAnimationDuration!,
+            curve: Curves.linearToEaseOut,
+            child: messageWidget,
+          )
+          : Padding(padding: resolvedPadding, child: messageWidget);
+    }
+
+    return messageWidget;
   }
 
   Widget _buildMessage({required bool isSentByMe}) => Column(

packages/flutter_chat_ui/lib/src/composer.dart

@@ -7,8 +7,6 @@ import 'utils/composer_height_notifier.dart';
 import 'utils/typedefs.dart';
 
 class Composer extends StatefulWidget {
-  static const Color _sentinelColor = Colors.transparent;
-
   final TextEditingController? textEditingController;
   final double? left;
   final double? right;
@@ -62,7 +60,7 @@ class Composer extends StatefulWidget {
     this.filled = true,
     this.topWidget,
     this.handleSafeArea = true,
-    this.backgroundColor = _sentinelColor,
+    this.backgroundColor,
     this.attachmentIconColor,
     this.sendIconColor,
     this.hintColor,
@@ -146,10 +144,7 @@ class _ComposerState extends State<Composer> {
       child: ClipRect(
         child: Container(
           key: _key,
-          color:
-              widget.backgroundColor == Composer._sentinelColor
-                  ? theme.colors.surfaceContainerLow
-                  : widget.backgroundColor,
+          color: widget.backgroundColor ?? theme.colors.surfaceContainerLow,
           child: Column(
             children: [
               if (widget.topWidget != null) widget.topWidget!,

packages/flutter_chat_ui/lib/src/simple_text_message.dart

@@ -3,10 +3,6 @@ import 'package:flutter_chat_core/flutter_chat_core.dart';
 import 'package:provider/provider.dart';
 
 class SimpleTextMessage extends StatelessWidget {
-  static const BorderRadiusGeometry _sentinelBorderRadius = BorderRadius.zero;
-  static const Color _sentinelColor = Colors.transparent;
-  static const TextStyle _sentinelTextStyle = TextStyle();
-
   final TextMessage message;
   final int index;
   final EdgeInsetsGeometry? padding;
@@ -26,13 +22,13 @@ class SimpleTextMessage extends StatelessWidget {
     required this.message,
     required this.index,
     this.padding = const EdgeInsets.symmetric(horizontal: 16, vertical: 10),
-    this.borderRadius = _sentinelBorderRadius,
+    this.borderRadius,
     this.onlyEmojiFontSize = 48,
-    this.sentBackgroundColor = _sentinelColor,
-    this.receivedBackgroundColor = _sentinelColor,
-    this.sentTextStyle = _sentinelTextStyle,
-    this.receivedTextStyle = _sentinelTextStyle,
-    this.timeStyle = _sentinelTextStyle,
+    this.sentBackgroundColor,
+    this.receivedBackgroundColor,
+    this.sentTextStyle,
+    this.receivedTextStyle,
+    this.timeStyle,
     this.showTime = true,
     this.showStatus = true,
     this.timeAndStatusPosition = TimeAndStatusPosition.end,
@@ -80,10 +76,7 @@ class SimpleTextMessage extends StatelessWidget {
               ? null
               : BoxDecoration(
                 color: backgroundColor,
-                borderRadius:
-                    borderRadius == _sentinelBorderRadius
-                        ? theme.shape
-                        : borderRadius,
+                borderRadius: borderRadius ?? theme.shape,
               ),
       child: _buildContentBasedOnPosition(
         context: context,
@@ -144,38 +137,30 @@ class SimpleTextMessage extends StatelessWidget {
 
   Color? _resolveBackgroundColor(bool isSentByMe, ChatTheme theme) {
     if (isSentByMe) {
-      return sentBackgroundColor == _sentinelColor
-          ? theme.colors.primary
-          : sentBackgroundColor;
+      return sentBackgroundColor ?? theme.colors.primary;
     }
-    return receivedBackgroundColor == _sentinelColor
-        ? theme.colors.surfaceContainer
-        : receivedBackgroundColor;
+    return receivedBackgroundColor ?? theme.colors.surfaceContainer;
   }
 
   TextStyle? _resolveTextStyle(bool isSentByMe, ChatTheme theme) {
     if (isSentByMe) {
-      return sentTextStyle == _sentinelTextStyle
-          ? theme.typography.bodyMedium.copyWith(color: theme.colors.onPrimary)
-          : sentTextStyle;
+      return sentTextStyle ??
+          theme.typography.bodyMedium.copyWith(color: theme.colors.onPrimary);
     }
-    return receivedTextStyle == _sentinelTextStyle
-        ? theme.typography.bodyMedium.copyWith(color: theme.colors.onSurface)
-        : receivedTextStyle;
+    return receivedTextStyle ??
+        theme.typography.bodyMedium.copyWith(color: theme.colors.onSurface);
   }
 
   TextStyle? _resolveTimeStyle(bool isSentByMe, ChatTheme theme) {
     if (isSentByMe) {
-      return timeStyle == _sentinelTextStyle
-          ? theme.typography.labelSmall.copyWith(
+      return timeStyle ??
+          theme.typography.labelSmall.copyWith(
             color:
                 _isOnlyEmoji ? theme.colors.onSurface : theme.colors.onPrimary,
-          )
-          : timeStyle;
+          );
     }
-    return timeStyle == _sentinelTextStyle
-        ? theme.typography.labelSmall.copyWith(color: theme.colors.onSurface)
-        : timeStyle;
+    return timeStyle ??
+        theme.typography.labelSmall.copyWith(color: theme.colors.onSurface);
   }
 }
 

packages/flyer_chat_file_message/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## 0.0.12
 
+**⚠️ Breaking Changes ⚠️**
+
+- The default sentinel values that previously allowed users to set specific properties to `null` have been removed. Instead, please use `Colors.transparent`, `BorderRadius.zero`, or `TextStyle()` to achieve the desired effect. Passing `null` will now use the standard configuration.
+
 - Do not show status for received messages
 
 ## 0.0.11