me-uncc/ITCS-4155
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into game_details_offNavigation

Browse Source 
# Conflicts:
#	lib/route_generator.dart
#	pubspec.lock
This commit is contained in:
Carlos Lopez-Rosario
2020-04-10 14:52:04 -04:00
parent 315bac2891 76120de1dc
commit f3f44e7108
15 changed files with 785 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/route_generator.dart
View File

@@ -1,10 +1,11 @@
import 'package:capstone_hungry_hippos/screens/chat.dart';
import 'package:capstone_hungry_hippos/screens/favorites_reorder.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/screens/home_widget.dart';
import 'package:capstone_hungry_hippos/screens/sport.dart';
import 'package:capstone_hungry_hippos/screens/twitter_widget.dart';
import 'package:capstone_hungry_hippos/screens/favorites_reorder.dart';
import 'package:capstone_hungry_hippos/screens/game_details.dart';
class RouteGenerator {
@@ -28,6 +29,8 @@ class RouteGenerator {
return MaterialPageRoute(builder: (_) => Details());
case '/Favorites':
return MaterialPageRoute(builder: (_) => FavoritesManager());
case '/Twitter':
return MaterialPageRoute(builder: (_) => TwitterFeed());
default:
return _errorRoute();
}