Merge branch 'master' into feature/partial-update

packages/stream_chat_flutter/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.1.1-beta
+
+- Added MessageInput button color customization options
+- Fixed author theme and messageinput background
+
 ## 1.1.0-beta
 
 - Update stream_chat_core dependency

packages/stream_chat_flutter/lib/src/message_actions_modal.dart

@@ -596,7 +596,7 @@ class _MessageActionsModalState extends State<MessageActionsModal> {
       elevation: 2,
       clipBehavior: Clip.hardEdge,
       isScrollControlled: true,
-      backgroundColor: StreamChatTheme.of(context).colorTheme.white,
+      backgroundColor: StreamChatTheme.of(context).channelTheme.inputBackground,
       shape: RoundedRectangleBorder(
         borderRadius: BorderRadius.only(
           topLeft: Radius.circular(16),

packages/stream_chat_flutter/lib/src/message_input.dart

@@ -234,64 +234,66 @@ class MessageInputState extends State<MessageInput> {
 
   @override
   Widget build(BuildContext context) {
-    Widget child = SafeArea(
-      child: GestureDetector(
-        onPanUpdate: (details) {
-          if (details.delta.dy > 0) {
-            _focusNode.unfocus();
-            if (_openFilePickerSection) {
-              setState(() {
-                _openFilePickerSection = false;
-              });
+    Widget child = Container(
+      color: StreamChatTheme.of(context).channelTheme.inputBackground,
+      child: SafeArea(
+        child: GestureDetector(
+          onPanUpdate: (details) {
+            if (details.delta.dy > 0) {
+              _focusNode.unfocus();
+              if (_openFilePickerSection) {
+                setState(() {
+                  _openFilePickerSection = false;
+                });
+              }
             }
-          }
-        },
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            if (_hasQuotedMessage)
-              Padding(
-                padding: const EdgeInsets.fromLTRB(8, 8, 8, 0),
-                child: Row(
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  children: [
-                    Padding(
-                      padding: const EdgeInsets.all(8.0),
-                      child: StreamSvgIcon.reply(
-                        color: StreamChatTheme.of(context)
-                            .colorTheme
-                            .greyGainsboro,
+          },
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              if (_hasQuotedMessage)
+                Padding(
+                  padding: const EdgeInsets.fromLTRB(8, 8, 8, 0),
+                  child: Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    children: [
+                      Padding(
+                        padding: const EdgeInsets.all(8.0),
+                        child: StreamSvgIcon.reply(
+                          color: StreamChatTheme.of(context)
+                              .colorTheme
+                              .greyGainsboro,
+                        ),
                       ),
-                    ),
-                    Text(
-                      'Reply to Message',
-                      style: TextStyle(fontWeight: FontWeight.bold),
-                    ),
-                    IconButton(
-                      visualDensity: VisualDensity.compact,
-                      icon: StreamSvgIcon.closeSmall(),
-                      onPressed: widget.onQuotedMessageCleared,
-                    ),
-                  ],
+                      Text(
+                        'Reply to Message',
+                        style: TextStyle(fontWeight: FontWeight.bold),
+                      ),
+                      IconButton(
+                        visualDensity: VisualDensity.compact,
+                        icon: StreamSvgIcon.closeSmall(),
+                        onPressed: widget.onQuotedMessageCleared,
+                      ),
+                    ],
+                  ),
                 ),
-              ),
-            Padding(
-              padding: const EdgeInsets.all(8.0),
-              child: _buildTextField(context),
-            ),
-            if (widget.parentMessage != null)
               Padding(
-                padding: const EdgeInsets.symmetric(horizontal: 8.0),
-                child: _buildDmCheckbox(),
+                padding: const EdgeInsets.all(8.0),
+                child: _buildTextField(context),
               ),
-            _buildFilePickerSection(),
-          ],
+              if (widget.parentMessage != null)
+                Padding(
+                  padding: const EdgeInsets.symmetric(horizontal: 8.0),
+                  child: _buildDmCheckbox(),
+                ),
+              _buildFilePickerSection(),
+            ],
+          ),
         ),
       ),
     );
     if (widget.editMessage == null) {
       child = Material(
-        color: StreamChatTheme.of(context).colorTheme.white,
         elevation: 8,
         child: child,
       );
@@ -1681,8 +1683,8 @@ class MessageInputState extends State<MessageInput> {
     return IconButton(
       icon: StreamSvgIcon.lightning(
         color: _commandsOverlay != null
-            ? StreamChatTheme.of(context).colorTheme.accentBlue
-            : StreamChatTheme.of(context).colorTheme.grey,
+            ? StreamChatTheme.of(context).channelTheme.actionButtonColor
+            : StreamChatTheme.of(context).channelTheme.actionButtonIdleColor,
       ),
       padding: const EdgeInsets.all(0),
       constraints: BoxConstraints.tightFor(
@@ -1719,8 +1721,8 @@ class MessageInputState extends State<MessageInput> {
     return IconButton(
       icon: StreamSvgIcon.attach(
         color: _openFilePickerSection
-            ? StreamChatTheme.of(context).colorTheme.accentBlue
-            : StreamChatTheme.of(context).colorTheme.grey,
+            ? StreamChatTheme.of(context).channelTheme.actionButtonColor
+            : StreamChatTheme.of(context).channelTheme.actionButtonIdleColor,
       ),
       padding: const EdgeInsets.all(0),
       constraints: BoxConstraints.tightFor(
@@ -1959,7 +1961,7 @@ class MessageInputState extends State<MessageInput> {
   Widget _buildIdleSendButton(BuildContext context) {
     return StreamSvgIcon(
       assetName: _getIdleSendIcon(),
-      color: StreamChatTheme.of(context).colorTheme.greyGainsboro,
+      color: StreamChatTheme.of(context).channelTheme.sendButtonIdleColor,
     );
   }
 
@@ -1974,7 +1976,7 @@ class MessageInputState extends State<MessageInput> {
       ),
       icon: StreamSvgIcon(
         assetName: _getSendIcon(),
-        color: StreamChatTheme.of(context).colorTheme.accentBlue,
+        color: StreamChatTheme.of(context).channelTheme.sendButtonColor,
       ),
     );
   }

packages/stream_chat_flutter/lib/src/message_widget.dart

@@ -578,9 +578,7 @@ class _MessageWidgetState extends State<MessageWidget>
       if (showUsername)
         Text(
           widget.message.user.name,
-          style: widget.messageTheme.replies.copyWith(
-            color: widget.messageTheme.createdAt.color,
-          ),
+          style: widget.messageTheme.messageAuthor,
         ),
       if (showTimeStamp)
         Text(

packages/stream_chat_flutter/lib/src/stream_chat_theme.dart

@@ -182,9 +182,10 @@ class StreamChatThemeData {
           ),
           indicatorIconSize: 16.0),
       channelTheme: ChannelTheme(
-        messageInputButtonIconTheme: IconThemeData(
-          color: accentColor,
-        ),
+        actionButtonColor: colorTheme.accentBlue,
+        actionButtonIdleColor: colorTheme.grey,
+        sendButtonColor: colorTheme.accentBlue,
+        sendButtonIdleColor: colorTheme.greyGainsboro,
         channelHeaderTheme: ChannelHeaderTheme(
           avatarTheme: AvatarTheme(
             borderRadius: BorderRadius.circular(20),
@@ -206,6 +207,7 @@ class StreamChatThemeData {
         inputBackground: colorTheme.white.withAlpha(12),
       ),
       ownMessageTheme: MessageTheme(
+        messageAuthor: textTheme.footnote.copyWith(color: colorTheme.grey),
         messageText: textTheme.body,
         createdAt: textTheme.footnote.copyWith(color: colorTheme.grey),
         replies: textTheme.footnoteBold.copyWith(color: accentColor),
@@ -231,6 +233,7 @@ class StreamChatThemeData {
         reactionsMaskColor: colorTheme.whiteSnow,
         messageText: textTheme.body,
         createdAt: textTheme.footnote.copyWith(color: colorTheme.grey),
+        messageAuthor: textTheme.footnote.copyWith(color: colorTheme.grey),
         replies: textTheme.footnoteBold.copyWith(color: accentColor),
         messageLinks: TextStyle(
           color: accentColor,
@@ -625,36 +628,47 @@ class ChannelTheme {
   /// Theme of the [ChannelHeader] widget
   final ChannelHeaderTheme channelHeaderTheme;
 
-  /// IconTheme of the send button in [MessageInput]
-  final IconThemeData messageInputButtonIconTheme;
+  /// Background color of [MessageInput] send button
+  final Color sendButtonColor;
 
-  /// Theme of the send button in [MessageInput]
-  final ButtonThemeData messageInputButtonTheme;
+  /// Background color of [MessageInput] action buttons
+  final Color actionButtonColor;
+
+  /// Background color of [MessageInput] send button
+  final Color sendButtonIdleColor;
+
+  /// Background color of [MessageInput] action buttons
+  final Color actionButtonIdleColor;
 
   /// Background color of [MessageInput]
   final Color inputBackground;
 
   ChannelTheme({
     this.channelHeaderTheme,
-    this.messageInputButtonIconTheme,
-    this.messageInputButtonTheme,
+    this.actionButtonColor,
+    this.sendButtonColor,
+    this.actionButtonIdleColor,
+    this.sendButtonIdleColor,
     this.inputBackground,
   });
 
   /// Creates a copy of [ChannelTheme] with specified attributes overridden.
   ChannelTheme copyWith({
     ChannelHeaderTheme channelHeaderTheme,
-    IconThemeData messageInputButtonIconTheme,
-    ButtonThemeData messageInputButtonTheme,
     Color inputBackground,
+    Color actionButtonColor,
+    Color sendButtonColor,
+    Color actionButtonIdleColor,
+    Color sendButtonIdleColor,
   }) =>
       ChannelTheme(
         channelHeaderTheme: channelHeaderTheme ?? this.channelHeaderTheme,
-        messageInputButtonIconTheme:
-            messageInputButtonIconTheme ?? this.messageInputButtonIconTheme,
-        messageInputButtonTheme:
-            messageInputButtonTheme ?? this.messageInputButtonTheme,
         inputBackground: inputBackground ?? this.inputBackground,
+        actionButtonColor: actionButtonColor ?? this.actionButtonColor,
+        sendButtonColor: sendButtonColor ?? this.sendButtonColor,
+        actionButtonIdleColor:
+            actionButtonIdleColor ?? this.actionButtonIdleColor,
+        sendButtonIdleColor: sendButtonIdleColor ?? this.sendButtonIdleColor,
       );
 
   ChannelTheme merge(ChannelTheme other) {
@@ -662,11 +676,11 @@ class ChannelTheme {
     return copyWith(
       channelHeaderTheme: channelHeaderTheme?.merge(other.channelHeaderTheme) ??
           other.channelHeaderTheme,
-      messageInputButtonIconTheme: messageInputButtonIconTheme
-              ?.merge(other.messageInputButtonIconTheme) ??
-          other.messageInputButtonIconTheme,
-      messageInputButtonTheme: other.messageInputButtonTheme,
       inputBackground: other.inputBackground,
+      actionButtonColor: other.actionButtonColor,
+      actionButtonIdleColor: other.actionButtonIdleColor,
+      sendButtonColor: other.sendButtonColor,
+      sendButtonIdleColor: other.sendButtonIdleColor,
     );
   }
 }

packages/stream_chat_flutter/pubspec.yaml

@@ -1,7 +1,7 @@
 name: stream_chat_flutter
 homepage: https://github.com/GetStream/stream-chat-flutter
 description: Stream Chat official Flutter SDK. Build your own chat experience using Dart and Flutter.
-version: 1.1.0-beta
+version: 1.1.1-beta
 repository: https://github.com/GetStream/stream-chat-flutter
 issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues