Merge branches 'feature/new-ui' and 'qa/new-chat-screens' of github.com:GetStream/stream-chat-flutter into qa/new-chat-screens

 Conflicts:

	example/lib/new_group_chat_screen.dart

example/lib/advanced_options_page.dart

@@ -7,6 +7,8 @@ import 'package:stream_chat_flutter/stream_chat_flutter.dart';
 
 import 'main.dart';
 import 'notifications_service.dart';
+import 'choose_user_page.dart';
+import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 
 class AdvancedOptionsPage extends StatefulWidget {
   @override
@@ -285,6 +287,20 @@ class _AdvancedOptionsPageState extends State<AdvancedOptionsPage> {
                               if (!kIsWeb) {
                                 initNotifications(client);
                               }
+
+                              final secureStorage = FlutterSecureStorage();
+                              secureStorage.write(
+                                key: kStreamApiKey,
+                                value: apiKey,
+                              );
+                              secureStorage.write(
+                                key: kStreamUserId,
+                                value: userId,
+                              );
+                              secureStorage.write(
+                                key: kStreamToken,
+                                value: userToken,
+                              );
                             } catch (e) {
                               var errorText = 'Error connecting, retry';
                               if (e is Map) {

example/lib/choose_user_page.dart

@@ -133,7 +133,7 @@ class ChooseUserPage extends StatelessWidget {
 
                             final secureStorage = FlutterSecureStorage();
                             final client = StreamChat.of(context).client;
-
+                            client.apiKey = kDefaultStreamApiKey;
                             await client.setUser(
                               user,
                               token,

example/pubspec.yaml

@@ -1,6 +1,6 @@
 name: example
 description: A new Flutter project.
-version: 1.0.72+74
+version: 1.0.75+77
 
 environment:
   sdk: ">=2.2.2 <3.0.0"