fix examples

.gitignore

@@ -1,6 +1,7 @@
 .DS_Store
 .atom/
 .idea/
+.vscode/
 
 .packages
 .pub/

packages/dart_client/example/android/gradle.properties

@@ -1,3 +1,4 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
+android.enableR8=true

packages/dart_client/example/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-5.6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip

packages/dart_client/example/lib/main.dart

@@ -156,7 +156,7 @@ class _MessageViewState extends State<MessageView> {
   /// Convenience method for scrolling the list view when a new message is sent.
   void _updateList() {
     _scrollController.animateTo(
-      _scrollController.position.maxScrollExtent,
+      0,
       duration: const Duration(milliseconds: 200),
       curve: Curves.easeOut,
     );

packages/stream_chat_flutter_core/example/android/gradle.properties

@@ -1,3 +1,4 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
+android.enableR8=true

packages/stream_chat_flutter_core/example/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-5.6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip

packages/stream_chat_flutter_core/example/ios/Flutter/Debug.xcconfig

@@ -1 +1,2 @@
+#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Generated.xcconfig"

packages/stream_chat_flutter_core/example/ios/Flutter/Release.xcconfig

@@ -1 +1,2 @@
+#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Generated.xcconfig"

packages/stream_chat_flutter_core/example/lib/main.dart

@@ -55,7 +55,7 @@ class StreamExample extends StatelessWidget {
       home: HomeScreen(),
       builder: (context, child) => StreamChatCore(
         client: client,
-        child: ChannelsBloc(child: child),
+        child: child,
       ),
     );
   }
@@ -73,53 +73,58 @@ class HomeScreen extends StatelessWidget {
       appBar: AppBar(
         title: Text('Channels'),
       ),
-      body: ChannelListCore(
+      body: ChannelsBloc(
-        emptyBuilder: (BuildContext context) {
+        child: ChannelListCore(
-          return Center(
+          emptyBuilder: (BuildContext context) {
-            child: Text('Looks like you are not in any channels'),
+            return Center(
-          );
+              child: Text('Looks like you are not in any channels'),
-        },
-        loadingBuilder: (BuildContext context) {
-          return Center(
-            child: SizedBox(
-              height: 100.0,
-              width: 100.0,
-              child: CircularProgressIndicator(),
-            ),
-          );
-        },
-        errorBuilder: (Error error) {
-          return Center(
-            child:
-                Text('Oh no, something went wrong. Please check your config.'),
-          );
-        },
-        listBuilder: (BuildContext context, List<Channel> channels) =>
-            ListView.builder(
-          itemCount: channels.length,
-          itemBuilder: (BuildContext context, int index) {
-            final _item = channels[index];
-            return ListTile(
-              title: Text(_item.name),
-              subtitle: Text(_item.state.lastMessage.text),
-              onTap: () {
-                /// Display a list of messages when the user taps on an item.
-                /// We can use [StreamChannel] to wrap our [MessageScreen] screen
-                /// with the selected channel.
-                ///
-                /// This allows us to use a built-in inherited widget for accessing
-                /// our `channel` later on.
-                Navigator.of(context).push(
-                  MaterialPageRoute(
-                    builder: (context) => StreamChannel(
-                      channel: _item,
-                      child: MessageScreen(),
-                    ),
-                  ),
-                );
-              },
             );
           },
+          loadingBuilder: (BuildContext context) {
+            return Center(
+              child: SizedBox(
+                height: 100.0,
+                width: 100.0,
+                child: CircularProgressIndicator(),
+              ),
+            );
+          },
+          errorBuilder: (Error error) {
+            return Center(
+              child: Text(
+                  'Oh no, something went wrong. Please check your config.'),
+            );
+          },
+          listBuilder: (
+            BuildContext context,
+            List<Channel> channels,
+          ) =>
+              ListView.builder(
+            itemCount: channels.length,
+            itemBuilder: (BuildContext context, int index) {
+              final _item = channels[index];
+              return ListTile(
+                title: Text(_item.name),
+                subtitle: Text(_item.state.lastMessage.text),
+                onTap: () {
+                  /// Display a list of messages when the user taps on an item.
+                  /// We can use [StreamChannel] to wrap our [MessageScreen] screen
+                  /// with the selected channel.
+                  ///
+                  /// This allows us to use a built-in inherited widget for accessing
+                  /// our `channel` later on.
+                  Navigator.of(context).push(
+                    MaterialPageRoute(
+                      builder: (context) => StreamChannel(
+                        channel: _item,
+                        child: MessageScreen(),
+                      ),
+                    ),
+                  );
+                },
+              );
+            },
+          ),
         ),
       ),
     );
@@ -157,7 +162,7 @@ class _MessageScreenState extends State<MessageScreen> {
 
   void _updateList() {
     _scrollController.animateTo(
-      _scrollController.position.maxScrollExtent,
+      0,
       duration: const Duration(milliseconds: 200),
       curve: Curves.easeOut,
     );
@@ -179,7 +184,7 @@ class _MessageScreenState extends State<MessageScreen> {
               child: MessageListCore(
                 emptyBuilder: (BuildContext context) {
                   return Center(
-                    child: Text('Looks like you are not in any channels'),
+                    child: Text('Nothing here yet'),
                   );
                 },
                 loadingBuilder: (BuildContext context) {
@@ -288,4 +293,4 @@ extension on Channel {
       return cid;
     }
   }
-}
+}