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

fix: tests

Browse Source 
Signed-off-by: xsahil03x <[email protected]>
This commit is contained in:
Sahil Kumar
2021-07-16 13:35:51 +05:30
committed by xsahil03x
parent c2563c9d5f
commit d2402ba3d0
5 changed files with 94 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/stream_chat_flutter/lib/src/channel_image.dart
+10 -8
View File
@@ -166,15 +166,17 @@ class ChannelImage extends StatelessWidget {
// 1-1 Conversation
if (otherMembers.length == 1) {
final member = otherMembers.first;
final user = member.user!;
return BetterStreamBuilder<User>(
stream: streamChat.client.state.usersStream
.map((users) => users[member.userId ?? user.id] ?? user)
.distinct(),
initialData: user,
builder: (context, user) => UserAvatar(
return BetterStreamBuilder<Member>(
stream: channel.state!.membersStream.map(
(members) => members.firstWhere(
(it) => it.userId == member.userId,
orElse: () => member,
),
),
initialData: member,
builder: (context, member) => UserAvatar(
borderRadius: borderRadius ?? previewTheme?.borderRadius,
user: user,
user: member.user!,
constraints: constraints ?? previewTheme?.constraints,
onTap: onTap != null ? (_) => onTap!() : null,
selected: selected,
packages/stream_chat_flutter/lib/src/group_image.dart
+51 -43
View File
@@ -38,7 +38,6 @@ class GroupImage extends StatelessWidget {
@override
Widget build(BuildContext context) {
final streamChat = StreamChat.of(context);
final channel = StreamChannel.of(context).channel;
assert(channel.state != null, 'Channel ${channel.id} is not initialized');
@@ -63,30 +62,34 @@ class GroupImage extends StatelessWidget {
child: Flex(
direction: Axis.horizontal,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: members.take(2).map((member) {
final user = member.user!;
return Flexible(
fit: FlexFit.tight,
child: FittedBox(
fit: BoxFit.cover,
clipBehavior: Clip.antiAlias,
child: Transform.scale(
scale: 1.2,
child: BetterStreamBuilder<User>(
stream: streamChat.client.state.usersStream
.map((users) =>
users[member.userId ?? user.id] ?? user)
.distinct(),
initialData: user,
builder: (context, user) => UserAvatar(
user: user,
borderRadius: BorderRadius.zero,
children: members
.take(2)
.map(
(member) => Flexible(
fit: FlexFit.tight,
child: FittedBox(
fit: BoxFit.cover,
clipBehavior: Clip.antiAlias,
child: Transform.scale(
scale: 1.2,
child: BetterStreamBuilder<Member>(
stream: channel.state!.membersStream.map(
(members) => members.firstWhere(
(it) => it.userId == member.userId,
orElse: () => member,
),
),
initialData: member,
builder: (context, member) => UserAvatar(
user: member.user!,
borderRadius: BorderRadius.zero,
),
),
),
),
),
),
);
}).toList(),
)
.toList(),
),
),
if (members.length > 2)
@@ -95,30 +98,35 @@ class GroupImage extends StatelessWidget {
child: Flex(
direction: Axis.horizontal,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: members.skip(2).take(2).map((member) {
final user = member.user!;
return Flexible(
fit: FlexFit.tight,
child: FittedBox(
fit: BoxFit.cover,
clipBehavior: Clip.antiAlias,
child: Transform.scale(
scale: 1.2,
child: BetterStreamBuilder<User>(
stream: streamChat.client.state.usersStream
.map((users) =>
users[member.userId ?? user.id] ?? user)
.distinct(),
initialData: user,
builder: (context, user) => UserAvatar(
user: user,
borderRadius: BorderRadius.zero,
children: members
.skip(2)
.take(2)
.map(
(member) => Flexible(
fit: FlexFit.tight,
child: FittedBox(
fit: BoxFit.cover,
clipBehavior: Clip.antiAlias,
child: Transform.scale(
scale: 1.2,
child: BetterStreamBuilder<Member>(
stream: channel.state!.membersStream.map(
(members) => members.firstWhere(
(it) => it.userId == member.userId,
orElse: () => member,
),
),
initialData: member,
builder: (context, member) => UserAvatar(
user: member.user!,
borderRadius: BorderRadius.zero,
),
),
),
),
),
),
);
}).toList(),
)
.toList(),
),
),
],