Skip to content

Commit 80e2eeb

Browse files
committed
fix(ui): fix merge conflicts
1 parent e86fc85 commit 80e2eeb

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

packages/stream_chat_flutter/lib/src/fullscreen_media/full_screen_media.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import 'dart:io';
44
import 'package:chewie/chewie.dart';
55
import 'package:flutter/material.dart';
66
import 'package:photo_view/photo_view.dart';
7-
import 'package:shimmer/shimmer.dart';
8-
import 'package:stream_chat_flutter/platform_widget_builder/platform_widget_builder.dart';
7+
import 'package:stream_chat_flutter/src/attachment/thumbnail/media_attachment_thumbnail.dart';
8+
import 'package:stream_chat_flutter/src/fullscreen_media/gallery_navigation_item.dart';
99
import 'package:stream_chat_flutter/stream_chat_flutter.dart';
1010
import 'package:video_player/video_player.dart';
1111

packages/stream_chat_flutter/lib/src/message_widget/parse_attachments.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ class ParseAttachments extends StatelessWidget {
8484
builder: (context) {
8585
return StreamChannel(
8686
channel: channel,
87-
child: StreamFullScreenMediaBuilder(
87+
child: StreamFullScreenMedia(
8888
userName: message.user!.name,
8989
mediaAttachmentPackages: attachments,
9090
startIndex: attachments.indexWhere(

0 commit comments

Comments
 (0)