Code cleanup for finding other member of direct conversation

This commit is contained in:
vishtree
2020-04-19 22:25:55 +02:00
parent d81d2f63cd
commit 3ff6a19229
2 changed files with 9 additions and 5 deletions
+5 -3
View File
@@ -64,11 +64,13 @@ class ChannelImage extends StatelessWidget {
initialData: channel.extraData, initialData: channel.extraData,
builder: (context, snapshot) { builder: (context, snapshot) {
var image = ''; var image = '';
if (snapshot.data?.containsKey('image') ?? false) { if (snapshot.data?.containsKey('image') == true) {
image = snapshot.data['image']; image = snapshot.data['image'];
} else if (channel.state.members.length == 2) { } else if (channel.state.members.length == 2) {
final otherMemberIndex = channel.state.members[0].user.id == client.user.id ? 1 : 0; final otherMember = channel.state.members.firstWhere(
image = channel.state.members[otherMemberIndex].user.image; (member) => member.user.id != client.user.id
);
image = otherMember.user.image;
} }
return ClipRRect( return ClipRRect(
+4 -2
View File
@@ -30,8 +30,10 @@ class ChannelName extends StatelessWidget {
builder: (context, snapshot) { builder: (context, snapshot) {
var title; var title;
if (snapshot.data['name'] == null && channel.state.members.length == 2) { if (snapshot.data['name'] == null && channel.state.members.length == 2) {
final otherMemberIndex = channel.state.members[0].user.id == client.user.id ? 1 : 0; final otherMember = channel.state.members.firstWhere(
title = channel.state.members[otherMemberIndex].user.name; (member) => member.user.id != client.user.id
);
title = otherMember.user.name;
} else { } else {
title = snapshot.data['name'] ?? channel.id; title = snapshot.data['name'] ?? channel.id;
} }