From 0d6362e5d55536c878c6f987f58a4170acc34da7 Mon Sep 17 00:00:00 2001 From: Gordon Hayes Date: Thu, 17 Nov 2022 16:19:04 +0100 Subject: [PATCH 1/9] fix: cached attachment image not showing on web --- .../lib/src/attachment/image_attachment.dart | 47 +++++++++++++------ .../stream_chat_flutter_core/CHANGELOG.md | 5 ++ 2 files changed, 37 insertions(+), 15 deletions(-) diff --git a/packages/stream_chat_flutter/lib/src/attachment/image_attachment.dart b/packages/stream_chat_flutter/lib/src/attachment/image_attachment.dart index 93bf2926..6a6ee780 100644 --- a/packages/stream_chat_flutter/lib/src/attachment/image_attachment.dart +++ b/packages/stream_chat_flutter/lib/src/attachment/image_attachment.dart @@ -56,22 +56,33 @@ class StreamImageAttachment extends StreamAttachmentWidget { Widget build(BuildContext context) { return source.when( local: () { - if (attachment.localUri == null || attachment.file?.bytes == null) { - return AttachmentError(constraints: constraints); - } - return _buildImageAttachment( - context, - Image.memory( - attachment.file!.bytes!, - height: constraints?.maxHeight, - width: constraints?.maxWidth, - fit: BoxFit.cover, - errorBuilder: (context, _, __) => Image.asset( - 'images/placeholder.png', - package: 'stream_chat_flutter', + if (attachment.file?.bytes != null) { + return _buildImageAttachment( + context, + Image.memory( + attachment.file!.bytes!, + height: constraints?.maxHeight, + width: constraints?.maxWidth, + fit: BoxFit.cover, + errorBuilder: _imageErrorBuilder, ), - ), - ); + ); + } else if (attachment.localUri != null) { + return _buildImageAttachment( + context, + Image.asset( + attachment.localUri!.path, + height: constraints?.maxHeight, + width: constraints?.maxWidth, + fit: BoxFit.cover, + errorBuilder: _imageErrorBuilder, + ), + ); + } else { + return AttachmentError( + constraints: constraints, + ); + } }, network: () { var imageUrl = @@ -116,6 +127,12 @@ class StreamImageAttachment extends StreamAttachmentWidget { ); } + Widget _imageErrorBuilder(BuildContext _, Object __, StackTrace? ___) => + Image.asset( + 'images/placeholder.png', + package: 'stream_chat_flutter', + ); + Widget _buildImageAttachment(BuildContext context, Widget imageWidget) { return Container( constraints: constraints, diff --git a/packages/stream_chat_flutter_core/CHANGELOG.md b/packages/stream_chat_flutter_core/CHANGELOG.md index f5a993c5..7b511f69 100644 --- a/packages/stream_chat_flutter_core/CHANGELOG.md +++ b/packages/stream_chat_flutter_core/CHANGELOG.md @@ -1,3 +1,8 @@ +## Upcomming + +🐞 Fixed +- [[#1379]](https://github.com/GetStream/stream-chat-flutter/issues/1379) Fixed "Issues with photo attachments on web", where the cached image attachment would not render while uploading. +- ## 5.1.0 - Deprecated the `sort` parameter in the `StreamChannelListController` in favor of `channelStateSort`. From 41f20f7895d4f552236be1b04eacf6d8de122876 Mon Sep 17 00:00:00 2001 From: Gordon Hayes Date: Thu, 17 Nov 2022 17:24:01 +0100 Subject: [PATCH 2/9] docs: update changelog --- packages/stream_chat_flutter/CHANGELOG.md | 5 +++++ packages/stream_chat_flutter_core/CHANGELOG.md | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/stream_chat_flutter/CHANGELOG.md b/packages/stream_chat_flutter/CHANGELOG.md index 61782c02..7336fac8 100644 --- a/packages/stream_chat_flutter/CHANGELOG.md +++ b/packages/stream_chat_flutter/CHANGELOG.md @@ -1,3 +1,8 @@ +## Upcomming + +🐞 Fixed +- [[#1379]](https://github.com/GetStream/stream-chat-flutter/issues/1379) Fixed "Issues with photo attachments on web", where the cached image attachment would not render while uploading. + ## 5.1.0 🐞 Fixed diff --git a/packages/stream_chat_flutter_core/CHANGELOG.md b/packages/stream_chat_flutter_core/CHANGELOG.md index 7b511f69..f5a993c5 100644 --- a/packages/stream_chat_flutter_core/CHANGELOG.md +++ b/packages/stream_chat_flutter_core/CHANGELOG.md @@ -1,8 +1,3 @@ -## Upcomming - -🐞 Fixed -- [[#1379]](https://github.com/GetStream/stream-chat-flutter/issues/1379) Fixed "Issues with photo attachments on web", where the cached image attachment would not render while uploading. -- ## 5.1.0 - Deprecated the `sort` parameter in the `StreamChannelListController` in favor of `channelStateSort`. From 74c61105a1de5eb0bd046b5609441aa5898d33f7 Mon Sep 17 00:00:00 2001 From: Gordon Hayes Date: Thu, 17 Nov 2022 17:39:20 +0100 Subject: [PATCH 3/9] chore(ui): upgrade lottie to v2 --- packages/stream_chat_flutter/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/stream_chat_flutter/pubspec.yaml b/packages/stream_chat_flutter/pubspec.yaml index 65bb686a..b0456a85 100644 --- a/packages/stream_chat_flutter/pubspec.yaml +++ b/packages/stream_chat_flutter/pubspec.yaml @@ -31,7 +31,7 @@ dependencies: image_gallery_saver: ^1.7.0 image_picker: ^0.8.2 jiffy: ^5.0.0 - lottie: ^1.0.1 + lottie: ^2.0.0 meta: ^1.3.0 path_provider: ^2.0.9 photo_manager: ^2.0.1 From c6ef158377d3b574f8512c067c66ef3fd33ea014 Mon Sep 17 00:00:00 2001 From: Gordon Hayes Date: Thu, 17 Nov 2022 17:45:09 +0100 Subject: [PATCH 4/9] chore: update changelog --- packages/stream_chat_flutter/CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/stream_chat_flutter/CHANGELOG.md b/packages/stream_chat_flutter/CHANGELOG.md index 61782c02..883e25af 100644 --- a/packages/stream_chat_flutter/CHANGELOG.md +++ b/packages/stream_chat_flutter/CHANGELOG.md @@ -1,3 +1,9 @@ +## Upcomming + +🔄 Changed + +- Updated `lottie` dependency to `^2.0.0` + ## 5.1.0 🐞 Fixed From a0016cae9173567bd00baaa7987d2a043e930940 Mon Sep 17 00:00:00 2001 From: Gordon Hayes Date: Wed, 23 Nov 2022 15:36:15 +0100 Subject: [PATCH 5/9] chore: update desktop_drop dependency --- packages/stream_chat_flutter/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/stream_chat_flutter/pubspec.yaml b/packages/stream_chat_flutter/pubspec.yaml index 65bb686a..633478f3 100644 --- a/packages/stream_chat_flutter/pubspec.yaml +++ b/packages/stream_chat_flutter/pubspec.yaml @@ -15,7 +15,7 @@ dependencies: collection: ^1.15.0 contextmenu: ^3.0.0 dart_vlc: ^0.3.0 - desktop_drop: ^0.3.3 + desktop_drop: ^0.4.0 diacritic: ^0.1.3 dio: ^4.0.6 ezanimation: ^0.6.0 From ffbdbded7dca1348db50e2b357ecf0ecaa3bd948 Mon Sep 17 00:00:00 2001 From: Gordon Hayes Date: Wed, 23 Nov 2022 15:53:23 +0100 Subject: [PATCH 6/9] chore: update changelog --- packages/stream_chat_flutter/CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/stream_chat_flutter/CHANGELOG.md b/packages/stream_chat_flutter/CHANGELOG.md index 74b0bf10..aee2f296 100644 --- a/packages/stream_chat_flutter/CHANGELOG.md +++ b/packages/stream_chat_flutter/CHANGELOG.md @@ -2,6 +2,11 @@ 🐞 Fixed - Fix render overflow issue with `MessageSearchListTileTitle`. It now uses `Text.rich` instead of `Row`. Better default behaviour and allows `TextOverflow`. + +🔄 Changed + +- Updated `desktop_drop` dependency to `^0.4.0` + ## 5.1.0 🐞 Fixed From 5a471f9356fb68c98f86062ebf4a0edde49352fd Mon Sep 17 00:00:00 2001 From: Gordon Hayes Date: Wed, 23 Nov 2022 17:05:31 +0100 Subject: [PATCH 7/9] chore: update connectivity plus dependency --- packages/stream_chat_flutter/CHANGELOG.md | 5 +++++ packages/stream_chat_flutter_core/CHANGELOG.md | 6 ++++++ packages/stream_chat_flutter_core/pubspec.yaml | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/packages/stream_chat_flutter/CHANGELOG.md b/packages/stream_chat_flutter/CHANGELOG.md index 74b0bf10..1cca9c8b 100644 --- a/packages/stream_chat_flutter/CHANGELOG.md +++ b/packages/stream_chat_flutter/CHANGELOG.md @@ -2,6 +2,11 @@ 🐞 Fixed - Fix render overflow issue with `MessageSearchListTileTitle`. It now uses `Text.rich` instead of `Row`. Better default behaviour and allows `TextOverflow`. + +🔄 Changed + +- Updated `connectivity_plus` dependency to `^3.0.2` + ## 5.1.0 🐞 Fixed diff --git a/packages/stream_chat_flutter_core/CHANGELOG.md b/packages/stream_chat_flutter_core/CHANGELOG.md index f5a993c5..2103798e 100644 --- a/packages/stream_chat_flutter_core/CHANGELOG.md +++ b/packages/stream_chat_flutter_core/CHANGELOG.md @@ -1,3 +1,9 @@ +## Upcomming + +🔄 Changed + +- Updated `connectivity_plus` dependency to `^3.0.2` + ## 5.1.0 - Deprecated the `sort` parameter in the `StreamChannelListController` in favor of `channelStateSort`. diff --git a/packages/stream_chat_flutter_core/pubspec.yaml b/packages/stream_chat_flutter_core/pubspec.yaml index afed786f..c3b4cffc 100644 --- a/packages/stream_chat_flutter_core/pubspec.yaml +++ b/packages/stream_chat_flutter_core/pubspec.yaml @@ -11,7 +11,7 @@ environment: dependencies: collection: ^1.15.0 - connectivity_plus: ^2.1.0 + connectivity_plus: ^3.0.2 flutter: sdk: flutter freezed_annotation: ^2.0.3 From 16615705b184cafc68b139c9cdb540405cdfdf39 Mon Sep 17 00:00:00 2001 From: Gordon Hayes Date: Fri, 25 Nov 2022 17:58:03 +0100 Subject: [PATCH 8/9] fix: on reply callback not used --- packages/stream_chat_flutter/CHANGELOG.md | 2 ++ packages/stream_chat_flutter/example/lib/main.dart | 1 + .../attachment_actions_modal.dart | 8 +++++--- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/packages/stream_chat_flutter/CHANGELOG.md b/packages/stream_chat_flutter/CHANGELOG.md index 74b0bf10..2b5605b6 100644 --- a/packages/stream_chat_flutter/CHANGELOG.md +++ b/packages/stream_chat_flutter/CHANGELOG.md @@ -2,6 +2,8 @@ 🐞 Fixed - Fix render overflow issue with `MessageSearchListTileTitle`. It now uses `Text.rich` instead of `Row`. Better default behaviour and allows `TextOverflow`. +- Fix [[#1347]](https://github.com/GetStream/stream-chat-flutter/issues/1347) `onReply` not working in `AttachmentActionsModal` which is used by `StreamImageAttachment` and `StreamImageGroup`. + ## 5.1.0 🐞 Fixed diff --git a/packages/stream_chat_flutter/example/lib/main.dart b/packages/stream_chat_flutter/example/lib/main.dart index 67420d06..c8978a45 100644 --- a/packages/stream_chat_flutter/example/lib/main.dart +++ b/packages/stream_chat_flutter/example/lib/main.dart @@ -300,6 +300,7 @@ class _ChannelPageState extends State { @override void dispose() { focusNode.dispose(); + messageInputController.dispose(); super.dispose(); } } diff --git a/packages/stream_chat_flutter/lib/src/attachment_actions_modal/attachment_actions_modal.dart b/packages/stream_chat_flutter/lib/src/attachment_actions_modal/attachment_actions_modal.dart index 510d2fe4..47a62a32 100644 --- a/packages/stream_chat_flutter/lib/src/attachment_actions_modal/attachment_actions_modal.dart +++ b/packages/stream_chat_flutter/lib/src/attachment_actions_modal/attachment_actions_modal.dart @@ -33,10 +33,10 @@ class AttachmentActionsModal extends StatelessWidget { /// Callback to download [attachment]. final AttachmentDownloader? attachmentDownloader; - /// Show reply option + /// Show "reply" option final bool showReply; - /// Show show in chat option + /// Show "show in chat" option final bool showShowInChat; /// Show save option @@ -55,6 +55,7 @@ class AttachmentActionsModal extends StatelessWidget { Attachment? attachment, Message? message, VoidCallback? onShowMessage, + VoidCallback? onReply, AttachmentDownloader? attachmentDownloader, bool? showReply, bool? showShowInChat, @@ -67,6 +68,7 @@ class AttachmentActionsModal extends StatelessWidget { attachment: attachment ?? this.attachment, message: message ?? this.message, onShowMessage: onShowMessage ?? this.onShowMessage, + onReply: onReply ?? this.onReply, attachmentDownloader: attachmentDownloader ?? this.attachmentDownloader, showReply: showReply ?? this.showReply, showShowInChat: showShowInChat ?? this.showShowInChat, @@ -112,7 +114,7 @@ class AttachmentActionsModal extends StatelessWidget { size: 24, color: theme.colorTheme.textLowEmphasis, ), - () => Navigator.of(context).pop(ReturnActionType.reply), + onReply, ), if (showShowInChat) _buildButton( From 5a53106797d5a421566aed7c4439e825eb8a24a4 Mon Sep 17 00:00:00 2001 From: Gordon Hayes Date: Fri, 25 Nov 2022 18:07:58 +0100 Subject: [PATCH 9/9] chore: add deprecation warning --- .../lib/src/fullscreen_media/fsm_enums.dart | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/stream_chat_flutter/lib/src/fullscreen_media/fsm_enums.dart b/packages/stream_chat_flutter/lib/src/fullscreen_media/fsm_enums.dart index 5d2a1412..854682e1 100644 --- a/packages/stream_chat_flutter/lib/src/fullscreen_media/fsm_enums.dart +++ b/packages/stream_chat_flutter/lib/src/fullscreen_media/fsm_enums.dart @@ -1,4 +1,8 @@ +// TODO: remove in v6 as this is no longer used. Currently exported. + /// Return action for coming back from pages +@Deprecated(''' + ReturnActionType has been deprecated and is no longer used.''') enum ReturnActionType { /// No return action none,