Merge branch 'master' into feature/notifications

example/lib/main.dart

@@ -49,29 +49,21 @@ class MyApp extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return MaterialApp(
-      theme: ThemeData(
+      home: Container(
-        appBarTheme: AppBarTheme(
+        child: StreamChat(
-          brightness: Brightness.light,
+          client: client,
+          child: ChannelListPage(),
         ),
       ),
-      home: ChannelListPage(client: client),
     );
   }
 }
 
 class ChannelListPage extends StatelessWidget {
-  final Client client;
-  ChannelListPage({this.client});
-
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      body: PageView(
+      body: ChannelListView(
-        children: <Widget>[
-          StreamChat(
-            client: client,
-            child: Builder(
-              builder: (context) => ChannelListView(
         filter: {
           'members': {
             '\$in': [StreamChat.of(context).user.id],
@@ -83,20 +75,6 @@ class ChannelListPage extends StatelessWidget {
         ),
         channelWidget: ChannelPage(),
       ),
-            ),
-          ),
-          StreamChat(
-            client: client,
-            child: ChannelListView(
-              sort: [SortOption('last_message_at')],
-              pagination: PaginationParams(
-                limit: 20,
-              ),
-              channelWidget: ChannelPage(),
-            ),
-          ),
-        ],
-      ),
     );
   }
 }