diff --git a/lib/main.dart b/lib/main.dart index fc04fcc..0a4231b 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,7 +1,5 @@ import 'package:capstone_hungry_hippos/route_generator.dart'; import 'package:flutter/material.dart'; -import 'screens/home_widget.dart'; -import 'screens/sport.dart'; void main() => runApp(App()); diff --git a/lib/route_generator.dart b/lib/route_generator.dart index 7a2c01b..3e01d5e 100644 --- a/lib/route_generator.dart +++ b/lib/route_generator.dart @@ -2,7 +2,6 @@ import 'package:capstone_hungry_hippos/screens/chat.dart'; import 'package:capstone_hungry_hippos/screens/schedule.dart'; import 'package:capstone_hungry_hippos/screens/standing.dart'; import 'package:flutter/material.dart'; -import 'package:capstone_hungry_hippos/main.dart'; import 'package:capstone_hungry_hippos/screens/home_widget.dart'; import 'package:capstone_hungry_hippos/screens/sport.dart'; @@ -17,11 +16,11 @@ class RouteGenerator { //We can put logic and stuff here for checking if logged in return MaterialPageRoute(builder: (_) => Sport()); case '/Schedule': - return MaterialPageRoute(builder: (_) => Chat()); - case '/Standing': return MaterialPageRoute(builder: (_) => Schedule()); - case '/Chat': + case '/Standing': return MaterialPageRoute(builder: (_) => Standing()); + case '/Chat': + return MaterialPageRoute(builder: (_) => Chat()); default: return _errorRoute(); } diff --git a/pubspec.lock b/pubspec.lock index 57b0841..a5d537b 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -218,7 +218,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.11" + version: "0.2.15" typed_data: dependency: transitive description: