From a872ae34bb159ee4f120d9b066ef1127b29b5fa5 Mon Sep 17 00:00:00 2001 From: Sahil Kumar Date: Tue, 20 Jun 2023 00:35:25 +0530 Subject: [PATCH] chore: bump and migrate deps. Signed-off-by: xsahil03x --- packages/stream_chat_v1/lib/app.dart | 6 ++-- .../pages/channel_media_display_screen.dart | 4 +-- .../lib/pages/channel_page.dart | 13 +++++---- .../lib/pages/choose_user_page.dart | 8 ++++- .../lib/pages/group_chat_details_screen.dart | 2 +- .../lib/pages/group_info_screen.dart | 14 +++++---- .../lib/pages/new_chat_screen.dart | 2 +- .../lib/pages/pinned_messages_screen.dart | 4 +-- .../stream_chat_v1/lib/pages/thread_page.dart | 2 +- .../lib/pages/user_mentions_page.dart | 4 +-- .../stream_chat_v1/lib/routes/app_routes.dart | 14 +++++---- .../lib/utils/notifications_service.dart | 2 +- .../lib/widgets/channel_list.dart | 7 +++-- packages/stream_chat_v1/pubspec.yaml | 29 ++++++++++--------- 14 files changed, 62 insertions(+), 49 deletions(-) diff --git a/packages/stream_chat_v1/lib/app.dart b/packages/stream_chat_v1/lib/app.dart index f58f7a2..953c758 100644 --- a/packages/stream_chat_v1/lib/app.dart +++ b/packages/stream_chat_v1/lib/app.dart @@ -133,8 +133,8 @@ class _StreamChatSampleAppState extends State redirect: (context, state) { final loggedIn = _initNotifier.initData?.client.state.currentUser != null; - final loggingIn = state.subloc == Routes.CHOOSE_USER.path || - state.subloc == Routes.ADVANCED_OPTIONS.path; + final loggingIn = state.matchedLocation == Routes.CHOOSE_USER.path || + state.matchedLocation == Routes.ADVANCED_OPTIONS.path; if (!loggedIn) { return loggingIn ? null : Routes.CHOOSE_USER.path; @@ -142,7 +142,7 @@ class _StreamChatSampleAppState extends State // if the user is logged in but still on the login page, send them to // the home page - if (loggedIn && state.subloc == Routes.CHOOSE_USER.path) { + if (loggedIn && state.matchedLocation == Routes.CHOOSE_USER.path) { return Routes.CHANNEL_LIST_PAGE.path; } diff --git a/packages/stream_chat_v1/lib/pages/channel_media_display_screen.dart b/packages/stream_chat_v1/lib/pages/channel_media_display_screen.dart index 18bd7a5..4e6c4ab 100644 --- a/packages/stream_chat_v1/lib/pages/channel_media_display_screen.dart +++ b/packages/stream_chat_v1/lib/pages/channel_media_display_screen.dart @@ -162,9 +162,9 @@ class _ChannelMediaDisplayScreenState extends State { } router.pushNamed( Routes.CHANNEL_PAGE.name, - params: + pathParameters: Routes.CHANNEL_PAGE.params(channel), - queryParams: + queryParameters: Routes.CHANNEL_PAGE.queryParams(m), ); }, diff --git a/packages/stream_chat_v1/lib/pages/channel_page.dart b/packages/stream_chat_v1/lib/pages/channel_page.dart index e2714ee..0121d79 100644 --- a/packages/stream_chat_v1/lib/pages/channel_page.dart +++ b/packages/stream_chat_v1/lib/pages/channel_page.dart @@ -1,6 +1,6 @@ import 'package:collection/collection.dart'; -import 'package:example/routes/routes.dart'; import 'package:example/pages/thread_page.dart'; +import 'package:example/routes/routes.dart'; import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; @@ -64,14 +64,14 @@ class _ChannelPageState extends State { if (otherUser != null) { router.pushNamed( Routes.CHAT_INFO_SCREEN.name, - params: Routes.CHAT_INFO_SCREEN.params(channel), + pathParameters: Routes.CHAT_INFO_SCREEN.params(channel), extra: otherUser.user, ); } } else { GoRouter.of(context).pushNamed( Routes.GROUP_INFO_SCREEN.name, - params: Routes.GROUP_INFO_SCREEN.params(channel), + pathParameters: Routes.GROUP_INFO_SCREEN.params(channel), ); } }, @@ -103,11 +103,12 @@ class _ChannelPageState extends State { } router.goNamed( Routes.CHANNEL_PAGE.name, - params: Routes.CHANNEL_PAGE.params(channel), - queryParams: Routes.CHANNEL_PAGE.queryParams(message), + pathParameters: Routes.CHANNEL_PAGE.params(channel), + queryParameters: + Routes.CHANNEL_PAGE.queryParams(message), ); }, - deletedBottomRowBuilder: (context, message) { + bottomRowBuilderWithDefaultWidget: (context, message, _) { return const StreamVisibleFootnote(); }, ); diff --git a/packages/stream_chat_v1/lib/pages/choose_user_page.dart b/packages/stream_chat_v1/lib/pages/choose_user_page.dart index d5be33a..79b0cb7 100644 --- a/packages/stream_chat_v1/lib/pages/choose_user_page.dart +++ b/packages/stream_chat_v1/lib/pages/choose_user_page.dart @@ -38,7 +38,10 @@ class ChooseUserPage extends StatelessWidget { child: SvgPicture.asset( 'assets/logo.svg', height: 40, - color: StreamChatTheme.of(context).colorTheme.accentPrimary, + colorFilter: ColorFilter.mode( + StreamChatTheme.of(context).colorTheme.accentPrimary, + BlendMode.srcIn, + ), ), ), ), @@ -120,6 +123,9 @@ class ChooseUserPage extends StatelessWidget { value: token, ); } + + // Pop the progress dialog. + router.pop(); router.replaceNamed(Routes.CHANNEL_LIST_PAGE.name); }, leading: StreamUserAvatar( diff --git a/packages/stream_chat_v1/lib/pages/group_chat_details_screen.dart b/packages/stream_chat_v1/lib/pages/group_chat_details_screen.dart index 488b3d5..1c27665 100644 --- a/packages/stream_chat_v1/lib/pages/group_chat_details_screen.dart +++ b/packages/stream_chat_v1/lib/pages/group_chat_details_screen.dart @@ -136,7 +136,7 @@ class _GroupChatDetailsScreenState extends State { await channel.watch(); router.goNamed( Routes.CHANNEL_PAGE.name, - params: Routes.CHANNEL_PAGE.params(channel), + pathParameters: Routes.CHANNEL_PAGE.params(channel), ); } catch (err) { _showErrorAlert(); diff --git a/packages/stream_chat_v1/lib/pages/group_info_screen.dart b/packages/stream_chat_v1/lib/pages/group_info_screen.dart index 303858e..84c2abd 100644 --- a/packages/stream_chat_v1/lib/pages/group_info_screen.dart +++ b/packages/stream_chat_v1/lib/pages/group_info_screen.dart @@ -459,14 +459,16 @@ class _GroupInfoScreenState extends State { size: 24.0, ), onTap: () { - channel.update({ - 'name': _nameController.text.trim(), - }).catchError((err) { + try { + channel.update({ + 'name': _nameController.text.trim(), + }); + } catch (_) { setState(() { _nameController.text = channelName; _focusNode.unfocus(); }); - }); + } }, ), ), @@ -878,7 +880,7 @@ class _GroupInfoScreenState extends State { router.pushNamed( Routes.CHAT_INFO_SCREEN.name, - params: Routes.CHAT_INFO_SCREEN.params(c), + pathParameters: Routes.CHAT_INFO_SCREEN.params(c), extra: user, ); }, @@ -908,7 +910,7 @@ class _GroupInfoScreenState extends State { router.pushNamed( Routes.CHANNEL_PAGE.name, - params: Routes.CHANNEL_PAGE.params(c), + pathParameters: Routes.CHANNEL_PAGE.params(c), ); }, ), diff --git a/packages/stream_chat_v1/lib/pages/new_chat_screen.dart b/packages/stream_chat_v1/lib/pages/new_chat_screen.dart index 45c3528..9611aa9 100644 --- a/packages/stream_chat_v1/lib/pages/new_chat_screen.dart +++ b/packages/stream_chat_v1/lib/pages/new_chat_screen.dart @@ -409,7 +409,7 @@ class _NewChatScreenState extends State { onMessageSent: (m) { GoRouter.of(context).goNamed( Routes.CHANNEL_PAGE.name, - params: Routes.CHANNEL_PAGE.params(channel!), + pathParameters: Routes.CHANNEL_PAGE.params(channel!), ); }, ), diff --git a/packages/stream_chat_v1/lib/pages/pinned_messages_screen.dart b/packages/stream_chat_v1/lib/pages/pinned_messages_screen.dart index a38aa55..11a5705 100644 --- a/packages/stream_chat_v1/lib/pages/pinned_messages_screen.dart +++ b/packages/stream_chat_v1/lib/pages/pinned_messages_screen.dart @@ -113,8 +113,8 @@ class _PinnedMessagesScreenState extends State { } router.pushNamed( Routes.CHANNEL_PAGE.name, - params: Routes.CHANNEL_PAGE.params(channel), - queryParams: Routes.CHANNEL_PAGE.queryParams(message), + pathParameters: Routes.CHANNEL_PAGE.params(channel), + queryParameters: Routes.CHANNEL_PAGE.queryParams(message), ); }, ), diff --git a/packages/stream_chat_v1/lib/pages/thread_page.dart b/packages/stream_chat_v1/lib/pages/thread_page.dart index 4e57c35..15e6a39 100644 --- a/packages/stream_chat_v1/lib/pages/thread_page.dart +++ b/packages/stream_chat_v1/lib/pages/thread_page.dart @@ -64,7 +64,7 @@ class _ThreadPageState extends State { messageBuilder: (context, details, messages, defaultMessage) { return defaultMessage.copyWith( onReplyTap: _reply, - deletedBottomRowBuilder: (context, message) { + bottomRowBuilderWithDefaultWidget: (context, message, _) { return const StreamVisibleFootnote(); }, ); diff --git a/packages/stream_chat_v1/lib/pages/user_mentions_page.dart b/packages/stream_chat_v1/lib/pages/user_mentions_page.dart index c95329c..4ec3b6d 100644 --- a/packages/stream_chat_v1/lib/pages/user_mentions_page.dart +++ b/packages/stream_chat_v1/lib/pages/user_mentions_page.dart @@ -82,8 +82,8 @@ class _UserMentionsPageState extends State { } router.pushNamed( Routes.CHANNEL_PAGE.name, - params: Routes.CHANNEL_PAGE.params(channel), - queryParams: Routes.CHANNEL_PAGE.queryParams(message), + pathParameters: Routes.CHANNEL_PAGE.params(channel), + queryParameters: Routes.CHANNEL_PAGE.queryParams(message), ); }, ); diff --git a/packages/stream_chat_v1/lib/routes/app_routes.dart b/packages/stream_chat_v1/lib/routes/app_routes.dart index 9842d0c..f8489b0 100644 --- a/packages/stream_chat_v1/lib/routes/app_routes.dart +++ b/packages/stream_chat_v1/lib/routes/app_routes.dart @@ -27,10 +27,12 @@ final appRoutes = [ name: Routes.CHANNEL_PAGE.name, path: Routes.CHANNEL_PAGE.path, builder: (context, state) { - final channel = - StreamChat.of(context).client.state.channels[state.params['cid']]; - final messageId = state.queryParams['mid']; - final parentId = state.queryParams['pid']; + final channel = StreamChat.of(context) + .client + .state + .channels[state.pathParameters['cid']]; + final messageId = state.queryParameters['mid']; + final parentId = state.queryParameters['pid']; Message? parentMessage; if (parentId != null) { @@ -60,7 +62,7 @@ final appRoutes = [ final channel = StreamChat.of(context) .client .state - .channels[state.params['cid']]; + .channels[state.pathParameters['cid']]; return StreamChannel( channel: channel!, child: ChatInfoScreen( @@ -77,7 +79,7 @@ final appRoutes = [ final channel = StreamChat.of(context) .client .state - .channels[state.params['cid']]; + .channels[state.pathParameters['cid']]; return StreamChannel( channel: channel!, child: GroupInfoScreen( diff --git a/packages/stream_chat_v1/lib/utils/notifications_service.dart b/packages/stream_chat_v1/lib/utils/notifications_service.dart index a02d2ee..ccca39c 100644 --- a/packages/stream_chat_v1/lib/utils/notifications_service.dart +++ b/packages/stream_chat_v1/lib/utils/notifications_service.dart @@ -52,7 +52,7 @@ void showLocalNotification( router.pushNamed( Routes.CHANNEL_PAGE.name, - params: Routes.CHANNEL_PAGE.params(channel), + pathParameters: Routes.CHANNEL_PAGE.params(channel), ); } }, diff --git a/packages/stream_chat_v1/lib/widgets/channel_list.dart b/packages/stream_chat_v1/lib/widgets/channel_list.dart index f63edbe..e283d2a 100644 --- a/packages/stream_chat_v1/lib/widgets/channel_list.dart +++ b/packages/stream_chat_v1/lib/widgets/channel_list.dart @@ -161,8 +161,9 @@ class _ChannelList extends State { } router.pushNamed( Routes.CHANNEL_PAGE.name, - params: Routes.CHANNEL_PAGE.params(channel), - queryParams: Routes.CHANNEL_PAGE.queryParams(message), + pathParameters: Routes.CHANNEL_PAGE.params(channel), + queryParameters: + Routes.CHANNEL_PAGE.queryParams(message), ); }, ); @@ -265,7 +266,7 @@ class _ChannelList extends State { onChannelTap: (channel) { GoRouter.of(context).pushNamed( Routes.CHANNEL_PAGE.name, - params: Routes.CHANNEL_PAGE.params(channel), + pathParameters: Routes.CHANNEL_PAGE.params(channel), ); }, emptyBuilder: (_) { diff --git a/packages/stream_chat_v1/pubspec.yaml b/packages/stream_chat_v1/pubspec.yaml index 9ce8c22..242f35f 100644 --- a/packages/stream_chat_v1/pubspec.yaml +++ b/packages/stream_chat_v1/pubspec.yaml @@ -4,11 +4,11 @@ publish_to: "none" version: 2.2.0 environment: - sdk: ">=2.17.0 <3.0.0" + sdk: ">=2.17.0 <4.0.0" flutter: ">=1.17.0" dependencies: - flutter_app_badger: ^1.3.0 + flutter_app_badger: ^1.5.0 flutter: sdk: flutter stream_chat_flutter: @@ -27,21 +27,22 @@ dependencies: ref: develop path: packages/stream_chat_localizations flutter_local_notifications: ^9.0.0 - flutter_svg: ^2.0.4 - flutter_secure_storage: ^6.0.0 - yaml: ^3.1.0 - uuid: ^3.0.5 + flutter_svg: ^2.0.7 + flutter_secure_storage: ^8.0.0 + yaml: ^3.1.2 + uuid: ^3.0.7 streaming_shared_preferences: ^2.0.0 - lottie: ^2.3.2 - collection: ^1.15.0 - sentry_flutter: ^6.5.0 - flutter_slidable: ^2.0.0 - go_router: ^5.0.5 - provider: ^6.0.3 + lottie: ^2.4.0 + collection: ^1.17.1 + sentry_flutter: ^7.8.0 + flutter_slidable: ^3.0.0 + go_router: ^8.0.5 + provider: ^6.0.5 + video_player: ^2.6.1 dev_dependencies: - flutter_launcher_icons: ^0.12.0 - flutter_lints: ^2.0.0 + flutter_launcher_icons: ^0.13.1 + flutter_lints: ^2.0.1 dependency_overrides: stream_chat: