From d2a0fd603dd5339fd1049a7be942007f594ee1e5 Mon Sep 17 00:00:00 2001 From: Gordon Hayes Date: Mon, 21 Feb 2022 11:00:54 +0100 Subject: [PATCH 1/7] fix: controllers not disposed --- packages/stream_chat_flutter/lib/src/full_screen_media.dart | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/stream_chat_flutter/lib/src/full_screen_media.dart b/packages/stream_chat_flutter/lib/src/full_screen_media.dart index 83ae96b1..de4ee001 100644 --- a/packages/stream_chat_flutter/lib/src/full_screen_media.dart +++ b/packages/stream_chat_flutter/lib/src/full_screen_media.dart @@ -264,9 +264,11 @@ class _FullScreenMediaState extends State ); @override - void dispose() async { + void dispose() { + _controller.dispose(); + _pageController.dispose(); for (final package in videoPackages.values) { - await package.dispose(); + package.dispose(); } super.dispose(); } From ae44406b96ec39a9cc275c8d51ddf841bf7df9eb Mon Sep 17 00:00:00 2001 From: Sahil Kumar Date: Mon, 21 Feb 2022 15:31:23 +0530 Subject: [PATCH 2/7] fix(llc): Fix `channelState.copyWith` with respect to pinnedMessages. Signed-off-by: xsahil03x --- packages/stream_chat/CHANGELOG.md | 1 + .../stream_chat/lib/src/core/models/channel_state.dart | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/stream_chat/CHANGELOG.md b/packages/stream_chat/CHANGELOG.md index 82225b27..ef66f835 100644 --- a/packages/stream_chat/CHANGELOG.md +++ b/packages/stream_chat/CHANGELOG.md @@ -10,6 +10,7 @@ - [[#890]](https://github.com/GetStream/stream-chat-flutter/pull/890) Fixed Reactions not updating on thread messages. Thanks [bstolinski](https://github.com/bstolinski). - [[#897]](https://github.com/GetStream/stream-chat-flutter/issues/897) Fixed error type mis-match in `AuthInterceptor`. +- Fix `channelState.copyWith` with respect to pinnedMessages. ## 3.4.0 diff --git a/packages/stream_chat/lib/src/core/models/channel_state.dart b/packages/stream_chat/lib/src/core/models/channel_state.dart index 3ddc2b68..8b500d18 100644 --- a/packages/stream_chat/lib/src/core/models/channel_state.dart +++ b/packages/stream_chat/lib/src/core/models/channel_state.dart @@ -67,9 +67,10 @@ class ChannelState { members: members ?? this.members, // Hack to avoid using the default value in case nothing is provided. // FIXME: Use non-nullable by default instead of empty list. - pinnedMessages: pinnedMessages == _emptyPinnedMessages - ? this.pinnedMessages - : pinnedMessages ?? _emptyPinnedMessages, + pinnedMessages: + pinnedMessages == null || pinnedMessages == _emptyPinnedMessages + ? this.pinnedMessages + : pinnedMessages, watcherCount: watcherCount ?? this.watcherCount, watchers: watchers ?? this.watchers, read: read ?? this.read, From 2cef5396397b828404e5fc8d78b2266b953232d6 Mon Sep 17 00:00:00 2001 From: Gordon Hayes Date: Mon, 21 Feb 2022 12:19:36 +0100 Subject: [PATCH 3/7] perf: improve full screen media animations --- .../lib/src/full_screen_media.dart | 232 +++++++++--------- 1 file changed, 117 insertions(+), 115 deletions(-) diff --git a/packages/stream_chat_flutter/lib/src/full_screen_media.dart b/packages/stream_chat_flutter/lib/src/full_screen_media.dart index de4ee001..aa185597 100644 --- a/packages/stream_chat_flutter/lib/src/full_screen_media.dart +++ b/packages/stream_chat_flutter/lib/src/full_screen_media.dart @@ -65,24 +65,35 @@ class FullScreenMedia extends StatefulWidget { class _FullScreenMediaState extends State with SingleTickerProviderStateMixin { - bool _optionsShown = true; - - late final AnimationController _controller; + late final AnimationController _animationController; late final PageController _pageController; - late int _currentPage; + late final _curvedAnimation = CurvedAnimation( + parent: _animationController, + curve: Curves.easeOut, + reverseCurve: Curves.easeIn, + ); + + final _opacityTween = Tween(begin: 1, end: 0); + late final _opacityAnimation = _opacityTween.animate( + CurvedAnimation( + parent: _animationController, + curve: const Interval(0, 0.6, curve: Curves.easeOut), + ), + ); + + late final ValueNotifier _currentPage = ValueNotifier(widget.startIndex); final videoPackages = {}; @override void initState() { super.initState(); - _controller = AnimationController( + _animationController = AnimationController( vsync: this, duration: const Duration(milliseconds: 300), ); _pageController = PageController(initialPage: widget.startIndex); - _currentPage = widget.startIndex; for (var i = 0; i < widget.mediaAttachments.length; i++) { final attachment = widget.mediaAttachments[i]; if (attachment.type != 'video') continue; @@ -116,41 +127,38 @@ class _FullScreenMediaState extends State resizeToAvoidBottomInset: false, body: Stack( children: [ - AnimatedBuilder( - animation: _controller, - builder: (context, snapshot) => PageView.builder( - controller: _pageController, - onPageChanged: (val) { - setState(() { - _currentPage = val; - }); + PageView.builder( + controller: _pageController, + onPageChanged: (val) { + _currentPage.value = val; - if (videoPackages.isEmpty) { - return; + if (videoPackages.isEmpty) { + return; + } + + final currentAttachment = widget.mediaAttachments[val]; + + for (final e in videoPackages.values) { + if (e._attachment != currentAttachment) { + e._chewieController?.pause(); } + } - 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]; - if (attachment.type == 'image' || - attachment.type == 'giphy') { - final imageUrl = attachment.imageUrl ?? - attachment.assetUrl ?? - attachment.thumbUrl; - return PhotoView( + if (widget.autoplayVideos && + currentAttachment.type == 'video') { + final controller = videoPackages[currentAttachment.id]!; + controller._chewieController?.play(); + } + }, + itemBuilder: (context, index) { + final attachment = widget.mediaAttachments[index]; + if (attachment.type == 'image' || attachment.type == 'giphy') { + final imageUrl = attachment.imageUrl ?? + attachment.assetUrl ?? + attachment.thumbUrl; + return AnimatedBuilder( + animation: _curvedAnimation, + builder: (context, child) => PhotoView( loadingBuilder: (context, image) => const Offstage(), imageProvider: (imageUrl == null && attachment.localUri != null && @@ -166,97 +174,91 @@ class _FullScreenMediaState extends State color: ColorTween( begin: ChannelHeaderTheme.of(context).color, end: Colors.black, - ).lerp(_controller.value), + ).lerp(_curvedAnimation.value), ), onTapUp: (a, b, c) { - setState(() { - _optionsShown = !_optionsShown; - }); - if (_controller.isCompleted) { - _controller.reverse(); + if (_animationController.isCompleted) { + _animationController.reverse(); } else { - _controller.forward(); + _animationController.forward(); } }, - ); - } else if (attachment.type == 'video') { - final controller = videoPackages[attachment.id]!; - if (!controller.initialized) { - return const Center( - child: CircularProgressIndicator(), - ); - } - return InkWell( - onTap: () { - setState(() { - _optionsShown = !_optionsShown; - }); - if (_controller.isCompleted) { - _controller.reverse(); - } else { - _controller.forward(); - } - }, - child: Padding( - padding: const EdgeInsets.symmetric( - vertical: 50, - ), - child: Chewie( - controller: controller.chewieController!, - ), - ), + ), + ); + } else if (attachment.type == 'video') { + final controller = videoPackages[attachment.id]!; + if (!controller.initialized) { + return const Center( + child: CircularProgressIndicator(), ); } - return Container(); - }, - itemCount: widget.mediaAttachments.length, - ), - ), - AnimatedOpacity( - opacity: _optionsShown ? 1.0 : 0.0, - duration: const Duration(milliseconds: 300), - child: Column( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - GalleryHeader( - userName: widget.userName, - sentAt: context.translations.sentAtText( - date: widget.message.createdAt, - time: widget.message.createdAt, + return InkWell( + onTap: () { + if (_animationController.isCompleted) { + _animationController.reverse(); + } else { + _animationController.forward(); + } + }, + child: Padding( + padding: const EdgeInsets.symmetric( + vertical: 50, + ), + child: Chewie( + controller: controller.chewieController!, + ), ), - onBackPressed: () { - Navigator.of(context).pop(); - }, - message: widget.message, - currentIndex: _currentPage, - onShowMessage: () { - widget.onShowMessage?.call( - widget.message, - StreamChannel.of(context).channel, - ); - }, - attachmentActionsModalBuilder: - widget.attachmentActionsModalBuilder, - ), - if (!widget.message.isEphemeral) - GalleryFooter( - currentPage: _currentPage, - totalPages: widget.mediaAttachments.length, - mediaAttachments: widget.mediaAttachments, + ); + } + return const SizedBox(); + }, + itemCount: widget.mediaAttachments.length, + ), + FadeTransition( + opacity: _opacityAnimation, + child: ValueListenableBuilder( + valueListenable: _currentPage, + builder: (context, value, child) => Column( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + GalleryHeader( + userName: widget.userName, + sentAt: context.translations.sentAtText( + date: widget.message.createdAt, + time: widget.message.createdAt, + ), + onBackPressed: () { + Navigator.of(context).pop(); + }, message: widget.message, - mediaSelectedCallBack: (val) { - setState(() { - _currentPage = val; + currentIndex: value, + onShowMessage: () { + widget.onShowMessage?.call( + widget.message, + StreamChannel.of(context).channel, + ); + }, + attachmentActionsModalBuilder: + widget.attachmentActionsModalBuilder, + ), + if (!widget.message.isEphemeral) + GalleryFooter( + currentPage: value, + totalPages: widget.mediaAttachments.length, + mediaAttachments: widget.mediaAttachments, + message: widget.message, + mediaSelectedCallBack: (val) { + _currentPage.value = val; _pageController.animateToPage( val, duration: const Duration(milliseconds: 300), curve: Curves.easeInOut, ); Navigator.pop(context); - }); - }, - ), - ], + }, + ), + ], + ), ), ), ], @@ -265,7 +267,7 @@ class _FullScreenMediaState extends State @override void dispose() { - _controller.dispose(); + _animationController.dispose(); _pageController.dispose(); for (final package in videoPackages.values) { package.dispose(); From a361e89abad9cc5e70980cf86067518a3392ce3f Mon Sep 17 00:00:00 2001 From: Sahil Kumar Date: Wed, 23 Feb 2022 17:55:34 +0530 Subject: [PATCH 4/7] fix(llc): fix `pinnedMessage` inconsistencies. Signed-off-by: xsahil03x --- .../stream_chat/lib/src/client/channel.dart | 38 +++++++++++-------- .../lib/src/core/models/channel_state.dart | 9 ++--- 2 files changed, 27 insertions(+), 20 deletions(-) diff --git a/packages/stream_chat/lib/src/client/channel.dart b/packages/stream_chat/lib/src/client/channel.dart index 76fbab7a..dd6fcff1 100644 --- a/packages/stream_chat/lib/src/client/channel.dart +++ b/packages/stream_chat/lib/src/client/channel.dart @@ -1744,15 +1744,6 @@ class ChannelClientState { ownReactions: oldMessage?.ownReactions, ); addMessage(message); - - if (message.pinned) { - _channelState = _channelState.copyWith( - pinnedMessages: [ - ..._channelState.pinnedMessages, - message, - ], - ); - } })); } @@ -1804,8 +1795,24 @@ class ChannelClientState { newMessages.add(message); } + final newPinnedMessages = [...pinnedMessages]; + final oldPinnedIndex = + newPinnedMessages.indexWhere((m) => m.id == message.id); + + // Handle pinned messages + if (message.pinned) { + if (oldPinnedIndex != -1) { + newPinnedMessages[oldPinnedIndex] = message; + } else { + newPinnedMessages.add(message); + } + } else { + newPinnedMessages.removeWhere((m) => m.id == message.id); + } + _channelState = _channelState.copyWith( messages: newMessages..sort(_sortByCreatedAt), + pinnedMessages: newPinnedMessages, channel: _channelState.channel?.copyWith( lastMessageAt: message.createdAt, ), @@ -1898,11 +1905,12 @@ class ChannelClientState { .distinct(const ListEquality().equals); /// Channel pinned message list. - List get pinnedMessages => _channelState.pinnedMessages.toList(); + List get pinnedMessages => _channelState.pinnedMessages; /// Channel pinned message list as a stream. - Stream> get pinnedMessagesStream => - channelStateStream.map((cs) => cs.pinnedMessages.toList()); + Stream> get pinnedMessagesStream => channelStateStream + .map((cs) => cs.pinnedMessages) + .distinct(const ListEquality().equals); /// Get channel last message. Message? get lastMessage => @@ -2213,7 +2221,7 @@ class ChannelClientState { .toList(); updateChannelState(_channelState.copyWith( - pinnedMessages: pinnedMessages.where(_pinIsValid()).toList(), + pinnedMessages: pinnedMessages.where(_pinIsValid).toList(), messages: expiredMessages, )); } @@ -2250,7 +2258,7 @@ class ChannelClientState { } } -bool Function(Message) _pinIsValid() { +bool _pinIsValid(Message message) { final now = DateTime.now(); - return (Message m) => m.pinExpires!.isAfter(now); + return message.pinExpires!.isAfter(now); } diff --git a/packages/stream_chat/lib/src/core/models/channel_state.dart b/packages/stream_chat/lib/src/core/models/channel_state.dart index 8b500d18..17439dc0 100644 --- a/packages/stream_chat/lib/src/core/models/channel_state.dart +++ b/packages/stream_chat/lib/src/core/models/channel_state.dart @@ -56,7 +56,7 @@ class ChannelState { ChannelModel? channel, List? messages, List? members, - List? pinnedMessages, + List pinnedMessages = _emptyPinnedMessages, int? watcherCount, List? watchers, List? read, @@ -67,10 +67,9 @@ class ChannelState { members: members ?? this.members, // Hack to avoid using the default value in case nothing is provided. // FIXME: Use non-nullable by default instead of empty list. - pinnedMessages: - pinnedMessages == null || pinnedMessages == _emptyPinnedMessages - ? this.pinnedMessages - : pinnedMessages, + pinnedMessages: pinnedMessages == _emptyPinnedMessages + ? this.pinnedMessages + : pinnedMessages, watcherCount: watcherCount ?? this.watcherCount, watchers: watchers ?? this.watchers, read: read ?? this.read, From c7ba48a446902ccfb0debb615add836f056dd90c Mon Sep 17 00:00:00 2001 From: Ayush Shekhar Date: Thu, 24 Feb 2022 15:56:19 +0530 Subject: [PATCH 5/7] Pass null for onImageTap when no function is passed --- packages/stream_chat_flutter/lib/src/channel_list_view.dart | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/stream_chat_flutter/lib/src/channel_list_view.dart b/packages/stream_chat_flutter/lib/src/channel_list_view.dart index 0ceff00e..bc4f4b19 100644 --- a/packages/stream_chat_flutter/lib/src/channel_list_view.dart +++ b/packages/stream_chat_flutter/lib/src/channel_list_view.dart @@ -599,7 +599,9 @@ class _ChannelListViewState extends State { child: ChannelPreview( onLongPress: widget.onChannelLongPress, channel: channel, - onImageTap: () => widget.onImageTap?.call(channel), + onImageTap: widget.onImageTap != null + ? () => widget.onImageTap!(channel) + : null, onTap: (channel) => onTap(channel, widget.channelWidget), ), ), From e7d8810722414fd0726796e1c36e605f42eb44b8 Mon Sep 17 00:00:00 2001 From: Ayush Shekhar Date: Thu, 24 Feb 2022 16:05:00 +0530 Subject: [PATCH 6/7] Added entry in changelog --- packages/stream_chat_flutter/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/stream_chat_flutter/CHANGELOG.md b/packages/stream_chat_flutter/CHANGELOG.md index 4bc77514..d4a64c1a 100644 --- a/packages/stream_chat_flutter/CHANGELOG.md +++ b/packages/stream_chat_flutter/CHANGELOG.md @@ -5,6 +5,7 @@ - [[#888]](https://github.com/GetStream/stream-chat-flutter/issues/888) Fix `unban` command not working in `MessageInput`. - [[#805]](https://github.com/GetStream/stream-chat-flutter/issues/805) Updated chewie dependency version to 1.3.0 - Fix `showScrollToBottom` in `MessageListView` not respecting false value. +- Fix default `Channel` route not opening from `ChannelListView` when `ChannelAvatar` is tapped ## 3.4.0 - Updated `stream_chat_flutter_core` dependency to [`3.4.0`](https://pub.dev/packages/stream_chat_flutter_core/changelog). From 8bfd93266eda2df7b9f93c8491929666b5361fc7 Mon Sep 17 00:00:00 2001 From: Ayush Shekhar Date: Thu, 24 Feb 2022 16:30:51 +0530 Subject: [PATCH 7/7] Fix: variable for channel was named client --- packages/stream_chat_flutter/lib/src/channel_list_view.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/stream_chat_flutter/lib/src/channel_list_view.dart b/packages/stream_chat_flutter/lib/src/channel_list_view.dart index bc4f4b19..648226ce 100644 --- a/packages/stream_chat_flutter/lib/src/channel_list_view.dart +++ b/packages/stream_chat_flutter/lib/src/channel_list_view.dart @@ -614,7 +614,7 @@ class _ChannelListViewState extends State { if (widget.onChannelTap != null) { onTap = widget.onChannelTap!; } else { - onTap = (client, _) { + onTap = (channel, _) { if (widget.channelWidget == null) { return; } @@ -622,7 +622,7 @@ class _ChannelListViewState extends State { context, MaterialPageRoute( builder: (context) => StreamChannel( - channel: client, + channel: channel, child: widget.channelWidget!, ), ),