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

Merge branch 'feature/new-ui' into qa-fix-dj

Browse Source
This commit is contained in:
Salvatore Giordano
2020-10-28 11:43:19 +01:00
committed by GitHub
parent 5087aecff4 d5f23549f4
commit 13a7b62c6d
5 changed files with 181 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
example/ios/Flutter/.last_build_id
+1 -1
View File
@@ -1 +1 @@
0289cdadbd29bab804f275e3c5907d07 89eb023669fee58472de747080d78b5a
example/pubspec.yaml
+1 -1
View File
@@ -1,6 +1,6 @@
name: example name: example
description: A new Flutter project. description: A new Flutter project.
version: 1.0.31+33 version: 1.0.32+34
environment: environment:
sdk: ">=2.2.2 <3.0.0" sdk: ">=2.2.2 <3.0.0"
lib/src/message_actions_modal.dart
+5 -2
View File
@@ -218,13 +218,16 @@ class MessageActionsModal extends StatelessWidget {
StreamIcons.edit, StreamIcons.edit,
size: 22, size: 22,
color: color:
StreamChatTheme.of(context).primaryIconTheme.color, StreamChatTheme.of(context).primaryIconTheme.color,
), ),
onPressed: () {}, onPressed: () {},
), ),
Text( Text(
'Edit message', 'Edit message',
style: Theme.of(context).textTheme.headline6.copyWith(fontWeight: FontWeight.bold), style: Theme.of(context)
.textTheme
.headline6
.copyWith(fontWeight: FontWeight.bold),
), ),
IconButton( IconButton(
icon: Icon( icon: Icon(
lib/src/message_list_view.dart
+173 -127
View File
@@ -6,6 +6,7 @@ import 'package:stream_chat/stream_chat.dart';
import 'package:stream_chat_flutter/src/message_widget.dart'; import 'package:stream_chat_flutter/src/message_widget.dart';
import 'package:stream_chat_flutter/src/system_message.dart'; import 'package:stream_chat_flutter/src/system_message.dart';
import 'package:visibility_detector/visibility_detector.dart'; import 'package:visibility_detector/visibility_detector.dart';
import 'package:widgets_visibility_provider/widgets_visibility_provider.dart';
import '../stream_chat_flutter.dart'; import '../stream_chat_flutter.dart';
import 'date_divider.dart'; import 'date_divider.dart';
@@ -155,144 +156,189 @@ class _MessageListViewState extends State<MessageListView> {
final streamChannel = StreamChannel.of(context); final streamChannel = StreamChannel.of(context);
/// TODO: find a better solution when (https://github.com/flutter/flutter/issues/21023) is fixed /// TODO: find a better solution when (https://github.com/flutter/flutter/issues/21023) is fixed
return Stack( return WidgetsVisibilityProvider(
children: [ condition: (positionData) =>
NotificationListener<ScrollNotification>( positionData.endPosition >= 20 &&
onNotification: (_) { positionData.startPosition <= positionData.viewportSize,
if (_scrollController.offset < 150 && _newMessageList.isNotEmpty) { child: Stack(
setState(() { alignment: Alignment.center,
_messages.insertAll(0, _newMessageList); children: [
_newMessageList.clear(); NotificationListener<ScrollNotification>(
}); onNotification: (_) {
} if (_scrollController.offset < 150 &&
return true; _newMessageList.isNotEmpty) {
}, setState(() {
child: ListView.custom( _messages.insertAll(0, _newMessageList);
key: Key('messageListView'), _newMessageList.clear();
physics: widget.scrollPhysics, });
keyboardDismissBehavior: widget.keyboardDismissBehavior, }
controller: _scrollController, return true;
reverse: true, },
childrenDelegate: SliverChildBuilderDelegate( child: ListView.custom(
(context, i) { key: Key('messageListView'),
if (i == _messages.length + 1) { physics: widget.scrollPhysics,
if (widget.parentMessage != null) { keyboardDismissBehavior: widget.keyboardDismissBehavior,
if (widget.parentMessageBuilder != null) { controller: _scrollController,
return widget.parentMessageBuilder( reverse: true,
context, childrenDelegate: SliverChildBuilderDelegate(
widget.parentMessage, (context, i) {
); if (i == _messages.length + 1) {
} else { if (widget.parentMessage != null) {
return Column( if (widget.parentMessageBuilder != null) {
crossAxisAlignment: CrossAxisAlignment.stretch, return widget.parentMessageBuilder(
children: <Widget>[
buildParentMessage(widget.parentMessage),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 32),
child: Container(
padding: const EdgeInsets.all(8),
child: Text(
'Start of thread',
textAlign: TextAlign.center,
),
color:
Theme.of(context).accentColor.withAlpha(50),
),
),
],
);
}
} else {
return SizedBox();
}
}
if (i == _messages.length) {
return _buildLoadingIndicator(streamChannel);
}
final message = _messages[i];
final nextMessage = i > 0 ? _messages[i - 1] : null;
Widget messageWidget;
if (i == 0) {
messageWidget = _buildBottomMessage(
context,
message,
_messages,
streamChannel,
);
} else if (i == _messages.length - 1) {
messageWidget = _buildTopMessage(
context,
message,
_messages,
streamChannel,
);
} else {
if (widget.messageBuilder != null) {
messageWidget = Builder(
key: ValueKey<String>('MESSAGE-${message.id}'),
builder: (_) => widget.messageBuilder(
context, context,
MessageDetails( widget.parentMessage,
context, );
message, } else {
_messages, return Column(
i, crossAxisAlignment: CrossAxisAlignment.stretch,
), children: <Widget>[
_messages), buildParentMessage(widget.parentMessage),
Padding(
padding:
const EdgeInsets.symmetric(horizontal: 32),
child: Container(
padding: const EdgeInsets.all(8),
child: Text(
'Start of thread',
textAlign: TextAlign.center,
),
color:
Theme.of(context).accentColor.withAlpha(50),
),
),
],
);
}
} else {
return SizedBox();
}
}
if (i == _messages.length) {
return _buildLoadingIndicator(streamChannel);
}
final message = _messages[i];
final nextMessage = i > 0 ? _messages[i - 1] : null;
Widget messageWidget;
if (i == 0) {
messageWidget = _buildBottomMessage(
context,
message,
_messages,
streamChannel,
);
} else if (i == _messages.length - 1) {
messageWidget = _buildTopMessage(
context,
message,
_messages,
streamChannel,
); );
} else { } else {
messageWidget = buildMessage(message, _messages, i); if (widget.messageBuilder != null) {
messageWidget = Builder(
key: ValueKey<String>('MESSAGE-${message.id}'),
builder: (_) => widget.messageBuilder(
context,
MessageDetails(
context,
message,
_messages,
i,
),
_messages),
);
} else {
messageWidget = buildMessage(message, _messages, i);
}
} }
}
if (nextMessage != null && if (nextMessage != null &&
!Jiffy(message.createdAt.toLocal()) !Jiffy(message.createdAt.toLocal())
.isSame(nextMessage.createdAt.toLocal(), Units.DAY)) { .isSame(nextMessage.createdAt.toLocal(), Units.DAY)) {
return Column( return Column(
crossAxisAlignment: CrossAxisAlignment.stretch, crossAxisAlignment: CrossAxisAlignment.stretch,
children: <Widget>[ children: <Widget>[
messageWidget, messageWidget,
Padding( Padding(
padding: const EdgeInsets.symmetric(vertical: 12.0), padding: const EdgeInsets.symmetric(vertical: 12.0),
child: widget.dateDividerBuilder != null child: VisibleNotifierWidget(
? widget.dateDividerBuilder( condition: (
nextMessage.createdAt.toLocal()) ScrollNotification previousNotification,
: DateDivider( PositionData previousPositionData,
dateTime: nextMessage.createdAt.toLocal(), ScrollNotification currentNotification,
), PositionData currentPositionData,
), ) {
], print(
'currentPositionData.endPosition: ${currentPositionData.endPosition}');
return true;
},
data: i,
child: widget.dateDividerBuilder != null
? widget.dateDividerBuilder(
nextMessage.createdAt.toLocal())
: DateDivider(
dateTime: nextMessage.createdAt.toLocal(),
),
),
),
],
);
}
return VisibleNotifierWidget(
child: messageWidget,
data: i,
); );
},
childCount: _messages.length + 2,
findChildIndexCallback: (key) {
final ValueKey<String> valueKey = key;
final index = _messages
.indexWhere((m) => 'MESSAGE-${m.id}' == valueKey.value);
return index != -1 ? index : null;
},
),
),
),
if (widget.showScrollToBottom)
StreamBuilder<Event>(
stream: streamChannel.channel.on(
EventType.messageNew,
),
builder: (context, _) {
if (!_showScrollToBottom ||
streamChannel.channel.state.unreadCount == 0) {
return SizedBox();
}
return _buildScrollToBottom(streamChannel);
}),
Positioned(
top: 20.0,
child: WidgetsVisibilityConsumer(
listener: (
context,
event,
) {},
builder: (context, event) {
if (event.positionDataList == null ||
event.positionDataList.isEmpty) {
return Container();
} }
return messageWidget; return DateDivider(
}, dateTime: _messages[event.positionDataList.last.data]
childCount: _messages.length + 2, .createdAt
findChildIndexCallback: (key) { .toLocal(),
final ValueKey<String> valueKey = key; );
final index = _messages
.indexWhere((m) => 'MESSAGE-${m.id}' == valueKey.value);
return index != -1 ? index : null;
}, },
), ),
), ),
), ],
if (widget.showScrollToBottom) ),
StreamBuilder<Event>(
stream: streamChannel.channel.on(
EventType.messageNew,
),
builder: (context, _) {
if (!_showScrollToBottom ||
streamChannel.channel.state.unreadCount == 0) {
return SizedBox();
}
return _buildScrollToBottom(streamChannel);
}),
],
); );
} }
pubspec.yaml
+1
View File
@@ -30,6 +30,7 @@ dependencies:
flutter_slidable: ^0.5.4 flutter_slidable: ^0.5.4
carousel_slider: ^2.2.1 carousel_slider: ^2.2.1
clipboard: ^0.1.2+8 clipboard: ^0.1.2+8
widgets_visibility_provider: ^2.0.2
flutter: flutter:
fonts: fonts: