remove additional navigator widget

example/lib/custom_message.dart

@@ -36,12 +36,11 @@ class MyApp extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return MaterialApp(
-      home: Container(
-        child: StreamChat(
-          client: client,
-          child: ChannelListPage(),
-        ),
+      builder: (context, child) => StreamChat(
+        child: child,
+        client: client,
       ),
+      home: ChannelListPage(),
     );
   }
 }

example/lib/custom_theme.dart

@@ -45,23 +45,22 @@ class MyApp extends StatelessWidget {
 
     return MaterialApp(
       theme: theme,
-      home: Container(
-        child: StreamChat(
-          streamChatThemeData: StreamChatThemeData.fromTheme(theme).copyWith(
-            ownMessageTheme: MessageTheme(
-              messageBackgroundColor: Colors.black,
-              messageText: TextStyle(
-                color: Colors.white,
-              ),
-              avatarTheme: AvatarTheme(
-                borderRadius: BorderRadius.circular(8),
-              ),
+      builder: (context, child) => StreamChat(
+        child: child,
+        client: client,
+        streamChatThemeData: StreamChatThemeData.fromTheme(theme).copyWith(
+          ownMessageTheme: MessageTheme(
+            messageBackgroundColor: Colors.black,
+            messageText: TextStyle(
+              color: Colors.white,
+            ),
+            avatarTheme: AvatarTheme(
+              borderRadius: BorderRadius.circular(8),
             ),
           ),
-          client: client,
-          child: ChannelListPage(),
         ),
       ),
+      home: ChannelListPage(),
     );
   }
 }

example/lib/customize_channel_preview.dart

@@ -41,12 +41,11 @@ class MyApp extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return MaterialApp(
-      home: Container(
-        child: StreamChat(
-          client: client,
-          child: ChannelListPage(),
-        ),
+      builder: (context, child) => StreamChat(
+        child: child,
+        client: client,
       ),
+      home: ChannelListPage(),
     );
   }
 }

example/lib/customize_message_widget.dart

@@ -36,11 +36,12 @@ class MyApp extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return MaterialApp(
+      builder: (context, child) => StreamChat(
+        child: child,
+        client: client,
+      ),
       home: Container(
-        child: StreamChat(
-          client: client,
-          child: ChannelListPage(),
-        ),
+        child: ChannelListPage(),
       ),
     );
   }

example/lib/main.dart

@@ -95,12 +95,13 @@ class MyApp extends StatelessWidget {
       theme: ThemeData.light(),
       darkTheme: ThemeData.dark(),
       themeMode: ThemeMode.system,
-      home: Container(
-        child: StreamChat(
+      builder: (context, widget) {
+        return StreamChat(
+          child: widget,
           client: client,
-          child: ChannelListPage(),
-        ),
-      ),
+        );
+      },
+      home: ChannelListPage(),
     );
   }
 }

example/lib/multiple_conversation.dart

@@ -40,11 +40,12 @@ class MyApp extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return MaterialApp(
+      builder: (context, child) => StreamChat(
+        client: client,
+        child: child,
+      ),
       home: Container(
-        child: StreamChat(
-          client: client,
-          child: ChannelListPage(),
-        ),
+        child: ChannelListPage(),
       ),
     );
   }

example/lib/threads.dart

@@ -31,11 +31,12 @@ class MyApp extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return MaterialApp(
+      builder: (context, child) => StreamChat(
+        child: child,
+        client: client,
+      ),
       home: Container(
-        child: StreamChat(
-          client: client,
-          child: ChannelListPage(),
-        ),
+        child: ChannelListPage(),
       ),
     );
   }