Merge branch 'develop' of https://github.com/GetStream/flutter-samples into new-filter

packages/chatty/lib/ui/profile_verify/profile_verify_cubit.dart

@@ -27,8 +27,8 @@ class ProfileVerifyCubit extends Cubit<ProfileState> {
   final ProfileSignInUseCase _profileSignInUseCase;
 
   void startChatting() async {
-    emit(ProfileState(null, loading: true));
     final file = state.file;
+    emit(ProfileState(file, loading: true));
     final name = nameController.text;
     await _profileSignInUseCase.verify(ProfileInput(
       imageFile: file,

packages/stream_chat_v1/android/app/build.gradle

@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
     ndkVersion '21.4.7075529'
 
     sourceSets {
@@ -41,7 +41,7 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.example.example"
         minSdkVersion 21
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

packages/stream_chat_v1/android/build.gradle

@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.5.20'
     repositories {
         google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.2'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.google.gms:google-services:4.3.2'
     }

packages/stream_chat_v1/android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip

packages/stream_chat_v1/lib/choose_user_page.dart

@@ -7,6 +7,7 @@ import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:stream_chat_flutter/stream_chat_flutter.dart';
 
+import 'main.dart';
 import 'routes/routes.dart';
 
 const kStreamApiKey = 'STREAM_API_KEY';
@@ -93,7 +94,7 @@ class ChooseUserPage extends StatelessWidget {
                             final client = StreamChatClient(
                               kDefaultStreamApiKey,
                               logLevel: Level.INFO,
-                            );
+                            )..chatPersistenceClient = chatPersistentClient;
 
                             await client.connectUser(
                               user,

packages/stream_chat_v1/lib/main.dart

@@ -47,7 +47,7 @@ class _MyAppState extends State<MyApp>
     final client = StreamChatClient(
       apiKey ?? kDefaultStreamApiKey,
       logLevel: Level.SEVERE,
-    );
+    )..chatPersistenceClient = chatPersistentClient;
 
     if (userId != null && token != null) {
       await client.connectUser(

packages/stream_chat_v1/pubspec.yaml

@@ -1,7 +1,7 @@
 name: example
 description: A new Flutter project.
 publish_to: 'none'
-version: 1.6.1
+version: 1.7.0
 
 environment:
   sdk: '>=2.12.0 <3.0.0'
@@ -10,16 +10,8 @@ dependencies:
   flutter_app_badger: ^1.2.0
   flutter:
     sdk: flutter
-  stream_chat_flutter:
-    git:
-      url: https://github.com/GetStream/stream-chat-flutter.git
-      ref: develop
-      path: packages/stream_chat_flutter
-  stream_chat_persistence:
-    git:
-      url: https://github.com/GetStream/stream-chat-flutter.git
-      ref: develop
-      path: packages/stream_chat_persistence
+  stream_chat_flutter: ^2.0.0
+  stream_chat_persistence: ^2.0.0
   flutter_local_notifications: ^5.0.0+4
   flutter_svg: ^0.22.0
   flutter_secure_storage: ^4.2.0
@@ -29,18 +21,6 @@ dependencies:
   lottie: ^1.0.1
   collection: ^1.15.0-nullsafety.4
 
-dependency_overrides:
-  stream_chat:
-    git:
-      url: https://github.com/GetStream/stream-chat-flutter.git
-      ref: develop
-      path: packages/stream_chat
-  stream_chat_flutter_core:
-    git:
-      url: https://github.com/GetStream/stream-chat-flutter.git
-      ref: develop
-      path: packages/stream_chat_flutter_core
-
 dev_dependencies:
   flutter_launcher_icons: ^0.9.0
   test: any