Merge branch 'feature/new-ui' into feature/group-info-screen

This commit is contained in:
Deven Joshi
2021-01-01 13:53:41 +05:30
committed by GitHub
17 changed files with 486 additions and 438 deletions
+17 -8
View File
@@ -107,11 +107,14 @@ class ChannelPreview extends StatelessWidget {
.lastMessageAt
.fontSize,
isMessageRead: channel.state.read
.where((element) => element.lastRead
?.where((element) =>
element.user.id !=
channel.client.state.user.id)
?.where((element) => element.lastRead
.isAfter(channel
.state.lastMessage.createdAt))
.length ==
((channel.memberCount ?? 0) - 1),
?.isNotEmpty ==
true,
),
);
}
@@ -139,12 +142,18 @@ class ChannelPreview extends StatelessWidget {
String stringDate;
final now = DateTime.now();
if (now.year != lastMessageAt.year ||
now.month != lastMessageAt.month ||
now.day != lastMessageAt.day) {
stringDate = Jiffy(lastMessageAt.toLocal()).format('dd/MM/yyyy');
} else {
var startOfDay = DateTime(now.year, now.month, now.day);
if (lastMessageAt.millisecondsSinceEpoch >=
startOfDay.millisecondsSinceEpoch) {
stringDate = Jiffy(lastMessageAt.toLocal()).format('HH:mm');
} else if (lastMessageAt.millisecondsSinceEpoch >=
startOfDay.subtract(Duration(days: 1)).millisecondsSinceEpoch) {
stringDate = 'Yesterday';
} else if (startOfDay.difference(lastMessageAt).inDays < 7) {
stringDate = Jiffy(lastMessageAt.toLocal()).EEEE;
} else {
stringDate = Jiffy(lastMessageAt.toLocal()).format('dd/MM/yyyy');
}
return Text(