talksik/stream-chat-flutter
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/new-ui' of github.com:GetStream/stream-chat-flutter into feat/two-way-pagination

Browse Source 
 Conflicts:
	example/lib/new_chat_screen.dart
	lib/src/message_input.dart
This commit is contained in:
Sahil Kumar
2020-12-16 17:03:29 +05:30
parent 3f300bdfa0 5e7e5aaac0
commit 1fa3e83c1f
22 changed files with 1161 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/src/message_list_view.dart
+4 -4
View File
@@ -227,7 +227,7 @@ class _MessageListViewState extends State<MessageListView> {
? streamChannel.channel.state.threadsStream
.where((threads) => threads.containsKey(widget.parentMessage.id))
.map((threads) => threads[widget.parentMessage.id])
: streamChannel.channel.state.messagesStream;
: streamChannel.channel.state?.messagesStream;
if (!_paginationActive && !_upToDate) {
initialIndex = _initialIndex;
@@ -235,12 +235,12 @@ class _MessageListViewState extends State<MessageListView> {
}
return StreamBuilder<List<Message>>(
stream: messagesStream.map((messages) => messages
.where((e) =>
stream: messagesStream?.map((messages) => messages
?.where((e) =>
!e.isDeleted ||
(e.isDeleted &&
e.user.id == streamChannel.channel.client.state.user.id))
.toList()),
?.toList()),
builder: (context, snapshot) {
if (!snapshot.hasData) {
return Center(