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

Merge branch 'feature/new-ui' into qa4-fixes

Browse Source
This commit is contained in:
Salvatore Giordano
2021-01-13 16:18:49 +01:00
parent 60c3118cd8 a1b6fa75c9
commit 87d9fd06fa
2 changed files with 178 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/src/image_footer.dart
+26 -2
View File
@@ -218,12 +218,14 @@ class _ImageFooterState extends State<ImageFooter> {
shrinkWrap: true,
physics: NeverScrollableScrollPhysics(),
itemBuilder: (context, position) {
Widget media;
if (widget.mediaAttachments[position].type == 'video') {
var controllerPackage = widget.videoPackages[
videoAttachments
.indexOf(widget.mediaAttachments[position])];
return InkWell(
media = InkWell(
onTap: () {
widget.mediaSelectedCallBack(position);
},
@@ -235,7 +237,7 @@ class _ImageFooterState extends State<ImageFooter> {
),
);
} else {
return InkWell(
media = InkWell(
onTap: () {
widget.mediaSelectedCallBack(position);
},
@@ -254,6 +256,28 @@ class _ImageFooterState extends State<ImageFooter> {
),
);
}
return Stack(
children: [
media,
Padding(
padding: EdgeInsets.all(8.0),
child: Align(
alignment: Alignment.topLeft,
child: UserAvatar(
user: widget.message.user,
constraints: BoxConstraints.tight(
Size(
24,
24,
),
),
showOnlineStatus: false,
),
),
),
],
);
},
itemCount: widget.mediaAttachments.length,
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
lib/src/message_list_view.dart
+7 -12
View File
@@ -332,7 +332,6 @@ class _MessageListViewState extends State<MessageListView> {
tileAnchor: Alignment.topCenter,
childAnchor: Alignment.topCenter,
message: statusString,
child: LazyLoadScrollView(
child: LazyLoadScrollView(
onStartOfPage: () async {
_inBetweenList = false;
@@ -401,18 +400,16 @@ class _MessageListViewState extends State<MessageListView> {
nextMessage.createdAt.toLocal(),
Units.DAY,
)) {
final divider =
widget.dateDividerBuilder != null
final divider = widget.dateDividerBuilder != null
? widget.dateDividerBuilder(
nextMessage.createdAt.toLocal(),
)
: DateDivider(
dateTime:
nextMessage.createdAt.toLocal(),
dateTime: nextMessage.createdAt.toLocal(),
);
return Padding(
padding: const EdgeInsets.symmetric(
vertical: 12.0),
padding:
const EdgeInsets.symmetric(vertical: 12.0),
child: divider,
);
}
@@ -442,8 +439,7 @@ class _MessageListViewState extends State<MessageListView> {
widget.parentMessage,
);
} else {
return buildParentMessage(
widget.parentMessage);
return buildParentMessage(widget.parentMessage);
}
}
if (i == messages.length + 1) {
@@ -479,8 +475,8 @@ class _MessageListViewState extends State<MessageListView> {
} else {
if (widget.messageBuilder != null) {
messageWidget = Builder(
key: ValueKey<String>(
'MESSAGE-${message.id}'),
key:
ValueKey<String>('MESSAGE-${message.id}'),
builder: (context) => widget.messageBuilder(
context,
MessageDetails(
@@ -500,7 +496,6 @@ class _MessageListViewState extends State<MessageListView> {
},
),
),
),
);
}),
if (widget.showScrollToBottom) _buildScrollToBottom(),