Merge branch 'master' into feature/new-ui

example/android/build.gradle

@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:4.1.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.google.gms:google-services:4.3.2'
     }

example/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Jun 23 08:50:38 CEST 2017
+#Thu Oct 22 11:03:39 CEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip

example/lib/single_conversation.dart

@@ -52,12 +52,15 @@ class MyApp extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return MaterialApp(
-      home: StreamChat(
-        client: client,
-        child: StreamChannel(
-          channel: channel,
-          child: ChannelPage(),
-        ),
+      builder: (context, widget) {
+        return StreamChat(
+          child: widget,
+          client: client,
+        );
+      },
+      home: StreamChannel(
+        channel: channel,
+        child: ChannelPage(),
       ),
     );
   }

example/pubspec.yaml

@@ -1,7 +1,6 @@
 name: example
 description: A new Flutter project.
-
-version: 1.0.30+32
+version: 1.0.31+33
 
 environment:
   sdk: ">=2.2.2 <3.0.0"