From dea56648514960bc889a31f966f31416ce7b2797 Mon Sep 17 00:00:00 2001 From: rlee1990 Date: Mon, 5 Jun 2023 13:18:29 -0400 Subject: [PATCH 1/5] Update Jiffy & Fixed --- .../lib/src/channel/channel_info.dart | 2 +- .../lib/src/channel/channel_preview.dart | 6 +++--- .../lib/src/localization/translations.dart | 6 +++--- .../message_list_view/message_list_view.dart | 18 +++++++++++------- .../lib/src/message_widget/bottom_row.dart | 2 +- .../lib/src/misc/date_divider.dart | 12 ++++++------ .../stream_channel_list_tile.dart | 6 +++--- .../stream_message_search_list_tile.dart | 4 ++-- .../stream_user_list_tile.dart | 2 +- .../lib/src/stream_chat.dart | 4 ++-- .../lib/src/user/user_item.dart | 2 +- .../lib/svgs/video_call_icon.svg | 3 +++ packages/stream_chat_flutter/pubspec.yaml | 2 +- 13 files changed, 38 insertions(+), 31 deletions(-) create mode 100644 packages/stream_chat_flutter/lib/svgs/video_call_icon.svg diff --git a/packages/stream_chat_flutter/lib/src/channel/channel_info.dart b/packages/stream_chat_flutter/lib/src/channel/channel_info.dart index 5c32d278..b5923600 100644 --- a/packages/stream_chat_flutter/lib/src/channel/channel_info.dart +++ b/packages/stream_chat_flutter/lib/src/channel/channel_info.dart @@ -108,7 +108,7 @@ class _ConnectedTitleState extends StatelessWidget { } else { alternativeWidget = Text( '${context.translations.userLastOnlineText} ' - '${Jiffy(otherMember.user?.lastActive).fromNow()}', + '${Jiffy.parseFromDateTime(otherMember.user!.lastActive!).fromNow()}', style: textStyle, ); } diff --git a/packages/stream_chat_flutter/lib/src/channel/channel_preview.dart b/packages/stream_chat_flutter/lib/src/channel/channel_preview.dart index ae6247ea..f64b9dc9 100644 --- a/packages/stream_chat_flutter/lib/src/channel/channel_preview.dart +++ b/packages/stream_chat_flutter/lib/src/channel/channel_preview.dart @@ -349,16 +349,16 @@ class _Date extends StatelessWidget { if (lastMessageAt.millisecondsSinceEpoch >= startOfDay.millisecondsSinceEpoch) { - stringDate = Jiffy(lastMessageAt.toLocal()).jm; + stringDate = Jiffy.parseFromDateTime(lastMessageAt.toLocal()).jm; } else if (lastMessageAt.millisecondsSinceEpoch >= startOfDay .subtract(const Duration(days: 1)) .millisecondsSinceEpoch) { stringDate = context.translations.yesterdayLabel; } else if (startOfDay.difference(lastMessageAt).inDays < 7) { - stringDate = Jiffy(lastMessageAt.toLocal()).EEEE; + stringDate = Jiffy.parseFromDateTime(lastMessageAt.toLocal()).EEEE; } else { - stringDate = Jiffy(lastMessageAt.toLocal()).yMd; + stringDate = Jiffy.parseFromDateTime(lastMessageAt.toLocal()).yMd; } return Text( diff --git a/packages/stream_chat_flutter/lib/src/localization/translations.dart b/packages/stream_chat_flutter/lib/src/localization/translations.dart index 71254e73..b213cc0a 100644 --- a/packages/stream_chat_flutter/lib/src/localization/translations.dart +++ b/packages/stream_chat_flutter/lib/src/localization/translations.dart @@ -83,7 +83,7 @@ abstract class Translations { /// in the [StreamMessageListView] String unreadMessagesSeparatorText( @Deprecated('unreadCount is not used anymore and will be removed ') - int unreadCount, + int unreadCount, ); /// The label for "connected" in [StreamConnectionStatusBuilder] @@ -611,13 +611,13 @@ class DefaultTranslations implements Translations { } else if (date == yesterday) { return 'yesterday'; } else { - return 'on ${Jiffy(date).MMMd}'; + return 'on ${Jiffy.parseFromDateTime(date).MMMd}'; } } @override String sentAtText({required DateTime date, required DateTime time}) => - 'Sent ${_getDay(date)} at ${Jiffy(time.toLocal()).format('HH:mm')}'; + 'Sent ${_getDay(date)} at ${Jiffy.parseFromDateTime(time.toLocal()).format(pattern: 'HH:mm')}'; @override String get todayLabel => 'Today'; diff --git a/packages/stream_chat_flutter/lib/src/message_list_view/message_list_view.dart b/packages/stream_chat_flutter/lib/src/message_list_view/message_list_view.dart index 4c29eb69..b175f01c 100644 --- a/packages/stream_chat_flutter/lib/src/message_list_view/message_list_view.dart +++ b/packages/stream_chat_flutter/lib/src/message_list_view/message_list_view.dart @@ -666,12 +666,15 @@ class _StreamMessageListViewState extends State { final createdAt = message.createdAt.toLocal(); final nextCreatedAt = nextMessage.createdAt.toLocal(); - if (!Jiffy(createdAt).isSame(nextCreatedAt, Units.DAY)) { + if (!Jiffy.parseFromDateTime(createdAt).isSame( + Jiffy.parseFromDateTime(nextCreatedAt), + unit: Unit.day)) { separator = _buildDateDivider(nextMessage); } else { - final hasTimeDiff = !Jiffy(createdAt).isSame( - nextCreatedAt, - Units.MINUTE, + final hasTimeDiff = + !Jiffy.parseFromDateTime(createdAt).isSame( + Jiffy.parseFromDateTime(nextCreatedAt), + unit: Unit.minute, ); final isNextUserSame = @@ -1061,9 +1064,10 @@ class _StreamMessageListViewState extends State { var hasTimeDiff = false; if (nextMessage != null) { - hasTimeDiff = !Jiffy(message.createdAt.toLocal()).isSame( - nextMessage.createdAt.toLocal(), - Units.MINUTE, + hasTimeDiff = + !Jiffy.parseFromDateTime(message.createdAt.toLocal()).isSame( + Jiffy.parseFromDateTime(nextMessage.createdAt.toLocal()), + unit: Unit.minute, ); } diff --git a/packages/stream_chat_flutter/lib/src/message_widget/bottom_row.dart b/packages/stream_chat_flutter/lib/src/message_widget/bottom_row.dart index 5ca2462a..7092dadf 100644 --- a/packages/stream_chat_flutter/lib/src/message_widget/bottom_row.dart +++ b/packages/stream_chat_flutter/lib/src/message_widget/bottom_row.dart @@ -191,7 +191,7 @@ class BottomRow extends StatelessWidget { ), if (showTimeStamp) Text( - Jiffy(message.createdAt.toLocal()).jm, + Jiffy.parseFromDateTime(message.createdAt.toLocal()).jm, style: messageTheme.createdAtStyle, ), if (showSendingIndicator) diff --git a/packages/stream_chat_flutter/lib/src/misc/date_divider.dart b/packages/stream_chat_flutter/lib/src/misc/date_divider.dart index 24af4f3f..24c0c9a7 100644 --- a/packages/stream_chat_flutter/lib/src/misc/date_divider.dart +++ b/packages/stream_chat_flutter/lib/src/misc/date_divider.dart @@ -20,17 +20,17 @@ class StreamDateDivider extends StatelessWidget { @override Widget build(BuildContext context) { - final createdAt = Jiffy(dateTime); - final now = Jiffy(DateTime.now()); + final createdAt = Jiffy.parseFromDateTime(dateTime); + final now = Jiffy.parseFromDateTime(DateTime.now()); var dayInfo = createdAt.MMMd; - if (createdAt.isSame(now, Units.DAY)) { + if (createdAt.isSame(now, unit: Unit.day)) { dayInfo = context.translations.todayLabel; - } else if (createdAt.isSame(now.subtract(days: 1), Units.DAY)) { + } else if (createdAt.isSame(now.subtract(days: 1), unit: Unit.day)) { dayInfo = context.translations.yesterdayLabel; - } else if (createdAt.isAfter(now.subtract(days: 7), Units.DAY)) { + } else if (createdAt.isAfter(now.subtract(days: 7), unit: Unit.day)) { dayInfo = createdAt.EEEE; - } else if (createdAt.isAfter(now.subtract(years: 1), Units.DAY)) { + } else if (createdAt.isAfter(now.subtract(years: 1), unit: Unit.day)) { dayInfo = createdAt.MMMd; } diff --git a/packages/stream_chat_flutter/lib/src/scroll_view/channel_scroll_view/stream_channel_list_tile.dart b/packages/stream_chat_flutter/lib/src/scroll_view/channel_scroll_view/stream_channel_list_tile.dart index 6b2a9b4f..b5261802 100644 --- a/packages/stream_chat_flutter/lib/src/scroll_view/channel_scroll_view/stream_channel_list_tile.dart +++ b/packages/stream_chat_flutter/lib/src/scroll_view/channel_scroll_view/stream_channel_list_tile.dart @@ -287,16 +287,16 @@ class ChannelLastMessageDate extends StatelessWidget { if (lastMessageAt.millisecondsSinceEpoch >= startOfDay.millisecondsSinceEpoch) { - stringDate = Jiffy(lastMessageAt.toLocal()).jm; + stringDate = Jiffy.parseFromDateTime(lastMessageAt.toLocal()).jm; } else if (lastMessageAt.millisecondsSinceEpoch >= startOfDay .subtract(const Duration(days: 1)) .millisecondsSinceEpoch) { stringDate = context.translations.yesterdayLabel; } else if (startOfDay.difference(lastMessageAt).inDays < 7) { - stringDate = Jiffy(lastMessageAt.toLocal()).EEEE; + stringDate = Jiffy.parseFromDateTime(lastMessageAt.toLocal()).EEEE; } else { - stringDate = Jiffy(lastMessageAt.toLocal()).yMd; + stringDate = Jiffy.parseFromDateTime(lastMessageAt.toLocal()).yMd; } return Text( diff --git a/packages/stream_chat_flutter/lib/src/scroll_view/message_search_scroll_view/stream_message_search_list_tile.dart b/packages/stream_chat_flutter/lib/src/scroll_view/message_search_scroll_view/stream_message_search_list_tile.dart index 5aab3b2d..3eb03aec 100644 --- a/packages/stream_chat_flutter/lib/src/scroll_view/message_search_scroll_view/stream_message_search_list_tile.dart +++ b/packages/stream_chat_flutter/lib/src/scroll_view/message_search_scroll_view/stream_message_search_list_tile.dart @@ -227,9 +227,9 @@ class MessageSearchTileMessageDate extends StatelessWidget { if (now.year != createdAt.year || now.month != createdAt.month || now.day != createdAt.day) { - stringDate = Jiffy(createdAt.toLocal()).yMd; + stringDate = Jiffy.parseFromDateTime(createdAt.toLocal()).yMd; } else { - stringDate = Jiffy(createdAt.toLocal()).jm; + stringDate = Jiffy.parseFromDateTime(createdAt.toLocal()).jm; } return Text( diff --git a/packages/stream_chat_flutter/lib/src/scroll_view/user_scroll_view/stream_user_list_tile.dart b/packages/stream_chat_flutter/lib/src/scroll_view/user_scroll_view/stream_user_list_tile.dart index dbb0f6a5..57f21a3c 100644 --- a/packages/stream_chat_flutter/lib/src/scroll_view/user_scroll_view/stream_user_list_tile.dart +++ b/packages/stream_chat_flutter/lib/src/scroll_view/user_scroll_view/stream_user_list_tile.dart @@ -179,7 +179,7 @@ class UserLastActive extends StatelessWidget { user.online ? context.translations.userOnlineText : '${context.translations.userLastOnlineText} ' - '${Jiffy(user.lastActive).fromNow()}', + '${Jiffy.parseFromDateTime(user.lastActive!).fromNow()}', style: chatTheme.textTheme.footnote.copyWith( color: chatTheme.colorTheme.textHighEmphasis.withOpacity(0.5), ), diff --git a/packages/stream_chat_flutter/lib/src/stream_chat.dart b/packages/stream_chat_flutter/lib/src/stream_chat.dart index 73a0d0a0..6b0d0e60 100644 --- a/packages/stream_chat_flutter/lib/src/stream_chat.dart +++ b/packages/stream_chat_flutter/lib/src/stream_chat.dart @@ -165,9 +165,9 @@ class StreamChatState extends State { @override void didChangeDependencies() { final currentLocale = Localizations.localeOf(context).toString(); - final availableLocales = Jiffy.getAllAvailableLocales(); + final availableLocales = Jiffy.getSupportedLocales(); if (availableLocales.contains(currentLocale)) { - Jiffy.locale(currentLocale); + Jiffy.setLocale(currentLocale); } super.didChangeDependencies(); } diff --git a/packages/stream_chat_flutter/lib/src/user/user_item.dart b/packages/stream_chat_flutter/lib/src/user/user_item.dart index 85d12a99..dcd18bcb 100644 --- a/packages/stream_chat_flutter/lib/src/user/user_item.dart +++ b/packages/stream_chat_flutter/lib/src/user/user_item.dart @@ -77,7 +77,7 @@ class StreamUserItem extends StatelessWidget { user.online ? context.translations.userOnlineText : '${context.translations.userLastOnlineText} ' - '${Jiffy(user.lastActive).fromNow()}', + '${Jiffy.parseFromDateTime(user.lastActive!).fromNow()}', style: chatTheme.textTheme.footnote.copyWith( color: chatTheme.colorTheme.textHighEmphasis.withOpacity(0.5), ), diff --git a/packages/stream_chat_flutter/lib/svgs/video_call_icon.svg b/packages/stream_chat_flutter/lib/svgs/video_call_icon.svg new file mode 100644 index 00000000..1c3832d6 --- /dev/null +++ b/packages/stream_chat_flutter/lib/svgs/video_call_icon.svg @@ -0,0 +1,3 @@ + + + diff --git a/packages/stream_chat_flutter/pubspec.yaml b/packages/stream_chat_flutter/pubspec.yaml index c360f1ec..743e4366 100644 --- a/packages/stream_chat_flutter/pubspec.yaml +++ b/packages/stream_chat_flutter/pubspec.yaml @@ -29,7 +29,7 @@ dependencies: http_parser: ^4.0.0 image_gallery_saver: ^2.0.1 image_picker: ^0.8.2 - jiffy: ^5.0.0 + jiffy: ^6.2.1 lottie: ^2.0.0 meta: ^1.8.0 path_provider: ^2.0.9 From 4dcc747f943adf063db7909dcb9a2058ac21d727 Mon Sep 17 00:00:00 2001 From: rlee1990 Date: Mon, 5 Jun 2023 15:46:17 -0400 Subject: [PATCH 2/5] Removed Jiffy update --- .../lib/src/channel/channel_info.dart | 2 +- .../lib/src/channel/channel_preview.dart | 6 +++--- .../lib/src/localization/translations.dart | 4 ++-- .../message_list_view/message_list_view.dart | 19 ++++++++----------- .../lib/src/message_widget/bottom_row.dart | 2 +- .../lib/src/misc/date_divider.dart | 12 ++++++------ .../stream_channel_list_tile.dart | 6 +++--- .../stream_message_search_list_tile.dart | 4 ++-- .../stream_user_list_tile.dart | 2 +- .../lib/src/stream_chat.dart | 4 ++-- .../lib/src/user/user_item.dart | 2 +- packages/stream_chat_flutter/pubspec.yaml | 2 +- 12 files changed, 31 insertions(+), 34 deletions(-) diff --git a/packages/stream_chat_flutter/lib/src/channel/channel_info.dart b/packages/stream_chat_flutter/lib/src/channel/channel_info.dart index b5923600..264908a8 100644 --- a/packages/stream_chat_flutter/lib/src/channel/channel_info.dart +++ b/packages/stream_chat_flutter/lib/src/channel/channel_info.dart @@ -108,7 +108,7 @@ class _ConnectedTitleState extends StatelessWidget { } else { alternativeWidget = Text( '${context.translations.userLastOnlineText} ' - '${Jiffy.parseFromDateTime(otherMember.user!.lastActive!).fromNow()}', + '${Jiffy(otherMember.user!.lastActive!).fromNow()}', style: textStyle, ); } diff --git a/packages/stream_chat_flutter/lib/src/channel/channel_preview.dart b/packages/stream_chat_flutter/lib/src/channel/channel_preview.dart index f64b9dc9..ae6247ea 100644 --- a/packages/stream_chat_flutter/lib/src/channel/channel_preview.dart +++ b/packages/stream_chat_flutter/lib/src/channel/channel_preview.dart @@ -349,16 +349,16 @@ class _Date extends StatelessWidget { if (lastMessageAt.millisecondsSinceEpoch >= startOfDay.millisecondsSinceEpoch) { - stringDate = Jiffy.parseFromDateTime(lastMessageAt.toLocal()).jm; + stringDate = Jiffy(lastMessageAt.toLocal()).jm; } else if (lastMessageAt.millisecondsSinceEpoch >= startOfDay .subtract(const Duration(days: 1)) .millisecondsSinceEpoch) { stringDate = context.translations.yesterdayLabel; } else if (startOfDay.difference(lastMessageAt).inDays < 7) { - stringDate = Jiffy.parseFromDateTime(lastMessageAt.toLocal()).EEEE; + stringDate = Jiffy(lastMessageAt.toLocal()).EEEE; } else { - stringDate = Jiffy.parseFromDateTime(lastMessageAt.toLocal()).yMd; + stringDate = Jiffy(lastMessageAt.toLocal()).yMd; } return Text( diff --git a/packages/stream_chat_flutter/lib/src/localization/translations.dart b/packages/stream_chat_flutter/lib/src/localization/translations.dart index b213cc0a..61c3441a 100644 --- a/packages/stream_chat_flutter/lib/src/localization/translations.dart +++ b/packages/stream_chat_flutter/lib/src/localization/translations.dart @@ -611,13 +611,13 @@ class DefaultTranslations implements Translations { } else if (date == yesterday) { return 'yesterday'; } else { - return 'on ${Jiffy.parseFromDateTime(date).MMMd}'; + return 'on ${Jiffy(date).MMMd}'; } } @override String sentAtText({required DateTime date, required DateTime time}) => - 'Sent ${_getDay(date)} at ${Jiffy.parseFromDateTime(time.toLocal()).format(pattern: 'HH:mm')}'; + 'Sent ${_getDay(date)} at ${Jiffy(time.toLocal()).format('HH:mm')}'; @override String get todayLabel => 'Today'; diff --git a/packages/stream_chat_flutter/lib/src/message_list_view/message_list_view.dart b/packages/stream_chat_flutter/lib/src/message_list_view/message_list_view.dart index b175f01c..76d55285 100644 --- a/packages/stream_chat_flutter/lib/src/message_list_view/message_list_view.dart +++ b/packages/stream_chat_flutter/lib/src/message_list_view/message_list_view.dart @@ -666,15 +666,13 @@ class _StreamMessageListViewState extends State { final createdAt = message.createdAt.toLocal(); final nextCreatedAt = nextMessage.createdAt.toLocal(); - if (!Jiffy.parseFromDateTime(createdAt).isSame( - Jiffy.parseFromDateTime(nextCreatedAt), - unit: Unit.day)) { + if (!Jiffy(createdAt) + .isSame(Jiffy(nextCreatedAt), Units.DAY)) { separator = _buildDateDivider(nextMessage); } else { - final hasTimeDiff = - !Jiffy.parseFromDateTime(createdAt).isSame( - Jiffy.parseFromDateTime(nextCreatedAt), - unit: Unit.minute, + final hasTimeDiff = !Jiffy(createdAt).isSame( + Jiffy(nextCreatedAt), + Units.MINUTE, ); final isNextUserSame = @@ -1064,10 +1062,9 @@ class _StreamMessageListViewState extends State { var hasTimeDiff = false; if (nextMessage != null) { - hasTimeDiff = - !Jiffy.parseFromDateTime(message.createdAt.toLocal()).isSame( - Jiffy.parseFromDateTime(nextMessage.createdAt.toLocal()), - unit: Unit.minute, + hasTimeDiff = !Jiffy(message.createdAt.toLocal()).isSame( + Jiffy(nextMessage.createdAt.toLocal()), + Units.MINUTE, ); } diff --git a/packages/stream_chat_flutter/lib/src/message_widget/bottom_row.dart b/packages/stream_chat_flutter/lib/src/message_widget/bottom_row.dart index 7092dadf..5ca2462a 100644 --- a/packages/stream_chat_flutter/lib/src/message_widget/bottom_row.dart +++ b/packages/stream_chat_flutter/lib/src/message_widget/bottom_row.dart @@ -191,7 +191,7 @@ class BottomRow extends StatelessWidget { ), if (showTimeStamp) Text( - Jiffy.parseFromDateTime(message.createdAt.toLocal()).jm, + Jiffy(message.createdAt.toLocal()).jm, style: messageTheme.createdAtStyle, ), if (showSendingIndicator) diff --git a/packages/stream_chat_flutter/lib/src/misc/date_divider.dart b/packages/stream_chat_flutter/lib/src/misc/date_divider.dart index 24c0c9a7..24af4f3f 100644 --- a/packages/stream_chat_flutter/lib/src/misc/date_divider.dart +++ b/packages/stream_chat_flutter/lib/src/misc/date_divider.dart @@ -20,17 +20,17 @@ class StreamDateDivider extends StatelessWidget { @override Widget build(BuildContext context) { - final createdAt = Jiffy.parseFromDateTime(dateTime); - final now = Jiffy.parseFromDateTime(DateTime.now()); + final createdAt = Jiffy(dateTime); + final now = Jiffy(DateTime.now()); var dayInfo = createdAt.MMMd; - if (createdAt.isSame(now, unit: Unit.day)) { + if (createdAt.isSame(now, Units.DAY)) { dayInfo = context.translations.todayLabel; - } else if (createdAt.isSame(now.subtract(days: 1), unit: Unit.day)) { + } else if (createdAt.isSame(now.subtract(days: 1), Units.DAY)) { dayInfo = context.translations.yesterdayLabel; - } else if (createdAt.isAfter(now.subtract(days: 7), unit: Unit.day)) { + } else if (createdAt.isAfter(now.subtract(days: 7), Units.DAY)) { dayInfo = createdAt.EEEE; - } else if (createdAt.isAfter(now.subtract(years: 1), unit: Unit.day)) { + } else if (createdAt.isAfter(now.subtract(years: 1), Units.DAY)) { dayInfo = createdAt.MMMd; } diff --git a/packages/stream_chat_flutter/lib/src/scroll_view/channel_scroll_view/stream_channel_list_tile.dart b/packages/stream_chat_flutter/lib/src/scroll_view/channel_scroll_view/stream_channel_list_tile.dart index b5261802..6b2a9b4f 100644 --- a/packages/stream_chat_flutter/lib/src/scroll_view/channel_scroll_view/stream_channel_list_tile.dart +++ b/packages/stream_chat_flutter/lib/src/scroll_view/channel_scroll_view/stream_channel_list_tile.dart @@ -287,16 +287,16 @@ class ChannelLastMessageDate extends StatelessWidget { if (lastMessageAt.millisecondsSinceEpoch >= startOfDay.millisecondsSinceEpoch) { - stringDate = Jiffy.parseFromDateTime(lastMessageAt.toLocal()).jm; + stringDate = Jiffy(lastMessageAt.toLocal()).jm; } else if (lastMessageAt.millisecondsSinceEpoch >= startOfDay .subtract(const Duration(days: 1)) .millisecondsSinceEpoch) { stringDate = context.translations.yesterdayLabel; } else if (startOfDay.difference(lastMessageAt).inDays < 7) { - stringDate = Jiffy.parseFromDateTime(lastMessageAt.toLocal()).EEEE; + stringDate = Jiffy(lastMessageAt.toLocal()).EEEE; } else { - stringDate = Jiffy.parseFromDateTime(lastMessageAt.toLocal()).yMd; + stringDate = Jiffy(lastMessageAt.toLocal()).yMd; } return Text( diff --git a/packages/stream_chat_flutter/lib/src/scroll_view/message_search_scroll_view/stream_message_search_list_tile.dart b/packages/stream_chat_flutter/lib/src/scroll_view/message_search_scroll_view/stream_message_search_list_tile.dart index 3eb03aec..5aab3b2d 100644 --- a/packages/stream_chat_flutter/lib/src/scroll_view/message_search_scroll_view/stream_message_search_list_tile.dart +++ b/packages/stream_chat_flutter/lib/src/scroll_view/message_search_scroll_view/stream_message_search_list_tile.dart @@ -227,9 +227,9 @@ class MessageSearchTileMessageDate extends StatelessWidget { if (now.year != createdAt.year || now.month != createdAt.month || now.day != createdAt.day) { - stringDate = Jiffy.parseFromDateTime(createdAt.toLocal()).yMd; + stringDate = Jiffy(createdAt.toLocal()).yMd; } else { - stringDate = Jiffy.parseFromDateTime(createdAt.toLocal()).jm; + stringDate = Jiffy(createdAt.toLocal()).jm; } return Text( diff --git a/packages/stream_chat_flutter/lib/src/scroll_view/user_scroll_view/stream_user_list_tile.dart b/packages/stream_chat_flutter/lib/src/scroll_view/user_scroll_view/stream_user_list_tile.dart index 57f21a3c..00e7339a 100644 --- a/packages/stream_chat_flutter/lib/src/scroll_view/user_scroll_view/stream_user_list_tile.dart +++ b/packages/stream_chat_flutter/lib/src/scroll_view/user_scroll_view/stream_user_list_tile.dart @@ -179,7 +179,7 @@ class UserLastActive extends StatelessWidget { user.online ? context.translations.userOnlineText : '${context.translations.userLastOnlineText} ' - '${Jiffy.parseFromDateTime(user.lastActive!).fromNow()}', + '${Jiffy(user.lastActive!).fromNow()}', style: chatTheme.textTheme.footnote.copyWith( color: chatTheme.colorTheme.textHighEmphasis.withOpacity(0.5), ), diff --git a/packages/stream_chat_flutter/lib/src/stream_chat.dart b/packages/stream_chat_flutter/lib/src/stream_chat.dart index 6b0d0e60..73a0d0a0 100644 --- a/packages/stream_chat_flutter/lib/src/stream_chat.dart +++ b/packages/stream_chat_flutter/lib/src/stream_chat.dart @@ -165,9 +165,9 @@ class StreamChatState extends State { @override void didChangeDependencies() { final currentLocale = Localizations.localeOf(context).toString(); - final availableLocales = Jiffy.getSupportedLocales(); + final availableLocales = Jiffy.getAllAvailableLocales(); if (availableLocales.contains(currentLocale)) { - Jiffy.setLocale(currentLocale); + Jiffy.locale(currentLocale); } super.didChangeDependencies(); } diff --git a/packages/stream_chat_flutter/lib/src/user/user_item.dart b/packages/stream_chat_flutter/lib/src/user/user_item.dart index dcd18bcb..0d3b811a 100644 --- a/packages/stream_chat_flutter/lib/src/user/user_item.dart +++ b/packages/stream_chat_flutter/lib/src/user/user_item.dart @@ -77,7 +77,7 @@ class StreamUserItem extends StatelessWidget { user.online ? context.translations.userOnlineText : '${context.translations.userLastOnlineText} ' - '${Jiffy.parseFromDateTime(user.lastActive!).fromNow()}', + '${Jiffy(user.lastActive!).fromNow()}', style: chatTheme.textTheme.footnote.copyWith( color: chatTheme.colorTheme.textHighEmphasis.withOpacity(0.5), ), diff --git a/packages/stream_chat_flutter/pubspec.yaml b/packages/stream_chat_flutter/pubspec.yaml index 743e4366..c360f1ec 100644 --- a/packages/stream_chat_flutter/pubspec.yaml +++ b/packages/stream_chat_flutter/pubspec.yaml @@ -29,7 +29,7 @@ dependencies: http_parser: ^4.0.0 image_gallery_saver: ^2.0.1 image_picker: ^0.8.2 - jiffy: ^6.2.1 + jiffy: ^5.0.0 lottie: ^2.0.0 meta: ^1.8.0 path_provider: ^2.0.9 From ba3f61fa1534dc4b75cdb6ecf71dc701c3c3bd3a Mon Sep 17 00:00:00 2001 From: rlee1990 Date: Tue, 6 Jun 2023 12:11:25 -0400 Subject: [PATCH 3/5] Removed Jiffy --- .../stream_chat_flutter/lib/src/channel/channel_info.dart | 2 +- .../lib/src/message_list_view/message_list_view.dart | 7 +++---- .../user_scroll_view/stream_user_list_tile.dart | 2 +- packages/stream_chat_flutter/lib/src/user/user_item.dart | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/packages/stream_chat_flutter/lib/src/channel/channel_info.dart b/packages/stream_chat_flutter/lib/src/channel/channel_info.dart index 264908a8..5c32d278 100644 --- a/packages/stream_chat_flutter/lib/src/channel/channel_info.dart +++ b/packages/stream_chat_flutter/lib/src/channel/channel_info.dart @@ -108,7 +108,7 @@ class _ConnectedTitleState extends StatelessWidget { } else { alternativeWidget = Text( '${context.translations.userLastOnlineText} ' - '${Jiffy(otherMember.user!.lastActive!).fromNow()}', + '${Jiffy(otherMember.user?.lastActive).fromNow()}', style: textStyle, ); } diff --git a/packages/stream_chat_flutter/lib/src/message_list_view/message_list_view.dart b/packages/stream_chat_flutter/lib/src/message_list_view/message_list_view.dart index 76d55285..4c29eb69 100644 --- a/packages/stream_chat_flutter/lib/src/message_list_view/message_list_view.dart +++ b/packages/stream_chat_flutter/lib/src/message_list_view/message_list_view.dart @@ -666,12 +666,11 @@ class _StreamMessageListViewState extends State { final createdAt = message.createdAt.toLocal(); final nextCreatedAt = nextMessage.createdAt.toLocal(); - if (!Jiffy(createdAt) - .isSame(Jiffy(nextCreatedAt), Units.DAY)) { + if (!Jiffy(createdAt).isSame(nextCreatedAt, Units.DAY)) { separator = _buildDateDivider(nextMessage); } else { final hasTimeDiff = !Jiffy(createdAt).isSame( - Jiffy(nextCreatedAt), + nextCreatedAt, Units.MINUTE, ); @@ -1063,7 +1062,7 @@ class _StreamMessageListViewState extends State { var hasTimeDiff = false; if (nextMessage != null) { hasTimeDiff = !Jiffy(message.createdAt.toLocal()).isSame( - Jiffy(nextMessage.createdAt.toLocal()), + nextMessage.createdAt.toLocal(), Units.MINUTE, ); } diff --git a/packages/stream_chat_flutter/lib/src/scroll_view/user_scroll_view/stream_user_list_tile.dart b/packages/stream_chat_flutter/lib/src/scroll_view/user_scroll_view/stream_user_list_tile.dart index 00e7339a..dbb0f6a5 100644 --- a/packages/stream_chat_flutter/lib/src/scroll_view/user_scroll_view/stream_user_list_tile.dart +++ b/packages/stream_chat_flutter/lib/src/scroll_view/user_scroll_view/stream_user_list_tile.dart @@ -179,7 +179,7 @@ class UserLastActive extends StatelessWidget { user.online ? context.translations.userOnlineText : '${context.translations.userLastOnlineText} ' - '${Jiffy(user.lastActive!).fromNow()}', + '${Jiffy(user.lastActive).fromNow()}', style: chatTheme.textTheme.footnote.copyWith( color: chatTheme.colorTheme.textHighEmphasis.withOpacity(0.5), ), diff --git a/packages/stream_chat_flutter/lib/src/user/user_item.dart b/packages/stream_chat_flutter/lib/src/user/user_item.dart index 0d3b811a..85d12a99 100644 --- a/packages/stream_chat_flutter/lib/src/user/user_item.dart +++ b/packages/stream_chat_flutter/lib/src/user/user_item.dart @@ -77,7 +77,7 @@ class StreamUserItem extends StatelessWidget { user.online ? context.translations.userOnlineText : '${context.translations.userLastOnlineText} ' - '${Jiffy(user.lastActive!).fromNow()}', + '${Jiffy(user.lastActive).fromNow()}', style: chatTheme.textTheme.footnote.copyWith( color: chatTheme.colorTheme.textHighEmphasis.withOpacity(0.5), ), From c8aa868f40a2892f04af86cebe1c34b65d7aaac1 Mon Sep 17 00:00:00 2001 From: rlee1990 Date: Wed, 7 Jun 2023 09:34:54 -0400 Subject: [PATCH 4/5] Updated change log --- packages/stream_chat_flutter/CHANGELOG.md | 7 +++++++ .../stream_chat_flutter/lib/src/theme/message_theme.dart | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/packages/stream_chat_flutter/CHANGELOG.md b/packages/stream_chat_flutter/CHANGELOG.md index 0ea80c8f..a7dc01ff 100644 --- a/packages/stream_chat_flutter/CHANGELOG.md +++ b/packages/stream_chat_flutter/CHANGELOG.md @@ -1,3 +1,10 @@ +## Upcoming + +🐞 Fixed + +- [[#1427]](https://github.com/GetStream/stream-chat-flutter/issues/1427) Fixed unable to load asset error for + `packages/stream_chat_flutter/lib/svgs/video_call_icon.svg`. + ## 6.2.0 🐞 Fixed diff --git a/packages/stream_chat_flutter/lib/src/theme/message_theme.dart b/packages/stream_chat_flutter/lib/src/theme/message_theme.dart index 6c35c5e3..b997fd4a 100644 --- a/packages/stream_chat_flutter/lib/src/theme/message_theme.dart +++ b/packages/stream_chat_flutter/lib/src/theme/message_theme.dart @@ -23,7 +23,7 @@ class StreamMessageThemeData with Diagnosticable { this.avatarTheme, this.createdAtStyle, @Deprecated('Use urlAttachmentBackgroundColor instead') - Color? linkBackgroundColor, + Color? linkBackgroundColor, Color? urlAttachmentBackgroundColor, this.urlAttachmentHostStyle, this.urlAttachmentTitleStyle, @@ -102,7 +102,7 @@ class StreamMessageThemeData with Diagnosticable { Color? reactionsBorderColor, Color? reactionsMaskColor, @Deprecated('Use urlAttachmentBackgroundColor instead') - Color? linkBackgroundColor, + Color? linkBackgroundColor, Color? urlAttachmentBackgroundColor, TextStyle? urlAttachmentHostStyle, TextStyle? urlAttachmentTitleStyle, From 1a7a05c62f372db2e70b432079b980443994b7f5 Mon Sep 17 00:00:00 2001 From: Sahil Kumar Date: Wed, 7 Jun 2023 19:20:34 +0530 Subject: [PATCH 5/5] Apply suggestions from code review --- .../lib/src/localization/translations.dart | 2 +- packages/stream_chat_flutter/lib/src/theme/message_theme.dart | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/stream_chat_flutter/lib/src/localization/translations.dart b/packages/stream_chat_flutter/lib/src/localization/translations.dart index 61c3441a..71254e73 100644 --- a/packages/stream_chat_flutter/lib/src/localization/translations.dart +++ b/packages/stream_chat_flutter/lib/src/localization/translations.dart @@ -83,7 +83,7 @@ abstract class Translations { /// in the [StreamMessageListView] String unreadMessagesSeparatorText( @Deprecated('unreadCount is not used anymore and will be removed ') - int unreadCount, + int unreadCount, ); /// The label for "connected" in [StreamConnectionStatusBuilder] diff --git a/packages/stream_chat_flutter/lib/src/theme/message_theme.dart b/packages/stream_chat_flutter/lib/src/theme/message_theme.dart index b997fd4a..6c35c5e3 100644 --- a/packages/stream_chat_flutter/lib/src/theme/message_theme.dart +++ b/packages/stream_chat_flutter/lib/src/theme/message_theme.dart @@ -23,7 +23,7 @@ class StreamMessageThemeData with Diagnosticable { this.avatarTheme, this.createdAtStyle, @Deprecated('Use urlAttachmentBackgroundColor instead') - Color? linkBackgroundColor, + Color? linkBackgroundColor, Color? urlAttachmentBackgroundColor, this.urlAttachmentHostStyle, this.urlAttachmentTitleStyle, @@ -102,7 +102,7 @@ class StreamMessageThemeData with Diagnosticable { Color? reactionsBorderColor, Color? reactionsMaskColor, @Deprecated('Use urlAttachmentBackgroundColor instead') - Color? linkBackgroundColor, + Color? linkBackgroundColor, Color? urlAttachmentBackgroundColor, TextStyle? urlAttachmentHostStyle, TextStyle? urlAttachmentTitleStyle,