From f5d4da9ccda5c5fb51b5a6bb96e600c9f1aee0dc Mon Sep 17 00:00:00 2001 From: Carlos Lopez-Rosario Date: Sun, 3 May 2020 12:59:17 -0400 Subject: [PATCH] Signed in as guest --- lib/globals.dart | 7 +++++++ lib/main.dart | 11 ++++++++++- lib/route_generator.dart | 3 +-- lib/screens/chat.dart | 42 +++------------------------------------- 4 files changed, 21 insertions(+), 42 deletions(-) create mode 100644 lib/globals.dart diff --git a/lib/globals.dart b/lib/globals.dart new file mode 100644 index 0000000..825dc17 --- /dev/null +++ b/lib/globals.dart @@ -0,0 +1,7 @@ +library my_prj.globals; +import 'package:stream_chat_flutter/stream_chat_flutter.dart'; + +Client client = Client( + 'xqf4gbfwu2ec', + logLevel: Level.INFO, +); \ No newline at end of file diff --git a/lib/main.dart b/lib/main.dart index 0544d4e..f66bc97 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,7 +1,16 @@ import 'package:capstone_hungry_hippos/route_generator.dart'; import 'package:flutter/material.dart'; +import 'package:stream_chat_flutter/stream_chat_flutter.dart'; +import 'globals.dart' as globals; -void main() => runApp(App()); + +void main() async { + var c = globals.client; + await c.setGuestUser( + User(id: 'You'), + ); + runApp(App()); +} class App extends StatelessWidget { @override diff --git a/lib/route_generator.dart b/lib/route_generator.dart index 1f2f2e9..93ac0b7 100644 --- a/lib/route_generator.dart +++ b/lib/route_generator.dart @@ -8,7 +8,6 @@ import 'screens/sport.dart'; import 'screens/twitter_widget.dart'; import 'screens/favorites_reorder.dart'; - class RouteGenerator { static Route generateRoute(RouteSettings settings) { final args = settings @@ -36,7 +35,6 @@ class RouteGenerator { return _errorRoute(); } } - static Route _errorRoute() { return MaterialPageRoute(builder: (_) { return Scaffold( @@ -61,4 +59,5 @@ class RouteGenerator { ); }); } + } diff --git a/lib/screens/chat.dart b/lib/screens/chat.dart index 13b04af..9632ad8 100644 --- a/lib/screens/chat.dart +++ b/lib/screens/chat.dart @@ -1,30 +1,6 @@ import 'package:flutter/material.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; - -class _Chat { - final client = Client( - 'xqf4gbfwu2ec', - logLevel: Level.INFO, - ); - - Future init() async { - await client.setGuestUser( - User(id: 'You' - ), - ); - final user = User(id: "carlos", extraData: { - "name": "John Doe", - }); - - await client.setUser( - user, - client.devToken("carlos"), - ); - - return client; - } -} - +import 'package:capstone_hungry_hippos/globals.dart' as globals; class Chat extends StatelessWidget { final List sport; @@ -32,24 +8,13 @@ class Chat extends StatelessWidget { @override Widget build(BuildContext context) { - _Chat c = _Chat(); - var x = c.init(); return Scaffold( appBar: AppBar( centerTitle: false, title: Text('${sport[0]} Chat'), backgroundColor: Colors.green, ), - body: FutureBuilder( - future: x, - builder: (context, snapshot){ - if (!snapshot.hasData) { - return Center(child: CircularProgressIndicator()); - } else { - return ContainerWithInterceptor(snapshot.data, sport[1]); - } - }, - ), + body: ContainerWithInterceptor(globals.client, sport[1]), ); } } @@ -64,14 +29,13 @@ class ChannelPage extends StatelessWidget { children: [ Expanded( child: MessageListView( - // messageBuilder: _messageBuilder, + //messageBuilder: _messageBuilder, ), ), MessageInput(), ], ); } - } class ContainerWithInterceptor extends StatefulWidget {