Merge branch 'develop' into hotfix/media-download

This commit is contained in:
Salvatore Giordano
2021-12-27 10:54:03 +01:00
committed by GitHub
5 changed files with 53 additions and 8 deletions
@@ -4,6 +4,10 @@
- Use file extension instead of mimeType for downloading files
✅ Added
- Videos can now be auto-played in `FullScreenMedia`
## 3.3.2
- Updated `stream_chat_flutter_core` dependency to [`3.3.1`](https://pub.dev/packages/stream_chat_flutter_core/changelog).
@@ -246,7 +246,8 @@ class GiphyAttachment extends AttachmentWidget {
return StreamChannel(
channel: channel,
child: FullScreenMedia(
mediaAttachments: [attachment],
mediaAttachments: message.attachments,
startIndex: message.attachments.indexOf(attachment),
userName: message.user?.name,
message: message,
onShowMessage: onShowMessage,
@@ -141,7 +141,9 @@ class ImageAttachment extends AttachmentWidget {
return StreamChannel(
channel: channel,
child: FullScreenMedia(
mediaAttachments: [attachment],
mediaAttachments: message.attachments,
startIndex:
message.attachments.indexOf(attachment),
userName: message.user?.name,
message: message,
onShowMessage: onShowMessage,
@@ -87,7 +87,9 @@ class VideoAttachment extends AttachmentWidget {
builder: (_) => StreamChannel(
channel: channel,
child: FullScreenMedia(
mediaAttachments: [attachment],
mediaAttachments: message.attachments,
startIndex:
message.attachments.indexOf(attachment),
userName: message.user?.name,
message: message,
onShowMessage: onShowMessage,
@@ -34,6 +34,7 @@ class FullScreenMedia extends StatefulWidget {
String? userName,
this.onShowMessage,
this.attachmentActionsModalBuilder,
this.autoplayVideos = false,
}) : userName = userName ?? '',
super(key: key);
@@ -57,6 +58,9 @@ class FullScreenMedia extends StatefulWidget {
/// Use [defaultActionsModal.copyWith] to easily customize it
final AttachmentActionsBuilder? attachmentActionsModalBuilder;
/// Auto-play videos when page is opened
final bool autoplayVideos;
@override
_FullScreenMediaState createState() => _FullScreenMediaState();
}
@@ -81,7 +85,8 @@ class _FullScreenMediaState extends State<FullScreenMedia>
);
_pageController = PageController(initialPage: widget.startIndex);
_currentPage = widget.startIndex;
for (final attachment in widget.mediaAttachments) {
for (var i = 0; i < widget.mediaAttachments.length; i++) {
final attachment = widget.mediaAttachments[i];
if (attachment.type != 'video') continue;
final package = VideoPackage(attachment, showControls: true);
videoPackages[attachment.id] = package;
@@ -90,9 +95,21 @@ class _FullScreenMediaState extends State<FullScreenMedia>
}
Future<void> initializePlayers() async {
if (videoPackages.isEmpty) {
return;
}
final currentAttachment = widget.mediaAttachments[widget.startIndex];
await Future.wait(videoPackages.values.map(
(it) => it.initialize(),
));
if (widget.autoplayVideos && currentAttachment.type == 'video') {
final package = videoPackages.values
.firstWhere((e) => e._attachment == currentAttachment);
package._chewieController?.play();
}
setState(() {}); // ignore: no-empty-block
}
@@ -109,6 +126,24 @@ class _FullScreenMediaState extends State<FullScreenMedia>
setState(() {
_currentPage = val;
});
if (videoPackages.isEmpty) {
return;
}
final currentAttachment = widget.mediaAttachments[val];
for (final e in videoPackages.values) {
if (e._attachment != currentAttachment) {
e._chewieController?.pause();
}
}
if (widget.autoplayVideos &&
currentAttachment.type == 'video') {
final controller = videoPackages[currentAttachment.id]!;
controller._chewieController?.play();
}
},
itemBuilder: (context, index) {
final attachment = widget.mediaAttachments[index];
@@ -243,15 +278,16 @@ class _FullScreenMediaState extends State<FullScreenMedia>
class VideoPackage {
/// Constructor for creating [VideoPackage]
VideoPackage(
Attachment attachment, {
this._attachment, {
bool showControls = false,
bool autoInitialize = true,
}) : _showControls = showControls,
_autoInitialize = autoInitialize,
_videoPlayerController = attachment.localUri != null
? VideoPlayerController.file(File.fromUri(attachment.localUri!))
: VideoPlayerController.network(attachment.assetUrl!);
_videoPlayerController = _attachment.localUri != null
? VideoPlayerController.file(File.fromUri(_attachment.localUri!))
: VideoPlayerController.network(_attachment.assetUrl!);
final Attachment _attachment;
final bool _showControls;
final bool _autoInitialize;
final VideoPlayerController _videoPlayerController;