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

Merge remote-tracking branch 'origin/develop' into firebase

Browse Source 
# Conflicts:
#	packages/stream_chat_v1/pubspec.yaml
This commit is contained in:
xsahil03x
2023-06-22 00:15:57 +05:30
parent e0a6b8700c 20723a39f7
commit 3772925451
14 changed files with 61 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/stream_chat_v1/lib/app.dart
+3 -3
View File
@@ -289,8 +289,8 @@ class _StreamChatSampleAppState extends State<StreamChatSampleApp>
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;
@@ -298,7 +298,7 @@ class _StreamChatSampleAppState extends State<StreamChatSampleApp>
// 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;
}
packages/stream_chat_v1/lib/pages/channel_media_display_screen.dart
+2 -2
View File
@@ -162,9 +162,9 @@ class _ChannelMediaDisplayScreenState extends State<ChannelMediaDisplayScreen> {
}
router.pushNamed(
Routes.CHANNEL_PAGE.name,
params:
pathParameters:
Routes.CHANNEL_PAGE.params(channel),
queryParams:
queryParameters:
Routes.CHANNEL_PAGE.queryParams(m),
);
},
packages/stream_chat_v1/lib/pages/channel_page.dart
+6 -5
View File
@@ -64,14 +64,14 @@ class _ChannelPageState extends State<ChannelPage> {
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<ChannelPage> {
}
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();
},
);
packages/stream_chat_v1/lib/pages/choose_user_page.dart
+7 -1
View File
@@ -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(
packages/stream_chat_v1/lib/pages/group_chat_details_screen.dart
+1 -1
View File
@@ -136,7 +136,7 @@ class _GroupChatDetailsScreenState extends State<GroupChatDetailsScreen> {
await channel.watch();
router.goNamed(
Routes.CHANNEL_PAGE.name,
params: Routes.CHANNEL_PAGE.params(channel),
pathParameters: Routes.CHANNEL_PAGE.params(channel),
);
} catch (err) {
_showErrorAlert();
packages/stream_chat_v1/lib/pages/group_info_screen.dart
+8 -6
View File
@@ -459,14 +459,16 @@ class _GroupInfoScreenState extends State<GroupInfoScreen> {
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<GroupInfoScreen> {
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<GroupInfoScreen> {
router.pushNamed(
Routes.CHANNEL_PAGE.name,
params: Routes.CHANNEL_PAGE.params(c),
pathParameters: Routes.CHANNEL_PAGE.params(c),
);
},
),
packages/stream_chat_v1/lib/pages/new_chat_screen.dart
+1 -1
View File
@@ -409,7 +409,7 @@ class _NewChatScreenState extends State<NewChatScreen> {
onMessageSent: (m) {
GoRouter.of(context).goNamed(
Routes.CHANNEL_PAGE.name,
params: Routes.CHANNEL_PAGE.params(channel!),
pathParameters: Routes.CHANNEL_PAGE.params(channel!),
);
},
),
packages/stream_chat_v1/lib/pages/pinned_messages_screen.dart
+2 -2
View File
@@ -113,8 +113,8 @@ class _PinnedMessagesScreenState extends State<PinnedMessagesScreen> {
}
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),
);
},
),
packages/stream_chat_v1/lib/pages/thread_page.dart
+1 -1
View File
@@ -64,7 +64,7 @@ class _ThreadPageState extends State<ThreadPage> {
messageBuilder: (context, details, messages, defaultMessage) {
return defaultMessage.copyWith(
onReplyTap: _reply,
deletedBottomRowBuilder: (context, message) {
bottomRowBuilderWithDefaultWidget: (context, message, _) {
return const StreamVisibleFootnote();
},
);
packages/stream_chat_v1/lib/pages/user_mentions_page.dart
+2 -2
View File
@@ -82,8 +82,8 @@ class _UserMentionsPageState extends State<UserMentionsPage> {
}
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),
);
},
);
packages/stream_chat_v1/lib/routes/app_routes.dart
+8 -6
View File
@@ -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(
packages/stream_chat_v1/lib/utils/notifications_service.dart
+1 -1
View File
@@ -52,7 +52,7 @@ void showLocalNotification(
router.pushNamed(
Routes.CHANNEL_PAGE.name,
params: Routes.CHANNEL_PAGE.params(channel),
pathParameters: Routes.CHANNEL_PAGE.params(channel),
);
}
},
packages/stream_chat_v1/lib/widgets/channel_list.dart
+4 -3
View File
@@ -161,8 +161,9 @@ class _ChannelList extends State<ChannelList> {
}
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<ChannelList> {
onChannelTap: (channel) {
GoRouter.of(context).pushNamed(
Routes.CHANNEL_PAGE.name,
params: Routes.CHANNEL_PAGE.params(channel),
pathParameters: Routes.CHANNEL_PAGE.params(channel),
);
},
emptyBuilder: (_) {
packages/stream_chat_v1/pubspec.yaml
+15 -14
View File
@@ -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,22 +27,23 @@ 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
firebase_messaging: ^14.5.0
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: