From 1ecc21ca5303c3f2475cf4beb77d1c996c35f0d9 Mon Sep 17 00:00:00 2001 From: Salvatore Giordano Date: Mon, 21 Jun 2021 20:34:34 +0200 Subject: [PATCH] align with main repo --- .../stream_chat_v1/lib/advanced_options_page.dart | 4 ++-- packages/stream_chat_v1/lib/chat_info_screen.dart | 6 +++--- packages/stream_chat_v1/lib/choose_user_page.dart | 2 +- packages/stream_chat_v1/lib/group_info_screen.dart | 11 ++++++----- packages/stream_chat_v1/lib/main.dart | 13 +++++-------- packages/stream_chat_v1/lib/new_chat_screen.dart | 6 ++---- packages/stream_chat_v1/pubspec.yaml | 8 ++++---- 7 files changed, 23 insertions(+), 27 deletions(-) diff --git a/packages/stream_chat_v1/lib/advanced_options_page.dart b/packages/stream_chat_v1/lib/advanced_options_page.dart index 29fe270..3882580 100644 --- a/packages/stream_chat_v1/lib/advanced_options_page.dart +++ b/packages/stream_chat_v1/lib/advanced_options_page.dart @@ -306,7 +306,7 @@ class _AdvancedOptionsPageState extends State { key: kStreamToken, value: userToken, ); - await client.disconnect(); + client.closeConnection(); } catch (e) { var errorText = 'Error connecting, retry'; if (e is Map) { @@ -317,7 +317,7 @@ class _AdvancedOptionsPageState extends State { _apiKeyError = errorText.toUpperCase(); }); loading = false; - await client.disconnect(); + client.closeConnection(); return; } loading = false; diff --git a/packages/stream_chat_v1/lib/chat_info_screen.dart b/packages/stream_chat_v1/lib/chat_info_screen.dart index eca16bb..0fbd4ea 100644 --- a/packages/stream_chat_v1/lib/chat_info_screen.dart +++ b/packages/stream_chat_v1/lib/chat_info_screen.dart @@ -6,8 +6,8 @@ import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import 'channel_file_display_screen.dart'; import 'channel_media_display_screen.dart'; -import 'pinned_messages_screen.dart'; import 'main.dart'; +import 'pinned_messages_screen.dart'; import 'routes/routes.dart'; /// Detail screen for a 1:1 chat correspondence @@ -615,7 +615,7 @@ class __SharedGroupsScreenState extends State<_SharedGroupsScreen> { title = 'No title'; } } else { - title = extraData['name']; + title = extraData['name'] as String; } return Column( @@ -633,7 +633,7 @@ class __SharedGroupsScreenState extends State<_SharedGroupsScreen> { ), Expanded( child: Text( - title!, + title, style: textStyle, )), Padding( diff --git a/packages/stream_chat_v1/lib/choose_user_page.dart b/packages/stream_chat_v1/lib/choose_user_page.dart index a6dd5e1..7c882e3 100644 --- a/packages/stream_chat_v1/lib/choose_user_page.dart +++ b/packages/stream_chat_v1/lib/choose_user_page.dart @@ -90,7 +90,7 @@ class ChooseUserPage extends StatelessWidget { ); final client = StreamChat.of(context).client; - client.apiKey = kDefaultStreamApiKey; + // client.apiKey = kDefaultStreamApiKey; await client.connectUser( user, token, diff --git a/packages/stream_chat_v1/lib/group_info_screen.dart b/packages/stream_chat_v1/lib/group_info_screen.dart index 6c45757..5ec1ec2 100644 --- a/packages/stream_chat_v1/lib/group_info_screen.dart +++ b/packages/stream_chat_v1/lib/group_info_screen.dart @@ -10,9 +10,9 @@ import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import 'channel_file_display_screen.dart'; import 'channel_media_display_screen.dart'; -import 'pinned_messages_screen.dart'; import 'chat_info_screen.dart'; import 'main.dart'; +import 'pinned_messages_screen.dart'; import 'routes/routes.dart'; class GroupInfoScreen extends StatefulWidget { @@ -61,7 +61,9 @@ class _GroupInfoScreenState extends State { super.initState(); var channel = StreamChannel.of(context); _nameController = TextEditingController.fromValue( - TextEditingValue(text: channel.channel.extraData['name'] ?? '')); + TextEditingValue( + text: (channel.channel.extraData['name'] as String?) ?? ''), + ); _searchController = TextEditingController()..addListener(_userNameListener); _nameController!.addListener(() { @@ -333,7 +335,7 @@ class _GroupInfoScreenState extends State { Widget _buildNameTile() { var channel = StreamChannel.of(context).channel; - var channelName = channel.extraData['name'] ?? ''; + var channelName = (channel.extraData['name'] as String?) ?? ''; return Material( color: StreamChatTheme.of(context).colorTheme.whiteSnow, @@ -377,8 +379,7 @@ class _GroupInfoScreenState extends State { ), ), ), - if ((channelName == null) || - (channelName != _nameController!.text.trim())) + if (channelName != _nameController!.text.trim()) Row( mainAxisSize: MainAxisSize.min, children: [ diff --git a/packages/stream_chat_v1/lib/main.dart b/packages/stream_chat_v1/lib/main.dart index c4d16b1..b0a0327 100644 --- a/packages/stream_chat_v1/lib/main.dart +++ b/packages/stream_chat_v1/lib/main.dart @@ -61,7 +61,7 @@ class _MyAppState extends State with TickerProviderStateMixin { logLevel: Level.INFO, )..chatPersistenceClient = chatPersistentClient; - if (userId != null) { + if (userId != null && token != null) { await client.connectUser( User(id: userId), token, @@ -148,7 +148,7 @@ class _MyAppState extends State with TickerProviderStateMixin { if (!kIsWeb) { _initData!.client.state.totalUnreadCountStream.listen((count) { - if (count! > 0) { + if (count > 0) { FlutterAppBadger.updateBadgeCount(count); } else { FlutterAppBadger.removeBadge(); @@ -235,6 +235,7 @@ class _MyAppState extends State with TickerProviderStateMixin { builder: (context, snapshot) => MaterialApp( builder: (context, child) { return StreamChat( + backgroundKeepAlive: Duration(seconds: 5), client: _initData!.client, onBackgroundEventReceived: (e) => showLocalNotification( e, _initData!.client.state.user!.id), @@ -445,9 +446,7 @@ class _HomePageState extends State { await secureStorage.deleteAll(); } - StreamChat.of(context).client.disconnect( - clearUser: true, - ); + StreamChat.of(context).client.disconnectUser(); await Navigator.pushReplacementNamed( context, @@ -714,9 +713,7 @@ class _ChannelListPageState extends State { }, swipeToAction: true, filter: Filter.in_('members', [user!.id]), - options: { - 'presence': true, - }, + presence: true, pagination: PaginationParams( limit: 20, ), diff --git a/packages/stream_chat_v1/lib/new_chat_screen.dart b/packages/stream_chat_v1/lib/new_chat_screen.dart index d708b00..e70c492 100644 --- a/packages/stream_chat_v1/lib/new_chat_screen.dart +++ b/packages/stream_chat_v1/lib/new_chat_screen.dart @@ -66,10 +66,8 @@ class _NewChatScreenState extends State { final chatState = StreamChat.of(context); final res = await chatState.client.queryChannelsOnline( - options: { - 'state': false, - 'watch': false, - }, + state: false, + watch: false, filter: Filter.raw(value: { 'members': [ ..._selectedUsers.map((e) => e.id), diff --git a/packages/stream_chat_v1/pubspec.yaml b/packages/stream_chat_v1/pubspec.yaml index 59ce306..9c82d91 100644 --- a/packages/stream_chat_v1/pubspec.yaml +++ b/packages/stream_chat_v1/pubspec.yaml @@ -13,12 +13,12 @@ dependencies: stream_chat_flutter: git: url: https://github.com/GetStream/stream-chat-flutter.git - ref: develop + ref: ref/segregate-api-layer path: packages/stream_chat_flutter stream_chat_persistence: git: url: https://github.com/GetStream/stream-chat-flutter.git - ref: develop + ref: ref/segregate-api-layer path: packages/stream_chat_persistence flutter_local_notifications: ^5.0.0+4 flutter_svg: ^0.22.0 @@ -33,12 +33,12 @@ dependency_overrides: stream_chat: git: url: https://github.com/GetStream/stream-chat-flutter.git - ref: develop + ref: ref/segregate-api-layer path: packages/stream_chat stream_chat_flutter_core: git: url: https://github.com/GetStream/stream-chat-flutter.git - ref: develop + ref: ref/segregate-api-layer path: packages/stream_chat_flutter_core dev_dependencies: