From 74cdeded741107b518338882cae9e1e926b22904 Mon Sep 17 00:00:00 2001 From: Deven Joshi Date: Wed, 28 Jul 2021 12:43:30 +0530 Subject: [PATCH 1/5] added filters to MessageListView --- packages/stream_chat_v1/lib/channel_page.dart | 9 +++++++++ packages/stream_chat_v1/lib/group_info_screen.dart | 11 +++++------ packages/stream_chat_v1/lib/thread_page.dart | 9 +++++++++ 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/packages/stream_chat_v1/lib/channel_page.dart b/packages/stream_chat_v1/lib/channel_page.dart index 571a54d..51a2c56 100644 --- a/packages/stream_chat_v1/lib/channel_page.dart +++ b/packages/stream_chat_v1/lib/channel_page.dart @@ -113,6 +113,7 @@ class _ChannelPageState extends State { initialAlignment: widget.initialAlignment, highlightInitialMessage: widget.highlightInitialMessage, onMessageSwiped: _reply, + messageFilter: defaultFilter, messageBuilder: (context, details, messages, defaultMessage) { return defaultMessage.copyWith( onReplyTap: _reply, @@ -185,4 +186,12 @@ class _ChannelPageState extends State { ), ); } + + bool defaultFilter(Message m) { + var _currentUser = StreamChat.of(context).currentUser; + final isMyMessage = m.user?.id == _currentUser?.id; + final isDeletedOrShadowed = m.isDeleted == true || m.shadowed == true; + if (isDeletedOrShadowed && !isMyMessage) return false; + return true; + } } diff --git a/packages/stream_chat_v1/lib/group_info_screen.dart b/packages/stream_chat_v1/lib/group_info_screen.dart index 4193213..c3ea087 100644 --- a/packages/stream_chat_v1/lib/group_info_screen.dart +++ b/packages/stream_chat_v1/lib/group_info_screen.dart @@ -268,9 +268,7 @@ class _GroupInfoScreenState extends State { ), Container( height: 1.0, - color: StreamChatTheme.of(context) - .colorTheme - .disabled, + color: StreamChatTheme.of(context).colorTheme.disabled, ), ], ), @@ -992,7 +990,8 @@ class _GroupInfoScreenState extends State { context, StreamSvgIcon.userRemove( color: StreamChatTheme.of(context) - .colorTheme.accentError, + .colorTheme + .accentError, size: 24.0, ), 'Remove From Group', () async { @@ -1010,8 +1009,8 @@ class _GroupInfoScreenState extends State { } Navigator.pop(context); }, - color: StreamChatTheme.of(context) - .colorTheme.accentError), + color: + StreamChatTheme.of(context).colorTheme.accentError), _buildModalListTile( context, StreamSvgIcon.closeSmall( diff --git a/packages/stream_chat_v1/lib/thread_page.dart b/packages/stream_chat_v1/lib/thread_page.dart index 5d032f8..5e9b227 100644 --- a/packages/stream_chat_v1/lib/thread_page.dart +++ b/packages/stream_chat_v1/lib/thread_page.dart @@ -49,6 +49,7 @@ class _ThreadPageState extends State { initialScrollIndex: widget.initialScrollIndex, initialAlignment: widget.initialAlignment, onMessageSwiped: _reply, + messageFilter: defaultFilter, messageBuilder: (context, details, messages, defaultMessage) { return defaultMessage.copyWith( onReplyTap: _reply, @@ -71,4 +72,12 @@ class _ThreadPageState extends State { ), ); } + + bool defaultFilter(Message m) { + var _currentUser = StreamChat.of(context).currentUser; + final isMyMessage = m.user?.id == _currentUser?.id; + final isDeletedOrShadowed = m.isDeleted == true || m.shadowed == true; + if (isDeletedOrShadowed && !isMyMessage) return false; + return true; + } } From 8e5b4dd13d5704048316baca931469eec077296c Mon Sep 17 00:00:00 2001 From: Deven Joshi Date: Wed, 28 Jul 2021 13:00:53 +0530 Subject: [PATCH 2/5] fixed deps --- packages/stream_chat_v1/pubspec.yaml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/stream_chat_v1/pubspec.yaml b/packages/stream_chat_v1/pubspec.yaml index dd69063..f1aa4a2 100644 --- a/packages/stream_chat_v1/pubspec.yaml +++ b/packages/stream_chat_v1/pubspec.yaml @@ -10,8 +10,16 @@ dependencies: flutter_app_badger: ^1.2.0 flutter: sdk: flutter - stream_chat_flutter: ^2.0.0 - stream_chat_persistence: ^2.0.0 + stream_chat_flutter: + git: + url: https://github.com/GetStream/stream-chat-flutter.git + ref: develop + path: packages/stream_chat_flutter + stream_chat_persistence: + git: + url: https://github.com/GetStream/stream-chat-flutter.git + ref: develop + path: packages/stream_chat_persistence flutter_local_notifications: ^5.0.0+4 flutter_svg: ^0.22.0 flutter_secure_storage: ^4.2.0 From e0ce1d5fbe7d1587b4acd1485a1c67eb0331f563 Mon Sep 17 00:00:00 2001 From: Deven Joshi Date: Wed, 28 Jul 2021 13:03:21 +0530 Subject: [PATCH 3/5] fixed deps --- packages/stream_chat_v1/pubspec.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/packages/stream_chat_v1/pubspec.yaml b/packages/stream_chat_v1/pubspec.yaml index f1aa4a2..cc9a05e 100644 --- a/packages/stream_chat_v1/pubspec.yaml +++ b/packages/stream_chat_v1/pubspec.yaml @@ -32,6 +32,19 @@ dependencies: dev_dependencies: flutter_launcher_icons: ^0.9.0 test: any + +dependency_overrides: + stream_chat: + git: + url: https://github.com/GetStream/stream-chat-flutter.git + ref: develop + path: packages/stream_chat + stream_chat_flutter_core: + git: + url: https://github.com/GetStream/stream-chat-flutter.git + ref: develop + path: packages/stream_chat_flutter_core + flutter: assets: - assets/ From 2f3e42f18fb8ba12152503fb07d0677429b971f5 Mon Sep 17 00:00:00 2001 From: Deven Joshi Date: Wed, 28 Jul 2021 13:13:11 +0530 Subject: [PATCH 4/5] added visible footnote --- packages/stream_chat_v1/lib/channel_page.dart | 3 +++ packages/stream_chat_v1/lib/thread_page.dart | 3 +++ 2 files changed, 6 insertions(+) diff --git a/packages/stream_chat_v1/lib/channel_page.dart b/packages/stream_chat_v1/lib/channel_page.dart index 51a2c56..557e6c9 100644 --- a/packages/stream_chat_v1/lib/channel_page.dart +++ b/packages/stream_chat_v1/lib/channel_page.dart @@ -136,6 +136,9 @@ class _ChannelPageState extends State { ), ); }, + deletedBottomRowBuilder: (context, message) { + return VisibleFootnote(); + }, ); }, threadBuilder: (_, parentMessage) { diff --git a/packages/stream_chat_v1/lib/thread_page.dart b/packages/stream_chat_v1/lib/thread_page.dart index 5e9b227..6292a1e 100644 --- a/packages/stream_chat_v1/lib/thread_page.dart +++ b/packages/stream_chat_v1/lib/thread_page.dart @@ -53,6 +53,9 @@ class _ThreadPageState extends State { messageBuilder: (context, details, messages, defaultMessage) { return defaultMessage.copyWith( onReplyTap: _reply, + deletedBottomRowBuilder: (context, message) { + return VisibleFootnote(); + }, ); }, pinPermissions: ['owner', 'admin', 'member'], From 3676468be37ee4618f75e6a97c9d651c36cf91c4 Mon Sep 17 00:00:00 2001 From: Deven Joshi Date: Wed, 28 Jul 2021 13:14:10 +0530 Subject: [PATCH 5/5] added const --- packages/stream_chat_v1/lib/channel_page.dart | 2 +- packages/stream_chat_v1/lib/thread_page.dart | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/stream_chat_v1/lib/channel_page.dart b/packages/stream_chat_v1/lib/channel_page.dart index 557e6c9..cb72680 100644 --- a/packages/stream_chat_v1/lib/channel_page.dart +++ b/packages/stream_chat_v1/lib/channel_page.dart @@ -137,7 +137,7 @@ class _ChannelPageState extends State { ); }, deletedBottomRowBuilder: (context, message) { - return VisibleFootnote(); + return const VisibleFootnote(); }, ); }, diff --git a/packages/stream_chat_v1/lib/thread_page.dart b/packages/stream_chat_v1/lib/thread_page.dart index 6292a1e..5e9d4fc 100644 --- a/packages/stream_chat_v1/lib/thread_page.dart +++ b/packages/stream_chat_v1/lib/thread_page.dart @@ -54,7 +54,7 @@ class _ThreadPageState extends State { return defaultMessage.copyWith( onReplyTap: _reply, deletedBottomRowBuilder: (context, message) { - return VisibleFootnote(); + return const VisibleFootnote(); }, ); },