Merge branch 'feature/new-ui' into qa4-fixes

lib/src/image_footer.dart

@@ -218,12 +218,14 @@ class _ImageFooterState extends State<ImageFooter> {
                 shrinkWrap: true,
                 physics: NeverScrollableScrollPhysics(),
                 itemBuilder: (context, position) {
+                  Widget media;
+
                   if (widget.mediaAttachments[position].type == 'video') {
                     var controllerPackage = widget.videoPackages[
                         videoAttachments
                             .indexOf(widget.mediaAttachments[position])];
 
-                    return InkWell(
+                    media = InkWell(
                       onTap: () {
                         widget.mediaSelectedCallBack(position);
                       },
@@ -235,7 +237,7 @@ class _ImageFooterState extends State<ImageFooter> {
                       ),
                     );
                   } else {
-                    return InkWell(
+                    media = InkWell(
                       onTap: () {
                         widget.mediaSelectedCallBack(position);
                       },
@@ -254,6 +256,28 @@ class _ImageFooterState extends State<ImageFooter> {
                       ),
                     );
                   }
+
+                  return Stack(
+                    children: [
+                      media,
+                      Padding(
+                        padding: EdgeInsets.all(8.0),
+                        child: Align(
+                          alignment: Alignment.topLeft,
+                          child: UserAvatar(
+                            user: widget.message.user,
+                            constraints: BoxConstraints.tight(
+                              Size(
+                                24,
+                                24,
+                              ),
+                            ),
+                            showOnlineStatus: false,
+                          ),
+                        ),
+                      ),
+                    ],
+                  );
                 },
                 itemCount: widget.mediaAttachments.length,
                 gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(

lib/src/message_list_view.dart

@@ -332,7 +332,6 @@ class _MessageListViewState extends State<MessageListView> {
                       tileAnchor: Alignment.topCenter,
                       childAnchor: Alignment.topCenter,
                       message: statusString,
-                      child: LazyLoadScrollView(
                       child: LazyLoadScrollView(
                         onStartOfPage: () async {
                           _inBetweenList = false;
@@ -401,18 +400,16 @@ class _MessageListViewState extends State<MessageListView> {
                               nextMessage.createdAt.toLocal(),
                               Units.DAY,
                             )) {
-                                final divider =
+                              final divider = widget.dateDividerBuilder != null
-                                    widget.dateDividerBuilder != null
                                   ? widget.dateDividerBuilder(
                                       nextMessage.createdAt.toLocal(),
                                     )
                                   : DateDivider(
-                                            dateTime:
+                                      dateTime: nextMessage.createdAt.toLocal(),
-                                                nextMessage.createdAt.toLocal(),
                                     );
                               return Padding(
-                                  padding: const EdgeInsets.symmetric(
+                                padding:
-                                      vertical: 12.0),
+                                    const EdgeInsets.symmetric(vertical: 12.0),
                                 child: divider,
                               );
                             }
@@ -442,8 +439,7 @@ class _MessageListViewState extends State<MessageListView> {
                                   widget.parentMessage,
                                 );
                               } else {
-                                  return buildParentMessage(
+                                return buildParentMessage(widget.parentMessage);
-                                      widget.parentMessage);
                               }
                             }
                             if (i == messages.length + 1) {
@@ -479,8 +475,8 @@ class _MessageListViewState extends State<MessageListView> {
                             } else {
                               if (widget.messageBuilder != null) {
                                 messageWidget = Builder(
-                                    key: ValueKey<String>(
+                                  key:
-                                        'MESSAGE-${message.id}'),
+                                      ValueKey<String>('MESSAGE-${message.id}'),
                                   builder: (context) => widget.messageBuilder(
                                       context,
                                       MessageDetails(
@@ -500,7 +496,6 @@ class _MessageListViewState extends State<MessageListView> {
                           },
                         ),
                       ),
-                      ),
                     );
                   }),
               if (widget.showScrollToBottom) _buildScrollToBottom(),