Merge branch 'develop' into rfac/transform

packages/stream_chat_flutter/lib/src/image_group.dart

@@ -12,12 +12,16 @@ class ImageGroup extends StatelessWidget {
     required this.message,
     required this.messageTheme,
     required this.size,
+    this.onReturnAction,
     this.onShowMessage,
   }) : super(key: key);
 
   /// List of attachments to show
   final List<Attachment> images;
 
+  /// Callback when attachment is returned to from other screens
+  final ValueChanged<ReturnActionType>? onReturnAction;
+
   /// Message which images are attached to
   final Message message;
 
@@ -111,10 +115,10 @@ class ImageGroup extends StatelessWidget {
   void _onTap(
     BuildContext context,
     int index,
-  ) {
+  ) async {
     final channel = StreamChannel.of(context).channel;
 
-    Navigator.push(
+    final res = await Navigator.push(
       context,
       MaterialPageRoute(
         builder: (context) => StreamChannel(
@@ -129,6 +133,7 @@ class ImageGroup extends StatelessWidget {
         ),
       ),
     );
+    if (res != null) onReturnAction?.call(res);
   }
 
   Widget _buildImage(BuildContext context, int index) => ImageAttachment(

packages/stream_chat_flutter/lib/src/message_input.dart

@@ -463,58 +463,57 @@ class MessageInputState extends State<MessageInput> {
     );
   }
 
-  Widget _buildExpandActionsButton() => Padding(
-        padding: const EdgeInsets.symmetric(horizontal: 8),
-        child: AnimatedCrossFade(
-          crossFadeState: _actionsShrunk
-              ? CrossFadeState.showFirst
-              : CrossFadeState.showSecond,
-          firstChild: IconButton(
-            onPressed: () => setState(() => _actionsShrunk = false),
-            icon: Transform.rotate(
-              angle: (widget.actionsLocation == ActionsLocation.right ||
-                      widget.actionsLocation == ActionsLocation.rightInside)
-                  ? pi
-                  : 0,
-              child: StreamSvgIcon.emptyCircleLeft(
-                color: StreamChatTheme.of(context)
-                    .messageInputTheme
-                    .expandButtonColor,
-              ),
+  Widget _buildExpandActionsButton() {
+    final channel = StreamChannel.of(context).channel;
+    return Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 8),
+      child: AnimatedCrossFade(
+        crossFadeState: _actionsShrunk
+            ? CrossFadeState.showFirst
+            : CrossFadeState.showSecond,
+        firstChild: IconButton(
+          onPressed: () => setState(() => _actionsShrunk = false),
+          icon: Transform.rotate(
+            angle: (widget.actionsLocation == ActionsLocation.right ||
+                    widget.actionsLocation == ActionsLocation.rightInside)
+                ? pi
+                : 0,
+            child: StreamSvgIcon.emptyCircleLeft(
+              color: StreamChatTheme.of(context)
+                  .messageInputTheme
+                  .expandButtonColor,
             ),
-            padding: const EdgeInsets.all(0),
-            constraints: const BoxConstraints.tightFor(
-              height: 24,
-              width: 24,
-            ),
-            splashRadius: 24,
           ),
-          secondChild: widget.disableAttachments &&
-                  !widget.showCommandsButton &&
-                  widget.actions?.isNotEmpty != true
-              ? const Offstage()
-              : FittedBox(
-                  child: Row(
-                    mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-                    children: <Widget>[
-                      if (!widget.disableAttachments) _buildAttachmentButton(),
-                      if (widget.showCommandsButton &&
-                          widget.editMessage == null &&
-                          StreamChannel.of(context)
-                                  .channel
-                                  .config
-                                  ?.commands
-                                  .isNotEmpty ==
-                              true)
-                        _buildCommandButton(),
-                      ...widget.actions ?? [],
-                    ].insertBetween(const SizedBox(width: 8)),
-                  ),
-                ),
-          duration: const Duration(milliseconds: 300),
-          alignment: Alignment.center,
+          padding: const EdgeInsets.all(0),
+          constraints: const BoxConstraints.tightFor(
+            height: 24,
+            width: 24,
+          ),
+          splashRadius: 24,
         ),
-      );
+        secondChild: widget.disableAttachments &&
+                !widget.showCommandsButton &&
+                widget.actions?.isNotEmpty != true
+            ? const Offstage()
+            : FittedBox(
+                child: Row(
+                  mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                  children: <Widget>[
+                    if (!widget.disableAttachments) _buildAttachmentButton(),
+                    if (widget.showCommandsButton &&
+                        widget.editMessage == null &&
+                        channel.state != null &&
+                        channel.config?.commands.isNotEmpty == true)
+                      _buildCommandButton(),
+                    ...widget.actions ?? [],
+                  ].insertBetween(const SizedBox(width: 8)),
+                ),
+              ),
+        duration: const Duration(milliseconds: 300),
+        alignment: Alignment.center,
+      ),
+    );
+  }
 
   Expanded _buildTextInput(BuildContext context) {
     final theme = StreamChatTheme.of(context);

packages/stream_chat_flutter/lib/src/message_list_view.dart

@@ -270,7 +270,7 @@ class MessageListView extends StatefulWidget {
 
 class _MessageListViewState extends State<MessageListView> {
   ItemScrollController? _scrollController;
-  Function? _onThreadTap;
+  void Function(Message)? _onThreadTap;
   bool _showScrollToBottom = false;
   late final ItemPositionsListener _itemPositionListener;
   int? _messageListLength;
@@ -814,7 +814,7 @@ class _MessageListViewState extends State<MessageListView> {
       showUsername: !isMyMessage,
       padding: const EdgeInsets.all(8),
       showSendingIndicator: false,
-      onThreadTap: _onThreadTap as void Function(Message)?,
+      onThreadTap: _onThreadTap,
       borderRadiusGeometry: const BorderRadius.only(
         topLeft: Radius.circular(16),
         bottomLeft: Radius.circular(2),
@@ -976,7 +976,7 @@ class _MessageListViewState extends State<MessageListView> {
       showThreadReplyMessage: !isThreadMessage,
       showFlagButton: !isMyMessage,
       borderSide: borderSide,
-      onThreadTap: _onThreadTap as void Function(Message)?,
+      onThreadTap: _onThreadTap,
       onReplyTap: widget.onReplyTap,
       attachmentBorderRadiusGeometry: BorderRadius.only(
         topLeft: Radius.circular(attachmentBorderRadius),

packages/stream_chat_flutter/lib/src/message_widget.dart

@@ -125,6 +125,7 @@ class MessageWidget extends StatefulWidget {
                       message: message,
                       messageTheme: messageTheme,
                       onShowMessage: onShowMessage,
+                      onReturnAction: onReturnAction,
                     ),
                   ),
                   border,