fix(home): remove thin border from overscroll indicator

android/app/src/main/AndroidManifest.xml

@@ -35,4 +35,11 @@
     <!-- Permissions -->
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <data android:scheme="tel" />
+        </intent>
+    </queries>
 </manifest>

ios/Flutter/AppFrameworkInfo.plist

@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>9.0</string>
+  <string>11.0</string>
 </dict>
 </plist>

ios/Podfile

@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '9.0'
+# platform :ios, '11.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'

ios/Podfile.lock

@@ -1,22 +1,64 @@
 PODS:
+  - external_app_launcher (0.0.1):
+    - Flutter
   - Flutter (1.0.0)
-  - path_provider_ios (0.0.1):
+  - flutter_compass (0.0.1):
+    - Flutter
+  - flutter_inappwebview (0.0.1):
+    - Flutter
+    - flutter_inappwebview/Core (= 0.0.1)
+    - OrderedSet (~> 5.0)
+  - flutter_inappwebview/Core (0.0.1):
+    - Flutter
+    - OrderedSet (~> 5.0)
+  - geolocator_apple (1.2.0):
+    - Flutter
+  - OrderedSet (5.0.0)
+  - path_provider_foundation (0.0.1):
+    - Flutter
+    - FlutterMacOS
+  - url_launcher_ios (0.0.1):
     - Flutter
 
 DEPENDENCIES:
+  - external_app_launcher (from `.symlinks/plugins/external_app_launcher/ios`)
   - Flutter (from `Flutter`)
-  - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`)
+  - flutter_compass (from `.symlinks/plugins/flutter_compass/ios`)
+  - flutter_inappwebview (from `.symlinks/plugins/flutter_inappwebview/ios`)
+  - geolocator_apple (from `.symlinks/plugins/geolocator_apple/ios`)
+  - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
+  - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
+
+SPEC REPOS:
+  trunk:
+    - OrderedSet
 
 EXTERNAL SOURCES:
+  external_app_launcher:
+    :path: ".symlinks/plugins/external_app_launcher/ios"
   Flutter:
     :path: Flutter
-  path_provider_ios:
+  flutter_compass:
-    :path: ".symlinks/plugins/path_provider_ios/ios"
+    :path: ".symlinks/plugins/flutter_compass/ios"
+  flutter_inappwebview:
+    :path: ".symlinks/plugins/flutter_inappwebview/ios"
+  geolocator_apple:
+    :path: ".symlinks/plugins/geolocator_apple/ios"
+  path_provider_foundation:
+    :path: ".symlinks/plugins/path_provider_foundation/darwin"
+  url_launcher_ios:
+    :path: ".symlinks/plugins/url_launcher_ios/ios"
 
 SPEC CHECKSUMS:
-  Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
+  external_app_launcher: ad55ac844aa21f2d2197d7cec58ff0d0dc40bbc0
-  path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02
+  Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
+  flutter_compass: cbbd285cea1584c7ac9c4e0c3e1f17cbea55e855
+  flutter_inappwebview: bfd58618f49dc62f2676de690fc6dcda1d6c3721
+  geolocator_apple: cc556e6844d508c95df1e87e3ea6fa4e58c50401
+  OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c
+  path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
+  url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4
 
-PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c
+PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.12.1

ios/Runner.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 50;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -156,7 +156,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1430;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -200,10 +200,12 @@
 /* Begin PBXShellScriptBuildPhase section */
 		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
+				"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
 			);
 			name = "Thin Binary";
 			outputPaths = (
@@ -236,6 +238,7 @@
 		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
@@ -340,7 +343,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -417,7 +420,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -466,7 +469,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;

ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

ios/Runner/Info.plist

@@ -45,5 +45,13 @@
 	<false/>
 	<key>CADisableMinimumFrameDurationOnPhone</key>
 	<true/>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string>Your location will be used to provide weather and map data.</string>
+	<key>LSApplicationQueriesSchemes</key>
+    <array>
+      <string>tel</string>
+    </array>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
 </dict>
 </plist>

lib/main.dart

@@ -1,6 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:furman_now/src/app.dart';
+import 'package:furman_now/src/store/index.dart';
+import 'package:provider/provider.dart';
 
 void main() {
-  runApp(App());
+  runApp(
+    ChangeNotifierProvider(
+      create: (context) => AppState(),
+      child: App(),
+    ),
+  );
 }

lib/src/layouts/app_page.dart

@@ -0,0 +1,141 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:furman_now/src/utils/conditional_parent_widget.dart';
+import 'package:furman_now/src/utils/theme.dart';
+import 'package:furman_now/src/widgets/scroll_view_height.dart';
+import 'package:transparent_pointer/transparent_pointer.dart';
+
+class AppPageLayout extends StatefulWidget {
+  final IconData icon;
+  final String title;
+  final Color? backgroundColor;
+  final Widget content;
+  final void Function()? iconTapAction;
+  final bool darkStatusBar;
+
+  const AppPageLayout({
+    required this.title,
+    required this.icon,
+    this.backgroundColor,
+    required this.content,
+    this.iconTapAction,
+    this.darkStatusBar = true,
+    Key? key,
+  }) : super(key: key);
+
+  @override
+  State<AppPageLayout> createState() => _AppPageLayoutState();
+}
+
+class _AppPageLayoutState extends State<AppPageLayout> {
+  final ScrollController _controller = ScrollController();
+  double overscrollBoxHeight = 0;
+  
+  @override
+  void initState() {
+    super.initState();
+
+    _controller.addListener(updateScrollPosition);
+  }
+
+  updateScrollPosition() {
+    if (_controller.position.pixels > _controller.position.maxScrollExtent) {
+      setState(() {
+        overscrollBoxHeight =
+          _controller.position.pixels - _controller.position.maxScrollExtent;
+      });
+    } else {
+      if (overscrollBoxHeight != 0) {
+        setState(() {
+          overscrollBoxHeight = 0;
+        });
+      }
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: AnnotatedRegion<SystemUiOverlayStyle>(
+        value: constructOverlayStyle(dark: widget.darkStatusBar),
+        child: Container(
+          color: widget.backgroundColor ?? Colors.grey[100],
+          child: SafeArea(
+            child: Stack(
+              fit: StackFit.loose,
+              children: [
+                SizedBox(
+                  width: double.infinity,
+                  height: double.infinity,
+                  child: Align(
+                    alignment: Alignment.topLeft,
+                    child: Container(
+                      padding: const EdgeInsets.symmetric(horizontal: 30),
+                      width: double.infinity,
+                      height: 100,
+                      child: Column(
+                        mainAxisAlignment: MainAxisAlignment.center,
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          Wrap(
+                            crossAxisAlignment: WrapCrossAlignment.center,
+                            children: [
+                              ConditionalParentWidget(
+                                condition: widget.iconTapAction != null,
+                                conditionalBuilder: (child) => GestureDetector(
+                                  onTap: widget.iconTapAction!,
+                                  child: child,
+                                ),
+                                child: Icon(
+                                  widget.icon,
+                                  size: 35,
+                                  color: Colors.grey[700]
+                                ),
+                              ),
+                              const SizedBox(width: 12),
+                              Text(
+                                widget.title,
+                                style: furmanTextStyle(TextStyle(
+                                  color: Colors.grey[900],
+                                  fontSize: 28, fontWeight: FontWeight.w700
+                                )),
+                              ),
+                            ],
+                          ),
+                        ],
+                      ),
+                    ),
+                  ),
+                ),
+                // makes the overscroll color at the bottom match
+                // that of the navbar
+                Align(
+                  alignment: Alignment.bottomCenter,
+                  child: Container(
+                    height: 30 + overscrollBoxHeight,
+                    color: Colors.grey.shade50,
+                  ),
+                ),
+                TransparentPointer(
+                  child: ScrollViewWithHeight(
+                    controller: _controller,
+                    child: Container(
+                      decoration: const BoxDecoration(
+                        color: Colors.white,
+                        borderRadius: BorderRadius.all(Radius.circular(30)),
+                      ),
+                      // padding: const EdgeInsets.symmetric(vertical: 20, horizontal: 20),
+                      margin: const EdgeInsets.only(top: 100),
+                      width: double.infinity,
+                      child: widget.content,
+                    ),
+                  ),
+                ),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/src/layouts/main/index.dart

@@ -1,7 +1,8 @@
 import 'package:auto_route/auto_route.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_remix/flutter_remix.dart';
 import 'package:furman_now/src/routes/index.gr.dart';
+import 'package:salomon_bottom_bar/salomon_bottom_bar.dart';
 
 class MainLayout extends StatefulWidget {
   const MainLayout({
@@ -34,12 +35,14 @@ class _MainLayoutState extends State<MainLayout> {
   @override
   Widget build(BuildContext context) {
     return AutoTabsScaffold(
+      animationDuration: const Duration(milliseconds: 150),
       routes: const [
-        HomeRoute(),
+        HomePageRouter(children: [
+          HomeRoute(),
+        ]),
         MapRoute(),
-        StudentIdRoute(),
         EventsRoute(),
-        InfoRoute(),
+        InfoPageRouter(children: [InfoRoute()]),
       ],
       bottomNavigationBuilder: (_, tabsRouter) {
         return WillPopScope(
@@ -61,33 +64,40 @@ class _MainLayoutState extends State<MainLayout> {
               }
             }
           },
-          child: BottomNavigationBar(
+          child: Padding(
-            items: const <BottomNavigationBarItem>[
+            padding: const EdgeInsets.symmetric(vertical: 3, horizontal: 20),
-              BottomNavigationBarItem(
+            child: SalomonBottomBar(
-                icon: Icon(Icons.home),
+              itemPadding:
-                label: 'Home',
+              const EdgeInsets.symmetric(vertical: 12, horizontal: 16),
-              ),
+              items: <SalomonBottomBarItem>[
-              BottomNavigationBarItem(
+                SalomonBottomBarItem(
-                icon: Icon(Icons.map),
+                  icon: const Icon(FlutterRemix.home_line),
-                label: 'Map',
+                  title: const Text('Home'),
-              ),
+                ),
-              BottomNavigationBarItem(
+                SalomonBottomBarItem(
-                icon: Icon(Icons.perm_identity),
+                  icon: const Icon(FlutterRemix.map_2_line),
-                label: 'Meal Card',
+                  title: const Text('Map'),
-              ),
+                ),
-              BottomNavigationBarItem(
+                SalomonBottomBarItem(
-                icon: Icon(Icons.calendar_month),
+                  icon: const Icon(FlutterRemix.calendar_line),
-                label: 'Events',
+                  title: const Text('Events'),
-              ),
+                ),
-              BottomNavigationBarItem(
+                SalomonBottomBarItem(
-                icon: Icon(Icons.info_outline),
+                  icon: const Icon(FlutterRemix.information_line),
-                label: 'Info',
+                  title: const Text('Info'),
-              ),
+                ),
-            ],
+              ],
-            currentIndex: tabsRouter.activeIndex,
+              currentIndex: tabsRouter.activeIndex,
-            selectedItemColor: Theme.of(context).primaryColor,
+              selectedItemColor: Theme.of(context).primaryColor,
-            unselectedItemColor: Colors.grey[600],
+              unselectedItemColor: Colors.grey[600],
-            onTap: tabsRouter.setActiveIndex,
+              onTap: (index) {
+                if (tabsRouter.activeIndex == index) {
+                  // tabs
+                } else {
+                  tabsRouter.setActiveIndex(index);
+                }
+              },
+            ),
           ),
         );
       },

lib/src/routes/index.dart

@@ -1,21 +1,79 @@
 import 'package:auto_route/auto_route.dart';
+import 'package:flutter/material.dart';
 import 'package:furman_now/src/screens/events/index.dart';
+import 'package:furman_now/src/screens/home/home_header.dart';
 import 'package:furman_now/src/screens/home/index.dart';
+import 'package:furman_now/src/screens/info/contacts.dart';
+import 'package:furman_now/src/screens/info/health_safety.dart';
+import 'package:furman_now/src/screens/info/hours.dart';
 import 'package:furman_now/src/screens/info/index.dart';
+import 'package:furman_now/src/screens/settings/settings.dart';
 import 'package:furman_now/src/screens/map/index.dart';
+import 'package:furman_now/src/screens/map/map_category.dart';
+import 'package:furman_now/src/screens/map/map_home.dart';
 import 'package:furman_now/src/screens/student_id/index.dart';
+import 'package:furman_now/src/utils/hero_empty_router_page.dart';
+import 'package:furman_now/src/utils/translucent_route.dart';
 
 import '../layouts/main/index.dart';
 
+Route<T> mapRouteBuilder<T>(BuildContext context, Widget child, CustomPage<T> page) {
+  return TranslucentRoute(
+    settings: page,
+    transitionDuration: const Duration(milliseconds: 200),
+    transitionBuilder: (context, animation, secondaryAnimation, child) =>
+      FadeTransition(
+        opacity: animation,
+        child: FadeTransition(
+          opacity: secondaryAnimation.drive(Tween<double>(begin: 1, end: 0)),
+          child: child,
+        ),
+      ),
+    pageBuilder: (context, _, __) => child,
+  );
+}
+
 @MaterialAutoRouter(
   replaceInRouteName: 'Screen,Route',
   routes: <AutoRoute>[
     AutoRoute(path: "/", page: MainLayout, children: [
-      AutoRoute(path: "home", page: HomeScreen),
+      AutoRoute(
-      AutoRoute(path: "map", page: MapScreen),
+          path: "home",
-      AutoRoute(path: "student-id", page: StudentIdScreen),
+          name: "HomePageRouter",
+          page: HomeScreenProvider,
+          children: [
+            CustomRoute(
+              path: "",
+              page: HomePageHeader,
+              name: "HomeRoute",
+              transitionsBuilder: TransitionsBuilders.fadeIn,
+            ),
+            CustomRoute(
+              path: "student-id",
+              page: StudentIdScreen,
+              transitionsBuilder: TransitionsBuilders.fadeIn,
+            ),
+          ]),
+      AutoRoute(path: "map", page: MapScreen, children: [
+        CustomRoute(
+          path: "",
+          page: MapHomeScreen,
+          customRouteBuilder: mapRouteBuilder,
+        ),
+        CustomRoute(
+          path: "category/:id",
+          page: MapCategoryScreen,
+          customRouteBuilder: mapRouteBuilder,
+        ),
+      ]),
       AutoRoute(path: "events", page: EventsScreen),
-      AutoRoute(path: "info", page: InfoScreen),
+      AutoRoute(path: "info", name: "InfoPageRouter", page: HeroEmptyRouterPage, children: [
+        AutoRoute(path: "", page: InfoScreen),
+        AutoRoute(path: "health-and-safety", page: HealthSafetyScreen),
+        AutoRoute(path: "contacts", page: ContactsScreen),
+        AutoRoute(path: "hours", page: HoursScreen),
+        AutoRoute(path: "settings", page: SettingsScreen),
+      ]),
     ]),
   ],
 )

lib/src/routes/index.gr.dart

@@ -11,67 +11,153 @@
 // ignore_for_file: type=lint
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
-import 'package:auto_route/auto_route.dart' as _i7;
+import 'package:auto_route/auto_route.dart' as _i15;
-import 'package:flutter/material.dart' as _i8;
+import 'package:flutter/material.dart' as _i16;
 
 import '../layouts/main/index.dart' as _i1;
-import '../screens/events/index.dart' as _i5;
+import '../screens/events/index.dart' as _i4;
+import '../screens/home/home_header.dart' as _i6;
 import '../screens/home/index.dart' as _i2;
-import '../screens/info/index.dart' as _i6;
+import '../screens/info/contacts.dart' as _i12;
+import '../screens/info/health_safety.dart' as _i11;
+import '../screens/info/hours.dart' as _i13;
+import '../screens/info/index.dart' as _i10;
 import '../screens/map/index.dart' as _i3;
-import '../screens/student_id/index.dart' as _i4;
+import '../screens/map/map_category.dart' as _i9;
+import '../screens/map/map_home.dart' as _i8;
+import '../screens/map/state.dart' as _i18;
+import '../screens/settings/settings.dart' as _i14;
+import '../screens/student_id/index.dart' as _i7;
+import '../utils/hero_empty_router_page.dart' as _i5;
+import 'index.dart' as _i17;
 
-class AppRouter extends _i7.RootStackRouter {
+class AppRouter extends _i15.RootStackRouter {
-  AppRouter([_i8.GlobalKey<_i8.NavigatorState>? navigatorKey])
+  AppRouter([_i16.GlobalKey<_i16.NavigatorState>? navigatorKey])
       : super(navigatorKey);
 
   @override
-  final Map<String, _i7.PageFactory> pagesMap = {
+  final Map<String, _i15.PageFactory> pagesMap = {
     MainLayout.name: (routeData) {
-      return _i7.MaterialPageX<dynamic>(
+      return _i15.MaterialPageX<dynamic>(
           routeData: routeData, child: const _i1.MainLayout());
     },
-    HomeRoute.name: (routeData) {
+    HomePageRouter.name: (routeData) {
-      return _i7.MaterialPageX<dynamic>(
+      return _i15.MaterialPageX<dynamic>(
-          routeData: routeData, child: const _i2.HomeScreen());
+          routeData: routeData, child: _i2.HomeScreenProvider());
     },
     MapRoute.name: (routeData) {
-      return _i7.MaterialPageX<dynamic>(
+      return _i15.MaterialPageX<dynamic>(
           routeData: routeData, child: const _i3.MapScreen());
     },
-    StudentIdRoute.name: (routeData) {
-      return _i7.MaterialPageX<dynamic>(
-          routeData: routeData, child: const _i4.StudentIdScreen());
-    },
     EventsRoute.name: (routeData) {
-      return _i7.MaterialPageX<dynamic>(
+      return _i15.MaterialPageX<dynamic>(
-          routeData: routeData, child: const _i5.EventsScreen());
+          routeData: routeData, child: const _i4.EventsScreen());
+    },
+    InfoPageRouter.name: (routeData) {
+      return _i15.MaterialPageX<dynamic>(
+          routeData: routeData, child: const _i5.HeroEmptyRouterPage());
+    },
+    HomeRoute.name: (routeData) {
+      return _i15.CustomPage<dynamic>(
+          routeData: routeData,
+          child: const _i6.HomePageHeader(),
+          transitionsBuilder: _i15.TransitionsBuilders.fadeIn,
+          opaque: true,
+          barrierDismissible: false);
+    },
+    StudentIdRoute.name: (routeData) {
+      return _i15.CustomPage<dynamic>(
+          routeData: routeData,
+          child: const _i7.StudentIdScreen(),
+          transitionsBuilder: _i15.TransitionsBuilders.fadeIn,
+          opaque: true,
+          barrierDismissible: false);
+    },
+    MapHomeRoute.name: (routeData) {
+      return _i15.CustomPage<dynamic>(
+          routeData: routeData,
+          child: const _i8.MapHomeScreen(),
+          customRouteBuilder: _i17.mapRouteBuilder,
+          opaque: true,
+          barrierDismissible: false);
+    },
+    MapCategoryRoute.name: (routeData) {
+      final args = routeData.argsAs<MapCategoryRouteArgs>();
+      return _i15.CustomPage<dynamic>(
+          routeData: routeData,
+          child: _i9.MapCategoryScreen(category: args.category, key: args.key),
+          customRouteBuilder: _i17.mapRouteBuilder,
+          opaque: true,
+          barrierDismissible: false);
     },
     InfoRoute.name: (routeData) {
-      return _i7.MaterialPageX<dynamic>(
+      return _i15.MaterialPageX<dynamic>(
-          routeData: routeData, child: const _i6.InfoScreen());
+          routeData: routeData, child: const _i10.InfoScreen());
+    },
+    HealthSafetyRoute.name: (routeData) {
+      return _i15.MaterialPageX<dynamic>(
+          routeData: routeData, child: const _i11.HealthSafetyScreen());
+    },
+    ContactsRoute.name: (routeData) {
+      return _i15.MaterialPageX<dynamic>(
+          routeData: routeData, child: const _i12.ContactsScreen());
+    },
+    HoursRoute.name: (routeData) {
+      return _i15.MaterialPageX<dynamic>(
+          routeData: routeData, child: const _i13.HoursScreen());
+    },
+    SettingsRoute.name: (routeData) {
+      return _i15.MaterialPageX<dynamic>(
+          routeData: routeData, child: const _i14.SettingsScreen());
     }
   };
 
   @override
-  List<_i7.RouteConfig> get routes => [
+  List<_i15.RouteConfig> get routes => [
-        _i7.RouteConfig(MainLayout.name, path: '/', children: [
+        _i15.RouteConfig(MainLayout.name, path: '/', children: [
-          _i7.RouteConfig(HomeRoute.name,
+          _i15.RouteConfig(HomePageRouter.name,
-              path: 'home', parent: MainLayout.name),
+              path: 'home',
-          _i7.RouteConfig(MapRoute.name, path: 'map', parent: MainLayout.name),
+              parent: MainLayout.name,
-          _i7.RouteConfig(StudentIdRoute.name,
+              children: [
-              path: 'student-id', parent: MainLayout.name),
+                _i15.RouteConfig(HomeRoute.name,
-          _i7.RouteConfig(EventsRoute.name,
+                    path: '', parent: HomePageRouter.name),
+                _i15.RouteConfig(StudentIdRoute.name,
+                    path: 'student-id', parent: HomePageRouter.name)
+              ]),
+          _i15.RouteConfig(MapRoute.name,
+              path: 'map',
+              parent: MainLayout.name,
+              children: [
+                _i15.RouteConfig(MapHomeRoute.name,
+                    path: '', parent: MapRoute.name),
+                _i15.RouteConfig(MapCategoryRoute.name,
+                    path: 'category/:id', parent: MapRoute.name)
+              ]),
+          _i15.RouteConfig(EventsRoute.name,
               path: 'events', parent: MainLayout.name),
-          _i7.RouteConfig(InfoRoute.name, path: 'info', parent: MainLayout.name)
+          _i15.RouteConfig(InfoPageRouter.name,
+              path: 'info',
+              parent: MainLayout.name,
+              children: [
+                _i15.RouteConfig(InfoRoute.name,
+                    path: '', parent: InfoPageRouter.name),
+                _i15.RouteConfig(HealthSafetyRoute.name,
+                    path: 'health-and-safety', parent: InfoPageRouter.name),
+                _i15.RouteConfig(ContactsRoute.name,
+                    path: 'contacts', parent: InfoPageRouter.name),
+                _i15.RouteConfig(HoursRoute.name,
+                    path: 'hours', parent: InfoPageRouter.name),
+                _i15.RouteConfig(SettingsRoute.name,
+                    path: 'settings', parent: InfoPageRouter.name)
+              ])
         ])
       ];
 }
 
 /// generated route for
 /// [_i1.MainLayout]
-class MainLayout extends _i7.PageRouteInfo<void> {
+class MainLayout extends _i15.PageRouteInfo<void> {
-  const MainLayout({List<_i7.PageRouteInfo>? children})
+  const MainLayout({List<_i15.PageRouteInfo>? children})
       : super(MainLayout.name, path: '/', initialChildren: children);
 
   static const String name = 'MainLayout';
@@ -79,40 +165,124 @@ class MainLayout extends _i7.PageRouteInfo<void> {
 
 /// generated route for
 /// [_i2.HomeScreen]
-class HomeRoute extends _i7.PageRouteInfo<void> {
+class HomePageRouter extends _i15.PageRouteInfo<void> {
-  const HomeRoute() : super(HomeRoute.name, path: 'home');
+  const HomePageRouter({List<_i15.PageRouteInfo>? children})
+      : super(HomePageRouter.name, path: 'home', initialChildren: children);
 
-  static const String name = 'HomeRoute';
+  static const String name = 'HomePageRouter';
 }
 
 /// generated route for
 /// [_i3.MapScreen]
-class MapRoute extends _i7.PageRouteInfo<void> {
+class MapRoute extends _i15.PageRouteInfo<void> {
-  const MapRoute() : super(MapRoute.name, path: 'map');
+  const MapRoute({List<_i15.PageRouteInfo>? children})
+      : super(MapRoute.name, path: 'map', initialChildren: children);
 
   static const String name = 'MapRoute';
 }
 
 /// generated route for
-/// [_i4.StudentIdScreen]
+/// [_i4.EventsScreen]
-class StudentIdRoute extends _i7.PageRouteInfo<void> {
+class EventsRoute extends _i15.PageRouteInfo<void> {
-  const StudentIdRoute() : super(StudentIdRoute.name, path: 'student-id');
-
-  static const String name = 'StudentIdRoute';
-}
-
-/// generated route for
-/// [_i5.EventsScreen]
-class EventsRoute extends _i7.PageRouteInfo<void> {
   const EventsRoute() : super(EventsRoute.name, path: 'events');
 
   static const String name = 'EventsRoute';
 }
 
 /// generated route for
-/// [_i6.InfoScreen]
+/// [_i5.HeroEmptyRouterPage]
-class InfoRoute extends _i7.PageRouteInfo<void> {
+class InfoPageRouter extends _i15.PageRouteInfo<void> {
-  const InfoRoute() : super(InfoRoute.name, path: 'info');
+  const InfoPageRouter({List<_i15.PageRouteInfo>? children})
+      : super(InfoPageRouter.name, path: 'info', initialChildren: children);
+
+  static const String name = 'InfoPageRouter';
+}
+
+/// generated route for
+/// [_i6.HomePageHeader]
+class HomeRoute extends _i15.PageRouteInfo<void> {
+  const HomeRoute() : super(HomeRoute.name, path: '');
+
+  static const String name = 'HomeRoute';
+}
+
+/// generated route for
+/// [_i7.StudentIdScreen]
+class StudentIdRoute extends _i15.PageRouteInfo<void> {
+  const StudentIdRoute() : super(StudentIdRoute.name, path: 'student-id');
+
+  static const String name = 'StudentIdRoute';
+}
+
+/// generated route for
+/// [_i8.MapHomeScreen]
+class MapHomeRoute extends _i15.PageRouteInfo<void> {
+  const MapHomeRoute() : super(MapHomeRoute.name, path: '');
+
+  static const String name = 'MapHomeRoute';
+}
+
+/// generated route for
+/// [_i9.MapCategoryScreen]
+class MapCategoryRoute extends _i15.PageRouteInfo<MapCategoryRouteArgs> {
+  MapCategoryRoute({required _i18.MapCategory category, _i16.Key? key})
+      : super(MapCategoryRoute.name,
+            path: 'category/:id',
+            args: MapCategoryRouteArgs(category: category, key: key));
+
+  static const String name = 'MapCategoryRoute';
+}
+
+class MapCategoryRouteArgs {
+  const MapCategoryRouteArgs({required this.category, this.key});
+
+  final _i18.MapCategory category;
+
+  final _i16.Key? key;
+
+  @override
+  String toString() {
+    return 'MapCategoryRouteArgs{category: $category, key: $key}';
+  }
+}
+
+/// generated route for
+/// [_i10.InfoScreen]
+class InfoRoute extends _i15.PageRouteInfo<void> {
+  const InfoRoute() : super(InfoRoute.name, path: '');
 
   static const String name = 'InfoRoute';
 }
+
+/// generated route for
+/// [_i11.HealthSafetyScreen]
+class HealthSafetyRoute extends _i15.PageRouteInfo<void> {
+  const HealthSafetyRoute()
+      : super(HealthSafetyRoute.name, path: 'health-and-safety');
+
+  static const String name = 'HealthSafetyRoute';
+}
+
+/// generated route for
+/// [_i12.ContactsScreen]
+class ContactsRoute extends _i15.PageRouteInfo<void> {
+  const ContactsRoute() : super(ContactsRoute.name, path: 'contacts');
+
+  static const String name = 'ContactsRoute';
+}
+
+/// generated route for
+/// [_i13.HoursScreen]
+class HoursRoute extends _i15.PageRouteInfo<void> {
+  const HoursRoute() : super(HoursRoute.name, path: 'hours');
+
+  static const String name = 'HoursRoute';
+}
+
+/// generated route for
+/// [_i14.SettingsScreen]
+class SettingsRoute extends _i15.PageRouteInfo<void> {
+  const SettingsRoute() : super(SettingsRoute.name, path: 'settings');
+
+  static const String name = 'SettingsRoute';
+}

lib/src/screens/events/index.dart

@@ -1,4 +1,6 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_remix/flutter_remix.dart';
+import 'package:furman_now/src/layouts/app_page.dart';
 import 'package:furman_now/src/utils/date_range.dart';
 import 'package:furman_now/src/utils/theme.dart';
 import 'package:furman_now/src/widgets/header.dart';
@@ -11,98 +13,56 @@ class EventsScreen extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return AppPageLayout(
-      body: Container(
+      title: "Events",
-        color: Colors.grey[100],
+      icon: FlutterRemix.calendar_line,
-        child: SafeArea(
+      content: Padding(
-          child: Stack(
+        padding: const EdgeInsets.symmetric(vertical: 20),
-            fit: StackFit.loose,
+        child: Column(
-            children: [
+          crossAxisAlignment: CrossAxisAlignment.start,
-              SizedBox(
+          children: [
-                width: double.infinity,
+            const HeaderWidget(title: "Today"),
-                height: double.infinity,
+            Padding(
-                child: Align(
+                padding: const EdgeInsets.symmetric(horizontal: 20),
-                  alignment: Alignment.topLeft,
+                child: EventsList()
-                  child: Container(
+            ),
-                    padding: const EdgeInsets.symmetric(horizontal: 30),
+            const HeaderWidget(title: "Tomorrow"),
-                    width: double.infinity,
+            Padding(
-                    height: 100,
+              padding: const EdgeInsets.symmetric(horizontal: 20),
-                    child: Column(
+              child: EventsList(dateRange: constructDateRange(
-                      mainAxisAlignment: MainAxisAlignment.center,
+                DateTime.now().add(const Duration(days: 1)),
-                      crossAxisAlignment: CrossAxisAlignment.start,
+                DateTime.now().add(const Duration(days: 1)),
-                      children: [
+              )),
-                        Wrap(
+            ),
-                          crossAxisAlignment: WrapCrossAlignment.center,
+            ...[for(var i=2; i<7; i+=1) i].map((i) {
-                          children: [
+              var date = DateTime.now().add(Duration(days: i));
-                            Icon(Icons.calendar_month_outlined, size: 35, color: Colors.grey[700]),
+              var dayName = DateFormat('EEEE').format(date);
-                            const SizedBox(width: 12),
+              return Wrap(
-                            Text("Events", style: furmanTextStyle(TextStyle(color: Colors.grey[900], fontSize: 28, fontWeight: FontWeight.w700))),
+                children: [
-                          ],
+                  HeaderWidget(title: dayName),
-                        ),
+                  Padding(
-                      ],
+                    padding: const EdgeInsets.symmetric(horizontal: 20),
-                    ),
+                    child: EventsList(dateRange: constructDateRange(
+                      date,
+                      date,
+                    )),
                   ),
-                ),
+                ],
-              ),
+              );
-              ScrollViewWithHeight(
+            }),
-                child: Container(
+            Center(child:
-                  decoration: const BoxDecoration(
+            Wrap(
-                    color: Colors.white,
+              direction: Axis.vertical,
-                    borderRadius: BorderRadius.vertical(top: Radius.circular(30)),
+              crossAxisAlignment: WrapCrossAlignment.center,
-                  ),
+              children: const [
-                  padding: const EdgeInsets.symmetric(vertical: 20),
+                Text("Need more events?"),
-                  margin: const EdgeInsets.only(top: 100),
+                Text("Syncdin"),
-                  width: double.infinity,
+                Text("Athletics"),
-                  child: Column(
+                Text("CLPs"),
-                    crossAxisAlignment: CrossAxisAlignment.start,
+              ],
-                    children: [
+            ),
-                      const HeaderWidget(title: "Today"),
+            ),
-                      Padding(
+          ],
-                        padding: const EdgeInsets.symmetric(horizontal: 20),
-                        child: EventsList()
-                      ),
-                      const HeaderWidget(title: "Tomorrow"),
-                      Padding(
-                          padding: const EdgeInsets.symmetric(horizontal: 20),
-                          child: EventsList(dateRange: constructDateRange(
-                            DateTime.now().add(const Duration(days: 1)),
-                            DateTime.now().add(const Duration(days: 1)),
-                          )),
-                      ),
-                      ...[for(var i=2; i<7; i+=1) i].map((i) {
-                        var date = DateTime.now().add(Duration(days: i));
-                        var dayName = DateFormat('EEEE').format(date);
-                        return Wrap(
-                          children: [
-                            HeaderWidget(title: dayName),
-                            Padding(
-                              padding: const EdgeInsets.symmetric(horizontal: 20),
-                              child: EventsList(dateRange: constructDateRange(
-                                date,
-                                date,
-                              )),
-                            ),
-                          ],
-                        );
-                      }),
-                      Center(child:
-                        Wrap(
-                          direction: Axis.vertical,
-                          crossAxisAlignment: WrapCrossAlignment.center,
-                          children: const [
-                            Text("Need more events?"),
-                            Text("Syncdin"),
-                            Text("Athletics"),
-                            Text("CLPs"),
-                          ],
-                        ),
-                      ),
-                    ],
-                  ),
-                ),
-              ),
-            ],
-          ),
         ),
       ),
     );

lib/src/screens/home/content.dart

@@ -0,0 +1,111 @@
+import 'package:flutter/material.dart';
+import 'package:furman_now/src/routes/index.gr.dart';
+import 'package:furman_now/src/widgets/events/events_list.dart';
+import 'package:furman_now/src/widgets/header.dart';
+import 'package:furman_now/src/widgets/home/restaurants/restaurants_list.dart';
+import 'package:furman_now/src/widgets/home/transportation/transportation_card.dart';
+import 'package:furman_now/src/widgets/scroll_view_height.dart';
+
+class HomeContent extends StatefulWidget {
+  final bool collapse;
+  final ScrollController controller;
+
+  const HomeContent({
+    required this.collapse,
+    required this.controller,
+    Key? key,
+  }) : super(key: key);
+
+  @override
+  State<HomeContent> createState() => _HomeContentState();
+}
+
+class _HomeContentState extends State<HomeContent> {
+  bool _collapse = false;
+
+  @override
+  Widget build(BuildContext context) {
+    if (widget.collapse != _collapse) {
+      widget.controller.animateTo(
+        0,
+        duration: const Duration(milliseconds: 400),
+        curve: Curves.easeInOut,
+      );
+      _collapse = widget.collapse;
+    }
+
+    return LayoutBuilder(
+      builder: (context, constraints) => ScrollViewWithHeight(
+        controller: widget.controller,
+        child: Align(
+          alignment: Alignment.bottomCenter,
+          child: TweenAnimationBuilder<double>(
+            tween: widget.collapse
+              ? Tween<double>(begin: 200, end: constraints.maxHeight - 75)
+              : Tween<double>(begin: constraints.maxHeight - 75, end: 200),
+            curve: Curves.easeInOut,
+            duration: const Duration(milliseconds: 200),
+            builder: (context, margin, _) => Stack(
+              children: [
+                Container(
+                  decoration: const BoxDecoration(
+                    color: Colors.white,
+                    borderRadius:
+                      BorderRadius.vertical(
+                        top: Radius.circular(30),
+                        bottom: Radius.circular(30),
+                      ),
+                  ),
+                  padding: const EdgeInsets.only(bottom: 15),
+                  margin: EdgeInsets.only(top: margin),
+                  width: double.infinity,
+                  constraints: BoxConstraints(
+                    minHeight: constraints.maxHeight - margin,
+                  ),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      AnimatedContainer(
+                        duration: const Duration(milliseconds: 300),
+                        height: widget.collapse ? 55 : 0,
+                        child: Align(
+                          alignment: Alignment.topCenter,
+                          child: Container(
+                              margin: const EdgeInsets.symmetric(vertical: 15),
+                              width: 60,
+                              height: 5,
+                              decoration: BoxDecoration(
+                                color: Colors.grey[300],
+                                borderRadius: BorderRadius.circular(20),
+                              )
+                          ),
+                        ),
+                      ),
+                      const SizedBox(height: 20),
+                      const HeaderWidget(
+                        title: "Upcoming Events",
+                        link:
+                            HeaderLink(text: "View more", href: EventsRoute()),
+                      ),
+                      Padding(
+                        padding: const EdgeInsets.symmetric(horizontal: 20),
+                        child: EventsList(limit: 3),
+                      ),
+                      const HeaderWidget(title: "Food & Dining"),
+                      const RestaurantsList(),
+                      const HeaderWidget(title: "Transportation"),
+                      const Padding(
+                        padding: EdgeInsets.symmetric(horizontal: 20),
+                        child: TransportationCard(),
+                      ),
+                    ],
+                  ),
+                ),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/src/screens/home/home_header.dart

@@ -0,0 +1,93 @@
+import 'package:flutter/material.dart';
+import 'package:furman_now/src/screens/home/state.dart';
+import 'package:furman_now/src/services/weather/weather_service.dart';
+import 'package:furman_now/src/utils/greeting.dart';
+import 'package:furman_now/src/utils/theme.dart';
+import 'package:provider/provider.dart';
+
+class HomePageHeader extends StatelessWidget {
+  const HomePageHeader({ Key? key }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      width: double.infinity,
+      height: 300,
+      decoration: const BoxDecoration(
+        gradient: LinearGradient(
+          begin: Alignment.topCenter,
+          end: Alignment.bottomCenter,
+          colors: <Color>[
+            Color(0xffb7acc9),
+            Color(0xffb7acc9),
+          ],
+          tileMode: TileMode.mirror,
+        ),
+      ),
+      child: Align(
+        alignment: Alignment.topLeft,
+        child: Container(
+          padding: const EdgeInsets.all(40),
+          width: double.infinity,
+          height: 200,
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.center,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Hero(
+                tag: "title",
+                child: Material(
+                  type: MaterialType.transparency,
+                  child: Text(
+                    "${greeting()},\nMichael",
+                    style: furmanTextStyle(const TextStyle(
+                      color: Color(0xff26183d),
+                      fontSize: 36,
+                      fontWeight: FontWeight.w800,
+                      height: 1.2,
+                    )),
+                  ),
+                ),
+              ),
+              const SizedBox(height: 8),
+              Consumer<HomePageState>(
+                builder: (context, state, _) => AnimatedCrossFade(
+                  crossFadeState:
+                    state.showScrollMessage
+                      ? CrossFadeState.showSecond
+                      : CrossFadeState.showFirst,
+                  duration: const Duration(milliseconds: 100),
+                  firstChild: FutureBuilder<String>(
+                    future: WeatherService.getWeatherMessage(),
+                    builder: (context, snapshot) {
+                      if(snapshot.hasData) {
+                        return Text(
+                          snapshot.data!,
+                          // "It's 76º and partly cloudy",
+                          style: furmanTextStyle(const TextStyle
+                          (
+                            color: Color(0xff26183d),
+                            fontSize: 16,
+                            fontWeight: FontWeight.w500,
+                          )),
+                        );
+                      }
+                      return const SizedBox(height: 0);
+                    }
+                  ),
+                  secondChild: Text("Pull down to view your Meal ID",
+                    style: furmanTextStyle(const TextStyle(
+                        color: Color(0xff26183d),
+                        fontSize: 16,
+                        fontWeight: FontWeight.w500
+                    )),
+                  ),
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/src/screens/home/index.dart

@@ -1,91 +1,143 @@
+import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:furman_now/src/routes/index.gr.dart';
-import 'package:furman_now/src/utils/greeting.dart';
+import 'package:furman_now/src/screens/home/content.dart';
+import 'package:furman_now/src/screens/home/state.dart';
 import 'package:furman_now/src/utils/theme.dart';
-import 'package:furman_now/src/widgets/header.dart';
+import 'package:provider/provider.dart';
-import 'package:furman_now/src/widgets/events/events_list.dart';
-import 'package:furman_now/src/widgets/home/restaurants/restaurants_list.dart';
-import 'package:furman_now/src/widgets/home/transportation/transportation_card.dart';
-import 'package:furman_now/src/widgets/scroll_view_height.dart';
 
-class HomeScreen extends StatelessWidget {
+class HomeScreenProvider extends StatelessWidget {
+  const HomeScreenProvider({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return ChangeNotifierProvider(
+      create: (context) => HomePageState(),
+      child: const HomeScreen(),
+    );
+  }
+}
+
+class HomeScreen extends StatefulWidget {
   const HomeScreen({Key? key}) : super(key: key);
 
+  @override
+  State<HomeScreen> createState() => _HomeScreenState();
+}
+
+class _HomeScreenState extends State<HomeScreen> {
+  final ScrollController _controller = ScrollController();
+
+  double overscrollTopAmount = 0;
+  double overscrollBottomAmount = 0;
+
+  @override
+  void initState() {
+    super.initState();
+
+    _controller.addListener(updateScrollPosition);
+  }
+
+  updateScrollPosition() {
+    // bottom overscroll
+    var bottomOverscroll =
+        _controller.position.pixels - _controller.position.maxScrollExtent;
+    if (bottomOverscroll > 0) {
+      setState(() {
+        overscrollBottomAmount = bottomOverscroll;
+      });
+    } else {
+      if (overscrollBottomAmount != 0) {
+        setState(() {
+          overscrollBottomAmount = 0;
+        });
+      }
+    }
+
+    // top overscroll
+    var topOverscroll = -_controller.position.pixels;
+    if (topOverscroll > 0) {
+      setState(() {
+        overscrollTopAmount = topOverscroll;
+      });
+    } else {
+      if (overscrollTopAmount != 0) {
+        setState(() {
+          overscrollTopAmount = 0;
+        });
+      }
+    }
+
+    handleTopOverscroll(topOverscroll);
+  }
+
+  handleTopOverscroll(double overscrollTopAmount) {
+    const scrollMessageSensitivity = 20;
+    const pageSwitchSensitivity = 60;
+    var collapsed = context.read<HomePageState>().collapse;
+
+    if (!collapsed) {
+      if (overscrollTopAmount > pageSwitchSensitivity) {
+        // switch to student ID page
+        context.router.navigate(const StudentIdRoute());
+        context.read<HomePageState>().collapse = true;
+      } else if (overscrollTopAmount > scrollMessageSensitivity) {
+        // show student ID hint
+        context.read<HomePageState>().showScrollMessage = true;
+      } else {
+        // hide student ID hint
+        context.read<HomePageState>().showScrollMessage = false;
+      }
+    }
+
+    if (collapsed && -overscrollTopAmount > pageSwitchSensitivity) {
+      // switch back to home page
+      context.router.navigate(const HomeRoute());
+      context.read<HomePageState>().collapse = false;
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      body: Container(
+      body: AnnotatedRegion<SystemUiOverlayStyle>(
-        color: const Color(0xffb7acc9),
+        value: constructOverlayStyle(),
-        child: SafeArea(
+        child: Container(
-          child: Container(
+          color: const Color(0xffb7acc9),
-            color: Colors.grey[100],
+          child: SafeArea(
-            child: Stack(
+            child: Container(
-              fit: StackFit.loose,
+              color: const Color(0xffb7acc9),
-              children: [
+              child: Stack(
-                Container(
+                fit: StackFit.loose,
-                  width: double.infinity,
+                children: [
-                  height: double.infinity,
+                  const AutoTabsRouter(
-                  decoration: const BoxDecoration(
+                    routes: [
-                    gradient: LinearGradient(
+                      HomeRoute(),
-                      begin: Alignment.topCenter,
+                      StudentIdRoute(),
-                      end: Alignment.bottomCenter,
+                    ],
-                      colors: <Color>[
-                        Color(0xffb7acc9),
-                        Color(0xffb7acc9),
-                      ], // Gradient from https://learnui.design/tools/gradient-generator.html
-                      tileMode: TileMode.mirror,
-                    ),
                   ),
-                  child: Align(
+                  // overscroll indicator color
-                    alignment: Alignment.topLeft,
+                  Align(
+                    alignment: Alignment.bottomCenter,
                     child: Container(
-                      padding: const EdgeInsets.all(40),
+                      height: overscrollBottomAmount + 30,
-                      width: double.infinity,
+                      decoration: BoxDecoration(
-                      height: 200,
+                        color: Colors.grey.shade50,
-                      child: Column(
+                        border: Border.all(width: 0, color: Colors.white),
-                        mainAxisAlignment: MainAxisAlignment.center,
-                        crossAxisAlignment: CrossAxisAlignment.start,
-                        children: [
-                          Text("${greeting()},\nMichael", style: furmanTextStyle(const TextStyle(color: Color(0xff26183d), fontSize: 36, fontWeight: FontWeight.w800))),
-                          const SizedBox(height: 5),
-                          Text("It's 76º and partly cloudy", style: furmanTextStyle(const TextStyle(color: Color(0xff26183d), fontSize: 16, fontWeight: FontWeight.w500))),
-                        ],
                       ),
                     ),
                   ),
-                ),
+                  Consumer<HomePageState>(
-                ScrollViewWithHeight(
+                    builder: (context, state, _) =>
-                  child: Container(
+                      ClipRect(child: HomeContent(
-                    decoration: const BoxDecoration(
+                        controller: _controller,
-                      color: Colors.white,
+                        collapse: state.collapse,
-                      borderRadius: BorderRadius.vertical(top: Radius.circular(30)),
+                      ),
-                    ),
-                    padding: const EdgeInsets.symmetric(vertical: 20),
-                    margin: const EdgeInsets.only(top: 200),
-                    width: double.infinity,
-                    child: Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        const HeaderWidget(
-                          title: "Today's Events",
-                          link: HeaderLink(text: "View more", href: EventsRoute()),
-                        ),
-                        Padding(
-                          padding: const EdgeInsets.symmetric(horizontal: 20),
-                          child: EventsList(),
-                        ),
-                        const HeaderWidget(title: "Food & Dining"),
-                        const RestaurantsList(),
-                        const HeaderWidget(title: "Transportation"),
-                        const Padding(
-                          padding: EdgeInsets.symmetric(horizontal: 20),
-                          child: TransportationCard(),
-                        ),
-                      ],
                     ),
                   ),
-                ),
+                ],
-              ],
+              ),
             ),
           ),
         ),
@@ -93,4 +145,3 @@ class HomeScreen extends StatelessWidget {
     );
   }
 }
-

lib/src/screens/home/state.dart

@@ -0,0 +1,22 @@
+import 'package:flutter/material.dart';
+
+class HomePageState extends ChangeNotifier {
+  bool _showScrollMessage = false;
+  bool _collapse = false;
+
+  bool get showScrollMessage { return _showScrollMessage; }
+  set showScrollMessage(bool value) {
+    if (value != _showScrollMessage) {
+      _showScrollMessage = value;
+      notifyListeners();
+    }
+  }
+
+  bool get collapse { return _collapse; }
+  set collapse(bool value) {
+    if (value != _collapse) {
+      _collapse = value;
+      notifyListeners();
+    }
+  }
+}

lib/src/screens/info/contacts.dart

@@ -0,0 +1,63 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_remix/flutter_remix.dart';
+import 'package:furman_now/src/layouts/app_page.dart';
+import 'package:furman_now/src/services/info/contacts_service.dart';
+import 'package:furman_now/src/widgets/info/info_card.dart';
+
+class ContactsScreen extends StatelessWidget {
+  const ContactsScreen({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return AppPageLayout(
+        title: "Contacts",
+        icon: FlutterRemix.arrow_left_line,
+        backgroundColor: Colors.deepPurple.shade50,
+        iconTapAction: () => context.router.pop(),
+        content: Padding(
+          padding: const EdgeInsets.all(20),
+          child: FutureBuilder<Iterable<ContactInfo>>(
+            future: ContactsService.fetchContactInfo(),
+            builder: (context, snapshot) {
+              if (snapshot.hasData) {
+                var items = snapshot.data!;
+                return Column(
+                    children: items.map((item) {
+                      return Padding(
+                        padding: const EdgeInsets.only(bottom: 15),
+                        child: InfoCard(
+                          title: item.name,
+                          icon: item.buildingId != 0
+                              ? FlutterRemix.building_line
+                              : FlutterRemix.contacts_line,
+                          items: [
+                            InfoCardItem(
+                              name: item.phone,
+                              icon: FlutterRemix.phone_line
+                            ),
+                          ],
+                          onClick: () => item.launch(),
+                        ),
+                      );
+                    }).toList());
+              }
+              else if (snapshot.hasError) {
+                return Text(
+                  '${snapshot.error}',
+                  style: const TextStyle(color: Colors.red)
+                );
+              }
+              // By default, show a loading spinner.
+              return const Center(
+                child: Padding(
+                    padding: EdgeInsets.symmetric(vertical: 25),
+                    child: CircularProgressIndicator()
+                ),
+              );
+            },
+          ),
+        )
+    );
+  }
+}

lib/src/screens/info/health_safety.dart

@@ -0,0 +1,82 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_remix/flutter_remix.dart';
+import 'package:furman_now/src/layouts/app_page.dart';
+import 'package:furman_now/src/services/info/health_safety_service.dart';
+import 'package:furman_now/src/widgets/info/info_card.dart';
+
+class HealthSafetyScreen extends StatelessWidget {
+  const HealthSafetyScreen({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return AppPageLayout(
+      title: "Health and Safety",
+      icon: FlutterRemix.arrow_left_line,
+      backgroundColor: Colors.red.shade50,
+      iconTapAction: () => context.router.pop(),
+      content: Padding(
+        padding: const EdgeInsets.all(20),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Center(
+              child: Padding(
+                padding: const EdgeInsets.only(top: 15, bottom: 35),
+                child: Text(
+                  "If you are in an emergency, dial 911",
+                  style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                    color: Colors.red.shade800,
+                  ),
+                ),
+              ),
+            ),
+            FutureBuilder<Iterable<HealthSafetyInfo>>(
+              future: HealthSafetyService.fetchHealthSafetyInfo(),
+              builder: (context, snapshot) {
+                if (snapshot.hasData) {
+                  var items = snapshot.data!.where((item) =>
+                    item.type != HealthSafetyInfoType.removed
+                  );
+                  var iconMap = {
+                    HealthSafetyInfoType.phone: FlutterRemix.phone_line,
+                    HealthSafetyInfoType.link: FlutterRemix.external_link_line,
+                    HealthSafetyInfoType.app: FlutterRemix.apps_line,
+                  };
+                  return Column(
+                    children: items.map((item) {
+                      return Padding(
+                        padding: const EdgeInsets.only(bottom: 15),
+                        child: InfoCard(
+                          title: item.name,
+                          icon: item.icon,
+                          items: [
+                            InfoCardItem(
+                              name: item.linkText,
+                              icon: iconMap[item.type] ?? FlutterRemix.link
+                            ),
+                          ],
+                          onClick: () => item.launch(),
+                        ),
+                      );
+                    }).toList());
+                }
+                else if (snapshot.hasError) {
+                  return Text(
+                    '${snapshot.error}', style: const TextStyle(color: Colors.red),);
+                }
+                // By default, show a loading spinner.
+                return const Center(
+                  child: Padding(
+                      padding: EdgeInsets.symmetric(vertical: 25),
+                      child: CircularProgressIndicator()
+                  ),
+                );
+              },
+            ),
+          ],
+        ),
+      )
+    );
+  }
+}

lib/src/screens/info/hours.dart

@@ -0,0 +1,72 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_remix/flutter_remix.dart';
+import 'package:furman_now/src/layouts/app_page.dart';
+import 'package:furman_now/src/services/buildings/buildings_service.dart';
+import 'package:furman_now/src/store/index.dart';
+import 'package:furman_now/src/widgets/info/info_card.dart';
+import 'package:provider/provider.dart';
+
+class HoursScreen extends StatelessWidget {
+  const HoursScreen({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return AppPageLayout(
+      title: "Hours",
+      icon: FlutterRemix.arrow_left_line,
+      backgroundColor: Colors.blue.shade50,
+      iconTapAction: () => context.router.pop(),
+      content: Padding(
+        padding: const EdgeInsets.all(20),
+        child: Consumer<AppState>(
+          builder: (context, state, _) {
+            return FutureBuilder<Iterable<Building>>(
+              future: state.buildings,
+              builder: (context, snapshot) {
+                if (snapshot.hasData) {
+                  var items = snapshot.data!.where(
+                    (building) => building.hoursList.isNotEmpty
+                  );
+                  return Column(
+                    children: items.map((item) {
+                      return Padding(
+                        padding: const EdgeInsets.only(bottom: 15),
+                        child: InfoCard(
+                          title: item.name,
+                          icon: FlutterRemix.building_line,
+                          items: item.hoursList.map((hours) =>
+                            InfoCardItem(
+                              name: ""
+                                "${hours.daysOfWeek} from "
+                                "${hours.startTime.format(context)} - "
+                                "${hours.endTime.format(context)}",
+                              icon: FlutterRemix.time_line,
+                            ),
+                          ).toList(),
+                        ),
+                      );
+                    }).toList(),
+                  );
+                }
+                else if (snapshot.hasError) {
+                  return Text(
+                    '${snapshot.error}',
+                    style: const TextStyle(color: Colors.red),
+                  );
+                }
+                // By default, show a loading spinner.
+                return const Center(
+                  child: Padding(
+                      padding: EdgeInsets.symmetric(vertical: 25),
+                      child: CircularProgressIndicator()
+                  ),
+                );
+              },
+            );
+          }
+        ),
+      ),
+    );
+  }
+}

lib/src/screens/info/index.dart

@@ -1,84 +1,64 @@
+import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
-import 'package:furman_now/src/utils/theme.dart';
+import 'package:flutter_remix/flutter_remix.dart';
-import 'package:furman_now/src/widgets/info/info_card.dart';
+import 'package:furman_now/src/layouts/app_page.dart';
-import 'package:furman_now/src/widgets/scroll_view_height.dart';
+import 'package:furman_now/src/routes/index.gr.dart';
+import 'package:furman_now/src/widgets/info/info_category_card.dart';
 
 class InfoScreen extends StatelessWidget {
   const InfoScreen({Key? key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return AppPageLayout(
-      body: Container(
+      title: "Info",
-        color: Colors.grey[100],
+      icon: FlutterRemix.information_line,
-        child: SafeArea(
+      content: Padding(
-          child: Stack(
+        padding: const EdgeInsets.all(20),
-            fit: StackFit.loose,
+        child: Column(
-            children: [
+          crossAxisAlignment: CrossAxisAlignment.start,
-              SizedBox(
+          children: [
-                width: double.infinity,
+            GestureDetector(
-                height: double.infinity,
+              onTap: () => context.router.push(const HealthSafetyRoute()),
-                child: Align(
+              child: InfoCategoryCard(
-                  alignment: Alignment.topLeft,
+                color: Colors.red.shade50,
-                  child: Container(
+                icon: Icons.local_hospital,
-                    padding: const EdgeInsets.symmetric(horizontal: 30),
+                title: "Health and Safety",
-                    width: double.infinity,
+                description: "Important contact information and links regarding student health and safety.",
-                    height: 100,
-                    child: Column(
-                      mainAxisAlignment: MainAxisAlignment.center,
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        Wrap(
-                          crossAxisAlignment: WrapCrossAlignment.center,
-                          children: [
-                            Icon(Icons.info_outline, size: 35, color: Colors.grey[700]),
-                            const SizedBox(width: 12),
-                            Text("Info", style: furmanTextStyle(TextStyle(color: Colors.grey[900], fontSize: 28, fontWeight: FontWeight.w700))),
-                          ],
-                        ),
-                      ],
-                    ),
-                  ),
-                ),
               ),
-              ScrollViewWithHeight(
+            ),
-                child: Container(
+            const SizedBox(height: 10),
-                  decoration: const BoxDecoration(
+            GestureDetector(
-                    color: Colors.white,
+              onTap: () => context.router.push(const ContactsRoute()),
-                    borderRadius: BorderRadius.vertical(top: Radius.circular(30)),
+              child: InfoCategoryCard(
-                  ),
+                  color: Colors.deepPurple.shade50,
-                  padding: const EdgeInsets.symmetric(vertical: 20, horizontal: 20),
+                  icon: Icons.phone,
-                  margin: const EdgeInsets.only(top: 100),
+                  title: "Contacts",
-                  width: double.infinity,
+                  description: "Contact information for offices and resources on Furman's campus.",
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      InfoCard(
-                        color: Colors.red.shade50,
-                        icon: Icons.local_hospital,
-                        title: "Health and Safety",
-                        description: "Important contact information and links regarding student health and safety.",
-                      ),
-                      const SizedBox(height: 10),
-                      InfoCard(
-                          color: Colors.deepPurple.shade50,
-                          icon: Icons.phone,
-                          title: "Contacts",
-                          description: "Important contact information and links regarding student health and safety.",
-                      ),
-                      const SizedBox(height: 10),
-                      InfoCard(
-                          color: Colors.blue.shade50,
-                          icon: Icons.access_time,
-                          title: "Hours",
-                          description: "Important contact information and links regarding student health and safety.",
-                      ),
-                    ],
-                  ),
-                ),
               ),
-            ],
+            ),
-          ),
+            const SizedBox(height: 10),
+            GestureDetector(
+              onTap: () => context.router.push(const HoursRoute()),
+              child: InfoCategoryCard(
+                  color: Colors.blue.shade50,
+                  icon: Icons.access_time,
+                  title: "Hours",
+                  description: "Check the hours for buildings and services on Furman's campus.",
+              ),
+            ),
+            const SizedBox(height: 10),
+            const Spacer(),
+            GestureDetector(
+              onTap: () => context.router.push(const SettingsRoute()),
+              child: InfoCategoryCard(
+                color: Colors.grey.shade100,
+                icon: Icons.settings,
+                title: "Settings",
+                description: "Account settings, GET login, dark mode",
+              ),
+            ),
+          ],
         ),
       ),
     );

lib/src/screens/map/index.dart

@@ -1,13 +1,10 @@
-import 'dart:async';
+import 'package:auto_route/auto_route.dart';
-
 import 'package:flutter/material.dart';
-import 'package:flutter_map/flutter_map.dart';
+import 'package:furman_now/src/screens/map/state.dart';
-import 'package:flutter_map_location_marker/flutter_map_location_marker.dart';
+import 'package:provider/provider.dart';
-import 'package:flutter_svg/svg.dart';
+import 'package:transparent_pointer/transparent_pointer.dart';
-import 'package:furman_now/src/utils/theme.dart';
+
-import 'package:furman_now/src/widgets/map/filter_chip.dart';
+import 'map_widget.dart';
-import 'package:furman_now/src/widgets/map/rotate_compass.dart';
-import 'package:latlong2/latlong.dart';
 
 class MapScreen extends StatefulWidget {
   const MapScreen({Key? key}) : super(key: key);
@@ -18,206 +15,34 @@ class MapScreen extends StatefulWidget {
 
 class _MapScreenState extends State<MapScreen>
     with SingleTickerProviderStateMixin {
-  final MapController _mapController = MapController();
-
-  late final AnimationController _animationController = AnimationController(
-    duration: const Duration(milliseconds: 300),
-    vsync: this,
-  );
-
-  late CenterOnLocationUpdate _centerOnLocationUpdate;
-  late StreamController<double?> _centerCurrentLocationStreamController;
-
-  var _rotation = 0.0;
 
   @override
   void initState() {
     super.initState();
-    _mapController.mapEventStream.listen((event) {
-      if (event is MapEventRotate) {
-        setState(() {
-          _rotation = _mapController.rotation * (2 * pi) / 360;
-        });
-      }
-    });
-    _centerOnLocationUpdate = CenterOnLocationUpdate.always;
-    _centerCurrentLocationStreamController = StreamController<double?>();
-  }
-
-  @override
-  void dispose() {
-    super.dispose();
-    _animationController.dispose();
-  }
-
-  void resetRotation() async {
-    // take the shortest rotation path
-    var end = _mapController.rotation > 180 ? 360.0 : 0.0;
-    var animation = Tween<double>(
-      begin: _mapController.rotation,
-      end: end,
-    ).animate(CurvedAnimation(
-      parent: _animationController,
-      curve: Curves.easeInOut,
-    ));
-
-    animationListener() {
-      _mapController.rotate(animation.value);
-    }
-
-    animation.addListener(animationListener);
-
-    await _animationController.forward();
-
-    animation.removeListener(animationListener);
-    _animationController.reset();
-
-    _mapController.rotate(0);
   }
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return ChangeNotifierProvider(
-      body: Container(
+      create: (context) => MapPageState(vsync: this),
-        color: const Color(0xffb7acc9),
+      builder: (context, _) => WillPopScope(
-        child: SafeArea(
+        onWillPop: () async {
-          top: false,
+          print("Will pop");
-          child: Stack(
+          return false;
-            children: [
+        },
-              FlutterMap(
+        child: Scaffold(
-                mapController: _mapController,
+          body: Container(
-                options: MapOptions(
+            color: const Color(0xffb7acc9),
-                  center: LatLng(34.925926, -82.439397),
+            child: SafeArea(
-                  enableMultiFingerGestureRace: true,
+              top: false,
-                  rotationWinGestures: MultiFingerGesture.all,
+              // child: MapWidget(),
-                  pinchZoomThreshold: 0.2,
+              child: Stack(
-                  rotationThreshold: 8,
+                children: const [
-                  zoom: 15,
+                  MapWidget(),
-                  minZoom: 12,
+                  TransparentPointer(transparent: true, child: AutoRouter()),
-                  maxZoom: 18,
-                  plugins: [
-                    LocationMarkerPlugin(
-                      centerCurrentLocationStream:
-                        _centerCurrentLocationStreamController.stream,
-                      centerOnLocationUpdate: _centerOnLocationUpdate,
-                    ),
-                  ],
-                  onPositionChanged: (MapPosition position, bool hasGesture) {
-                    if (hasGesture) {
-                      setState(
-                        () => _centerOnLocationUpdate = CenterOnLocationUpdate.never,
-                      );
-                    }
-                  },
-                ),
-                layers: [
-                  TileLayerOptions(
-                    urlTemplate:
-                        "https://tile.openstreetmap.org/{z}/{x}/{y}.png",
-                    userAgentPackageName: 'edu.furman.now',
-                  ),
-                  LocationMarkerLayerOptions(),
-                ],
-                nonRotatedChildren: [
-                  AttributionWidget(
-                    attributionBuilder: (BuildContext context) {
-                      return const ColoredBox(
-                        color: Color(0xCCFFFFFF),
-                        child: Padding(
-                          padding: EdgeInsets.all(3),
-                          child: Text("©️ OpenStreetMap contributors"),
-                        ),
-                      );
-                    },
-                  ),
                 ],
               ),
-              // Rotation reset fab
+            ),
-              Positioned(
-                top: 12,
-                left: 0,
-                right: 0,
-                child: SafeArea(
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      Padding(
-                        padding: const EdgeInsets.symmetric(horizontal: 12),
-                        child: Container(
-                          width: double.infinity,
-                          height: 50,
-                          padding: const EdgeInsets.only(left: 10, right: 20),
-                          decoration: const BoxDecoration(
-                            color: Colors.white,
-                            borderRadius: BorderRadius.all(Radius.circular(60)),
-                            boxShadow: [
-                              BoxShadow(
-                                color: Color(0x33000000),
-                                blurRadius: 8,
-                              ),
-                            ],
-                          ),
-                          child: Stack(
-                            children: [
-                              Align(
-                                alignment: Alignment.centerLeft,
-                                child: Wrap(
-                                  crossAxisAlignment: WrapCrossAlignment.center,
-                                  children: [
-                                    SvgPicture.asset("assets/images/bell-tower.svg", color: Theme.of(context).primaryColor, height: 32),
-                                    const SizedBox(width: 10),
-                                    Text(
-                                      "Search locations",
-                                      style: furmanTextStyle(TextStyle(
-                                        fontSize: 18,
-                                        fontWeight: FontWeight.w500,
-                                        color: Colors.grey.shade500,
-                                      )),
-                                    ),
-                                  ],
-                                ),
-                              ),
-                            ],
-                          ),
-                        ),
-                      ),
-                      // const SizedBox(height: 12),
-                      SingleChildScrollView(
-                        padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 12),
-                        scrollDirection: Axis.horizontal,
-                        child: Wrap(
-                          spacing: 6,
-                          children: const [
-                            MapFilterChip(icon: Icons.restaurant, text: "Restaurants"),
-                            MapFilterChip(icon: Icons.train, text: "Transportation"),
-                            MapFilterChip(icon: Icons.school, text: "Campus Buildings"),
-                          ],
-                        ),
-                      ),
-                      MapRotateCompass(rotation: _rotation, resetRotation: resetRotation),
-                    ],
-                  ),
-                ),
-              ),
-              Positioned(
-                right: 20,
-                bottom: 20,
-                child: FloatingActionButton(
-                  onPressed: () {
-                    // Automatically center the location marker on the map when location updated until user interact with the map.
-                    setState(
-                      () => _centerOnLocationUpdate = CenterOnLocationUpdate.always,
-                    );
-                    // Center the location marker on the map and zoom the map to level 18.
-                    _centerCurrentLocationStreamController.add(16);
-                  },
-                  child: const Icon(
-                    Icons.my_location,
-                    color: Colors.white,
-                  ),
-                )
-              )
-            ],
           ),
         ),
       ),

lib/src/screens/map/map_category.dart

@@ -0,0 +1,84 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_map_location_marker/flutter_map_location_marker.dart';
+import 'package:furman_now/src/screens/map/state.dart';
+import 'package:furman_now/src/widgets/map/map_header.dart';
+import 'package:furman_now/src/widgets/map/rotate_compass.dart';
+import 'package:provider/provider.dart';
+
+import 'map_widget.dart';
+
+class MapCategoryScreen extends StatelessWidget {
+  final MapCategory category;
+
+  const MapCategoryScreen({
+    required this.category,
+    Key? key,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Consumer<MapPageState>(
+      builder: (context, state, _) => Stack(
+        children: [
+          Positioned(
+            top: 12,
+            left: 0,
+            right: 0,
+            child: SafeArea(
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Hero(
+                    tag: "header",
+                    child: MapHeader(
+                      activeCategory: category.name,
+                    ),
+                  ),
+                  // const SizedBox(height: 12),
+                  // SingleChildScrollView(
+                  //   padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 12),
+                  //   scrollDirection: Axis.horizontal,
+                  //   child: Wrap(
+                  //     spacing: 6,
+                  //     children: [
+                  //       // ...categories.map((category) => MapFilterChip(
+                  //       //     icon: Icons.restaurant,
+                  //       //     text: category.name,
+                  //       //     callback: category.activator
+                  //       // )),
+                  //       // MapFilterChip(
+                  //       //   icon: Icons.restaurant,
+                  //       //   text: "Restaurants",
+                  //       //   callback: () => null,
+                  //       // ),
+                  //       // MapFilterChip(icon: Icons.train, text: "Transportation"),
+                  //       // MapFilterChip(icon: Icons.school, text: "Campus Buildings"),
+                  //     ],
+                  //   ),
+                  // ),
+                  MapRotateCompass(rotation: state.rotation, resetRotation: state.resetRotation),
+                ],
+              ),
+            ),
+          ),
+          Positioned(
+              right: 20,
+              bottom: 20,
+              child: FloatingActionButton(
+                onPressed: () {
+                  // Automatically center the location marker on the map when location updated until user interact with the map.
+                  state.centerOnLocationUpdate = CenterOnLocationUpdate.always;
+                  // Center the location marker on the map and zoom the map to level 16.
+                  state.centerCurrentLocationStreamController.add(16);
+                },
+                child: const Icon(
+                  Icons.my_location,
+                  color: Colors.white,
+                ),
+              )
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/src/screens/map/map_home.dart

@@ -0,0 +1,77 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_map_location_marker/flutter_map_location_marker.dart';
+import 'package:furman_now/src/screens/map/map_widget.dart';
+import 'package:furman_now/src/screens/map/state.dart';
+import 'package:furman_now/src/widgets/map/filter_chip.dart';
+import 'package:furman_now/src/widgets/map/map_header.dart';
+import 'package:furman_now/src/widgets/map/rotate_compass.dart';
+import 'package:provider/provider.dart';
+
+class MapHomeScreen extends StatelessWidget {
+  const MapHomeScreen({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Consumer<MapPageState>(
+      builder: (context, state, _) => Stack(
+        children: [
+          Positioned(
+            top: 12,
+            left: 0,
+            right: 0,
+            child: SafeArea(
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  const Hero(
+                    tag: "header",
+                    child: MapHeader()
+                  ),
+                  // const SizedBox(height: 12),
+                  SingleChildScrollView(
+                    padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 12),
+                    scrollDirection: Axis.horizontal,
+                    child: Wrap(
+                      spacing: 6,
+                      children: [
+                        ...state.categories.map((category) => MapFilterChip(
+                            icon: Icons.restaurant,
+                            text: category.name,
+                            callback: category.activator
+                        )),
+                        // MapFilterChip(
+                        //   icon: Icons.restaurant,
+                        //   text: "Restaurants",
+                        //   callback: () => null,
+                        // ),
+                        // MapFilterChip(icon: Icons.train, text: "Transportation"),
+                        // MapFilterChip(icon: Icons.school, text: "Campus Buildings"),
+                      ],
+                    ),
+                  ),
+                  MapRotateCompass(rotation: state.rotation, resetRotation: state.resetRotation),
+                ],
+              ),
+            ),
+          ),
+          Positioned(
+            right: 20,
+            bottom: 20,
+            child: FloatingActionButton(
+              onPressed: () {
+                // Automatically center the location marker on the map when location updated until user interact with the map.
+                state.centerOnLocationUpdate = CenterOnLocationUpdate.always;
+                // Center the location marker on the map and zoom the map to level 16.
+                state.centerCurrentLocationStreamController.add(16);
+              },
+              child: const Icon(
+                Icons.my_location,
+                color: Colors.white,
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/src/screens/map/map_widget.dart

@@ -0,0 +1,99 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_map/flutter_map.dart';
+import 'package:flutter_map_location_marker/flutter_map_location_marker.dart';
+import 'package:flutter_map_marker_cluster/flutter_map_marker_cluster.dart';
+import 'package:furman_now/src/screens/map/state.dart';
+import 'package:furman_now/src/utils/theme.dart';
+import 'package:latlong2/latlong.dart';
+import 'package:provider/provider.dart';
+
+class MapWidget extends StatelessWidget {
+  const MapWidget({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Consumer<MapPageState>(
+      builder: (context, state, _) => Scaffold(
+        body: Stack(
+          children: [
+            FlutterMap(
+              mapController: state.mapController,
+              options: MapOptions(
+                center: LatLng(34.925926, -82.439397),
+                maxBounds: LatLngBounds(
+                  LatLng(34.991937, -82.536251),
+                  LatLng(34.813016, -82.328766),
+                ),
+                enableMultiFingerGestureRace: true,
+                rotationWinGestures: MultiFingerGesture.all,
+                pinchZoomThreshold: 0.2,
+                rotationThreshold: 8,
+                zoom: 15,
+                minZoom: 12,
+                maxZoom: 18,
+                plugins: [
+                  LocationMarkerPlugin(
+                    centerCurrentLocationStream:
+                      state.centerCurrentLocationStreamController.stream,
+                    centerOnLocationUpdate: state.centerOnLocationUpdate,
+                  ),
+                  MarkerClusterPlugin(),
+                ],
+                onPositionChanged: (MapPosition position, bool hasGesture) {
+                  if (hasGesture) {
+                    state.centerOnLocationUpdate = CenterOnLocationUpdate.never;
+                  }
+                },
+              ),
+              layers: [
+                TileLayerOptions(
+                  urlTemplate:
+                  "https://tile.openstreetmap.org/{z}/{x}/{y}.png",
+                  userAgentPackageName: 'edu.furman.now',
+                ),
+                LocationMarkerLayerOptions(),
+                MarkerClusterLayerOptions(
+                  maxClusterRadius: 60,
+                  size: const Size(40, 40),
+                  fitBoundsOptions: const FitBoundsOptions(
+                    padding: EdgeInsets.all(50),
+                  ),
+                  markers: state.markers,
+                  polygonOptions: const PolygonOptions(
+                      borderColor: Colors.blueAccent,
+                      color: Colors.black12,
+                      borderStrokeWidth: 3,
+                  ),
+                  builder: (context, markers) {
+                    return FloatingActionButton(
+                      onPressed: null,
+                      child: Text(markers.length.toString()),
+                    );
+                  },
+                ),
+              ],
+              nonRotatedChildren: [
+                AttributionWidget(
+                  attributionBuilder: (BuildContext context) {
+                    return ColoredBox(
+                      color: const Color(0xCCFFFFFF),
+                      child: Padding(
+                        padding: const EdgeInsets.all(3),
+                        child: Text(
+                          "©️ OpenStreetMap contributors",
+                          style: furmanTextStyle(const TextStyle(
+                            fontSize: 10,
+                          )),
+                        ),
+                      ),
+                    );
+                  },
+                ),
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/src/screens/map/state.dart

@@ -0,0 +1,115 @@
+import 'dart:async';
+import 'dart:math';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_map/flutter_map.dart';
+import 'package:flutter_map_location_marker/flutter_map_location_marker.dart';
+import 'package:flutter_remix/flutter_remix.dart';
+import 'package:furman_now/src/services/restaurants/restaurant_service.dart';
+
+@immutable
+class MapCategory {
+  final String name;
+  final IconData icon;
+  final Function activator;
+
+  const MapCategory({
+    required this.name,
+    required this.icon,
+    required this.activator,
+  });
+}
+
+class MapPageState extends ChangeNotifier {
+  MapPageState({
+    required TickerProvider vsync
+  }): _animationController = AnimationController(
+    duration: const Duration(milliseconds: 300),
+    vsync: vsync,
+  ) {
+    _initState();
+  }
+
+  void _initState() {
+    mapController.mapEventStream.listen((event) {
+      if (event is MapEventRotate) {
+        rotation = mapController.rotation * (2 * pi) / 360;
+      }
+    });
+
+    centerOnLocationUpdate = CenterOnLocationUpdate.always;
+    centerCurrentLocationStreamController = StreamController<double?>();
+  }
+
+  final MapController mapController = MapController();
+  final AnimationController _animationController;
+
+  late CenterOnLocationUpdate _centerOnLocationUpdate;
+  CenterOnLocationUpdate get centerOnLocationUpdate => _centerOnLocationUpdate;
+  set centerOnLocationUpdate (CenterOnLocationUpdate value) {
+    _centerOnLocationUpdate = value;
+    notifyListeners();
+  }
+
+  late StreamController<double?> centerCurrentLocationStreamController;
+
+  var _rotation = 0.0;
+  double get rotation => _rotation;
+  set rotation (double value) {
+    _rotation = value;
+    notifyListeners();
+  }
+
+  List<Marker> _markers = <Marker>[];
+  List<Marker> get markers => _markers;
+  set markers (List<Marker> value) {
+    _markers = value;
+    notifyListeners();
+  }
+
+  void resetRotation() async {
+    // take the shortest rotation path
+    var end = mapController.rotation > 180 ? 360.0 : 0.0;
+    var animation = Tween<double>(
+      begin: mapController.rotation,
+      end: end,
+    ).animate(CurvedAnimation(
+      parent: _animationController,
+      curve: Curves.easeInOut,
+    ));
+
+    animationListener() {
+      mapController.rotate(animation.value);
+    }
+    animation.addListener(animationListener);
+
+    await _animationController.forward();
+
+    animation.removeListener(animationListener);
+    _animationController.reset();
+
+    mapController.rotate(0);
+  }
+
+  late final List<MapCategory> categories = [
+    MapCategory(
+      name: "Restaurants",
+      icon: FlutterRemix.restaurant_line,
+      activator: showRestaurants,
+    ),
+  ];
+
+  Future<void> showRestaurants() async {
+    var restaurants = await RestaurantService.fetchRestaurants();
+    var newMarkers = restaurants.map((restaurant) => Marker(
+      point: restaurant.mapLocation,
+      width: 40,
+      height: 40,
+      builder: (context) => GestureDetector(
+        onTapDown: (e) => print("tapped"),
+        child: const FlutterLogo()
+      ),
+    ));
+    markers = newMarkers.toList();
+  }
+}

lib/src/screens/settings/settings.dart

@@ -0,0 +1,42 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_remix/flutter_remix.dart';
+import 'package:furman_now/src/layouts/app_page.dart';
+import 'package:furman_now/src/services/get_app/user/user_service.dart';
+
+class SettingsScreen extends StatefulWidget {
+  const SettingsScreen({Key? key}) : super(key: key);
+
+  @override
+  State<SettingsScreen> createState() => _SettingsScreenState();
+}
+
+class _SettingsScreenState extends State<SettingsScreen> {
+  final UserService _service = UserService();
+
+  @override
+  Widget build(BuildContext context) {
+    return AppPageLayout(
+        title: "Settings",
+        icon: FlutterRemix.arrow_left_line,
+        backgroundColor: Colors.grey.shade100,
+        iconTapAction: () => context.router.pop(),
+        content: Padding(
+          padding: const EdgeInsets.all(20),
+          child: Column(
+            children: [
+              GestureDetector(
+                onTap: () {
+                  _service.login();
+                },
+                child: Container(
+                  padding: EdgeInsets.all(20),
+                  child: Text("Log in with GET app."),
+                ),
+              )
+            ],
+          ),
+        ),
+    );
+  }
+}

lib/src/screens/student_id/index.dart

@@ -1,9 +1,15 @@
 import 'dart:async';
 
+import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:barcode_widget/barcode_widget.dart';
+import 'package:flutter_remix/flutter_remix.dart';
+import 'package:furman_now/src/routes/index.gr.dart';
 import 'package:furman_now/src/services/get_app/barcode/barcode_service.dart';
 import 'package:furman_now/src/utils/theme.dart';
+import 'package:provider/provider.dart';
+
+import '../home/state.dart';
 
 class StudentIdScreen extends StatefulWidget {
   const StudentIdScreen({Key? key}) : super(key: key);
@@ -26,6 +32,12 @@ class _StudentIdScreenState extends State<StudentIdScreen> {
     );
   }
 
+  @override
+  void dispose() {
+    super.dispose();
+    timer?.cancel();
+  }
+
   void updateBarcode(Timer timer) {
     setState(() {
       barcodeNumber = BarcodeService.generateGetBarcode();
@@ -35,32 +47,90 @@ class _StudentIdScreenState extends State<StudentIdScreen> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      body: Container(
+      body: WillPopScope(
-        color: const Color(0xffb7acc9),
+        onWillPop: () async {
-        child: SafeArea(
+          context.read<HomePageState>().collapse = false;
-          child: ListView(
+          return true;
-            padding: const EdgeInsets.all(40),
+        },
+        child: Listener(
+          onPointerMove: (details) {
+            int sensitivity = 8;
+            if (details.delta.dy > sensitivity) {
+              // Down Swipe
+            } else if (details.delta.dy < -sensitivity) {
+              context.router.navigate(HomeRoute());
+            }
+          },
+          child: Stack(
             children: [
-              Text(
-                "Furman ID",
-                style: furmanTextStyle(const TextStyle(color: Color(0xff26183d), fontSize: 36, fontWeight: FontWeight.w800)),
-              ),
-              const SizedBox(height: 200),
               Container(
-                decoration: const BoxDecoration(
+                color: const Color(0xffb7acc9),
-                  color: Colors.white,
+                child: SafeArea(
-                  borderRadius: BorderRadius.all(Radius.circular(10)),
+                  child: ListView(
-                ),
+                    padding: const EdgeInsets.all(40),
-                // hack since the barcode has a weird intrinsic size for some reason
+                    children: [
-                child: LayoutBuilder(
+                      Text(
-                  builder: (BuildContext context, BoxConstraints constraints) {
+                        "Furman ID",
-                    return BarcodeWidget(
+                        style: furmanTextStyle(const TextStyle(
-                      barcode: Barcode.pdf417(moduleHeight: 4),
+                          color: Color(0xff26183d),
-                      data: barcodeNumber,
+                          fontSize: 36,
-                      margin: const EdgeInsets.all(10),
+                          fontWeight: FontWeight.w800
-                      height: constraints.maxWidth / 3,
+                        )),
-                    );
+                      ),
-                  },
+                      const SizedBox(height: 30),
+                      Center(
+                        child: Container(
+                          height: 200,
+                          width: 200,
+                          decoration: BoxDecoration(
+                            color: Colors.grey[200],
+                            borderRadius: BorderRadius.circular(40),
+                          ),
+                          child: Icon(
+                            FlutterRemix.user_3_line,
+                            size: 120,
+                            color: Colors.grey[400],
+                          ),
+                        ),
+                      ),
+                      const SizedBox(height: 20),
+                      Center(child: Text(
+                        "Michael Thomas",
+                        style: furmanTextStyle(const TextStyle(
+                            color: Color(0xff26183d),
+                            fontSize: 28,
+                            fontWeight: FontWeight.w700
+                        )),
+                      )),
+                      const SizedBox(height: 5),
+                      Center(child: Text(
+                        "5001962",
+                        style: furmanTextStyle(const TextStyle(
+                            color: Color(0xff26183d),
+                            fontSize: 20,
+                            fontWeight: FontWeight.w500
+                        )),
+                      )),
+                      const SizedBox(height: 20),
+                      Container(
+                        decoration: const BoxDecoration(
+                          color: Colors.white,
+                          borderRadius: BorderRadius.all(Radius.circular(10)),
+                        ),
+                        // hack since the barcode has a weird intrinsic size for some reason
+                        child: LayoutBuilder(
+                          builder: (BuildContext context, BoxConstraints constraints) {
+                            return BarcodeWidget(
+                              barcode: Barcode.pdf417(moduleHeight: 4),
+                              data: barcodeNumber,
+                              margin: const EdgeInsets.all(10),
+                              height: constraints.maxWidth / 3,
+                            );
+                          },
+                        ),
+                      ),
+                    ],
+                  ),
                 ),
               ),
             ],

lib/src/services/buildings/buildings_service.dart

@@ -0,0 +1,151 @@
+import 'dart:convert';
+
+import 'package:flutter/material.dart';
+import 'package:latlong2/latlong.dart';
+import 'package:http/http.dart' as http;
+
+class BuildingsService {
+  static Future<List<Building>> fetchBuildings() async {
+    var buildings = (await _fetchBuildings()).toList();
+    await _fetchBuildingHours(buildings);
+    return buildings;
+  }
+
+  static Future<Iterable<Building>> _fetchBuildings() async {
+    final response = await http
+        .get(Uri.parse("https://cs.furman.edu/~csdaemon/FUNow/buildingGet.php"));
+
+    if (response.statusCode == 200) {
+      // If the server did return a 200 OK response,
+      // then parse the JSON.
+      final buildingsJson = jsonDecode(response.body);
+      return (buildingsJson["results"] as List<dynamic>).map((json) =>
+          Building.fromJson(json)
+      );
+    } else {
+      // If the server did not return a 200 OK response,
+      // then throw an exception.
+      throw Exception('Failed to load buildings.');
+    }
+  }
+
+  static Future<void> _fetchBuildingHours(List<Building> buildings) async {
+    final response = await http
+        .get(Uri.parse("https://cs.furman.edu/~csdaemon/FUNow/hoursGet.php"));
+
+    if (response.statusCode == 200) {
+      // If the server did return a 200 OK response,
+      // then parse the JSON.
+      final hoursListJson = jsonDecode(response.body);
+      for (var hoursJson in (hoursListJson["results"] as List<dynamic>)) {
+        try {
+          var hours = BuildingHours.fromJson(hoursJson);
+          buildings.firstWhere((building) => building.id == hours.id).hoursList.add(hours);
+        } on ArgumentError {
+          // if json parse fails, just move on
+          // this is terribly hacky but the server is a mess I cannot fix
+        }
+        for (var building in buildings) { building.hoursList.sort(); }
+      }
+    } else {
+      // If the server did not return a 200 OK response,
+      // then throw an exception.
+      throw Exception('Failed to load building hours.');
+    }
+  }
+}
+
+class Building {
+  int id;
+  String name;
+  String? shortName;
+  String category;
+  String? location;
+  LatLng mapLocation;
+  int frequency;
+  List<BuildingHours> hoursList = <BuildingHours>[];
+
+  Building({
+    required this.id,
+    required this.name,
+    this.shortName,
+    required this.category,
+    this.location,
+    required this.mapLocation,
+    required this.frequency,
+  });
+
+  // bool get isOpen {
+  //   for(var hours in hoursList) {
+  //     var now = DateTime.now();
+  //     var today = Weekday.values[now.weekday - 1];
+  //     if (hours.daysOfWeek.days[today] == true) {
+  //       var currentTime = Duration(hours: now.hour, minutes: now.minute, seconds: now.second);
+  //       if(hours.startTime != null && hours.endTime != null) {
+  //         if (hours.startTime! < currentTime && hours.endTime! > currentTime) {
+  //           return true;
+  //         }
+  //       }
+  //     }
+  //   }
+  //   return false;
+  // }
+
+  factory Building.fromJson(Map<String, dynamic> json) {
+    return Building(
+      id: int.parse(json["buildingID"]),
+      name: json["name"],
+      shortName: json["nickname"],
+      category: json["category"],
+      location: json["location"],
+      mapLocation: LatLng(double.parse(json["latitude"]), double.parse(json["longitude"])),
+      frequency: int.parse(json["frequency"]),
+    );
+  }
+}
+
+class BuildingHours implements Comparable<BuildingHours> {
+  final int id;
+  final String? meal;
+  final TimeOfDay startTime;
+  final TimeOfDay endTime;
+  final String daysOfWeek;
+  final int dayOrder;
+
+  BuildingHours({
+    required this.id,
+    this.meal,
+    required this.startTime,
+    required this.endTime,
+    required this.daysOfWeek,
+    required this.dayOrder,
+  });
+
+  static TimeOfDay _getDurationFromString(String s) {
+    var timeComponents = s.split(":");
+    var hour = int.parse(timeComponents[0]);
+    var minute = int.parse(timeComponents[1]);
+
+    return TimeOfDay(hour: hour, minute: minute);
+  }
+
+  factory BuildingHours.fromJson(Map<String, dynamic> json) {
+    if (json["Start"] == null || json["End"] == null) {
+      throw ArgumentError("Start and end time cannot be null");
+    }
+
+    return BuildingHours(
+      id: int.parse(json["buildingID"]),
+      meal: json["meal"],
+      startTime: _getDurationFromString(json["Start"]),
+      endTime: _getDurationFromString(json["End"]),
+      daysOfWeek: json["day"],
+      dayOrder: int.parse(json["dayorder"]),
+    );
+  }
+
+  @override
+  int compareTo(BuildingHours other) {
+    return dayOrder - other.dayOrder;
+  }
+}

lib/src/services/days_of_week.dart

@@ -0,0 +1,77 @@
+class DaysOfWeek {
+  final Weekday startDay;
+  final Weekday endDay;
+  final Map<Weekday, bool> days;
+
+  DaysOfWeek({
+    required this.startDay,
+    required this.endDay,
+    required this.days,
+  });
+
+  static Weekday _getDayFromShortName(String shortName) {
+    switch(shortName.toLowerCase()) {
+      case "mon":
+        return Weekday.monday;
+      case "tue":
+        return Weekday.tuesday;
+      case "wed":
+        return Weekday.wednesday;
+      case "thu":
+        return Weekday.thursday;
+      case "fri":
+        return Weekday.friday;
+      case "sat":
+        return Weekday.saturday;
+      case "sun":
+        return Weekday.sunday;
+      default:
+        throw "Invalid date short name.";
+    }
+  }
+
+  factory DaysOfWeek.parse(String s) {
+    final Map<Weekday, bool> days = { for (var e in Weekday.values) e : false };
+
+    // single day
+    if (!s.contains("-")) {
+      var day = _getDayFromShortName(s);
+      days.update(day, (val) => true);
+      return DaysOfWeek(startDay: day, endDay: day, days: days);
+    }
+
+    // date range
+    var dayNames = s.split("-");
+    final startDay = _getDayFromShortName(dayNames[0]);
+    final endDay = _getDayFromShortName(dayNames[1]);
+    int i = startDay.index;
+
+    // loop through to add all dates in date range to list
+    while(i != endDay.index) {
+      days.update(Weekday.values[i], (val) => true);
+
+      if (i < Weekday.values.length - 1) {
+        i++;
+      } else {
+        i = 0;
+      }
+    }
+    days.update(endDay, (val) => true);
+
+    return DaysOfWeek(
+      startDay: startDay,
+      endDay: endDay,
+      days: days,
+    );
+  }
+}
+
+enum Weekday {
+  monday,
+  tuesday,
+  wednesday,
+  thursday,
+  friday,
+  saturday,
+  sunday,
+}

lib/src/services/events/events_service.dart

@@ -19,10 +19,21 @@ class EventsService {
     if (response.statusCode == 200) {
       // If the server did return a 200 OK response,
       // then parse the JSON.
-      final eventsJson = jsonDecode(response.body);
+      try {
-      return (eventsJson["results"] as List<dynamic>).map((event) =>
+        final eventsJson = jsonDecode(response.body);
-        AthleticsEvent.fromJson(event)
+        if (eventsJson["results"] != null) {
-      );
+          return (eventsJson["results"] as List<dynamic>).map((event) =>
+              AthleticsEvent.fromJson(event)
+          );
+        } else {
+          return [];
+        }
+      } catch (e) {
+        throw
+          "Failed to parse athletics event data."
+          "\n"
+          "Exception: $e";
+      }
     } else {
       // If the server did not return a 200 OK response,
       // then throw an exception.
@@ -37,14 +48,26 @@ class EventsService {
     if (response.statusCode == 200) {
       // If the server did return a 200 OK response,
       // then parse the JSON.
-      final eventsJson = jsonDecode(response.body);
+      try {
-      return (eventsJson["results"] as List<dynamic>).map((event) =>
+        final eventsJson = jsonDecode(response.body);
-          ClpEvent.fromJson(event)
+        if (eventsJson["results"] != null) {
-      );
+          return (eventsJson["results"] as List<dynamic>).map((event) =>
+              ClpEvent.fromJson(event)
+          );
+        } else {
+          return [];
+        }
+      } catch (e) {
+        throw
+          "Failed to parse CLP event data."
+          "\n"
+          "Exception: $e";
+      }
+
     } else {
       // If the server did not return a 200 OK response,
       // then throw an exception.
-      throw Exception('Failed to load athletics events.');
+      throw Exception('Failed to load CLP events.');
     }
   }
 }
@@ -162,7 +185,7 @@ class ClpEvent implements Event {
 
   factory ClpEvent.fromJson(Map<String, dynamic> json) {
     return ClpEvent(
-      title: json["title"],
+      title: json["title"] ?? "",
       startTime: DateTime.parse(json["date"] + " " + json["start"]),
       endTime: DateTime.parse(json["date"] + " " + json["end"]),
       location: json["location"],

lib/src/services/get_app/user/user_service.dart

@@ -1,3 +1,78 @@
-class UserService {
+import 'dart:convert';
 
+import 'package:flutter_inappwebview/flutter_inappwebview.dart';
+import 'package:furman_now/src/services/get_app/user/in_app_browser.dart';
+
+import 'package:http/http.dart' as http;
+
+class UserService {
+  final String servicesUrl = "https://services.get.cbord.com/GETServices/services/json";
+  final GetLoginInAppBrowser browser = GetLoginInAppBrowser();
+
+  void login() {
+    var options = InAppBrowserClassOptions(
+      crossPlatform: InAppBrowserOptions(
+        hideUrlBar: true,
+      ),
+    );
+
+    browser.loadStart.subscribe((args) async {
+      if (args!.url != null) {
+        bool success = await _getAuthSessionFromUrl(args.url!);
+        print(success);
+        if (success) {
+          browser.close();
+        }
+      }
+    });
+
+    browser.openUrlRequest(
+      urlRequest: URLRequest(
+        url: Uri.parse("https://get.cbord.com/furman/full/login.php?mobileapp=1"),
+      ),
+      options: options,
+    );
+  }
+
+  Future<bool> _getAuthSessionFromUrl(Uri url) async {
+    print(url);
+    if (
+      url.origin == "https://get.cbord.com" &&
+      url.path.contains("mobileapp_login_validator.php")
+    ) {
+      var sessionId = url.queryParameters["sessionId"];
+      if (sessionId != null) {
+        return _validateSession(sessionId);
+      }
+    }
+    return false;
+  }
+
+  Future<bool> _validateSession(String sessionId) async {
+    final response = await http.post(
+      Uri.parse("$servicesUrl/user"),
+      headers: {
+        "Content-Type": "application/json",
+      },
+      body: """{
+        "method": "retrieve",
+        "params": {
+          "sessionId": "$sessionId"
+        }
+      }"""
+    );
+    if (response.statusCode == 200) {
+      // If the server did return a 200 OK response,
+      // then parse the JSON.
+      final json = jsonDecode(response.body);
+      print(json);
+      // make sure there wasn't an exception and the data was actually loaded
+      return json["exception"] == null;
+    } else {
+      // If the server did not return a 200 OK response,
+      // then throw an exception.
+      print(response.statusCode);
+      throw Exception('Failed to load user info.');
+    }
+  }
 }

lib/src/services/info/contacts_service.dart

@@ -0,0 +1,73 @@
+import 'dart:convert';
+
+import 'package:external_app_launcher/external_app_launcher.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_remix/flutter_remix.dart';
+import 'package:http/http.dart' as http;
+import 'package:url_launcher/url_launcher.dart';
+
+class ContactsService {
+  static Future<Iterable<ContactInfo>> fetchContactInfo() async {
+    final response = await http
+      .get(Uri.parse("https://cs.furman.edu/~csdaemon/FUNow/contactsGet.php"));
+
+    if (response.statusCode == 200) {
+      // If the server did return a 200 OK response,
+      // then parse the JSON.
+      final healthSafetyJson = jsonDecode(response.body);
+      return (healthSafetyJson["results"] as List<dynamic>).map((json) =>
+        ContactInfo.fromJson(json)
+      );
+    } else {
+      // If the server did not return a 200 OK response,
+      // then throw an exception.
+      throw Exception('Failed to load contact info.');
+    }
+  }
+}
+
+class ContactInfo {
+  int id;
+  int buildingId;
+  String name;
+  String? room;
+  String number;
+
+  ContactInfo({
+    required this.id,
+    required this.buildingId,
+    required this.name,
+    this.room,
+    required this.number,
+  });
+
+  String get phone {
+    return number.replaceAllMapped(
+      RegExp(r'(\d{3})(\d{3})(\d+)'),
+      (Match m) => "(${m[1]}) ${m[2]}-${m[3]}"
+    );
+  }
+
+  void launch() async {
+    var url = Uri(scheme: "tel", path: number);
+    if (await canLaunchUrl(url)) {
+      await launchUrl(
+        url,
+        mode: LaunchMode.externalApplication,
+      );
+    } else {
+      throw "Could not launch $url";
+    }
+  }
+  
+  factory ContactInfo.fromJson(Map<String, dynamic> json) {
+    return ContactInfo(
+      id: int.parse(json["id"]),
+      buildingId: int.parse(json["buildingID"]),
+      name: json["name"],
+      room: (json["room"] as String).isNotEmpty ? json["room"] : null,
+      number: json["number"],
+    );
+  }
+}
+

lib/src/services/info/health_safety_service.dart

@@ -0,0 +1,126 @@
+import 'dart:convert';
+
+import 'package:external_app_launcher/external_app_launcher.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_remix/flutter_remix.dart';
+import 'package:http/http.dart' as http;
+import 'package:url_launcher/url_launcher.dart';
+
+class HealthSafetyService {
+  static Future<Iterable<HealthSafetyInfo>> fetchHealthSafetyInfo() async {
+    final response = await http
+      .get(Uri.parse("https://cs.furman.edu/~csdaemon/FUNow/healthSafetyGet.php"));
+
+    if (response.statusCode == 200) {
+      // If the server did return a 200 OK response,
+      // then parse the JSON.
+      final healthSafetyJson = jsonDecode(response.body);
+      return (healthSafetyJson["results"] as List<dynamic>).map((json) =>
+        HealthSafetyInfo.fromJson(json)
+      );
+    } else {
+      // If the server did not return a 200 OK response,
+      // then throw an exception.
+      throw Exception('Failed to load health and safety info.');
+    }
+  }
+}
+
+class HealthSafetyInfo {
+  int id;
+  String name;
+  HealthSafetyInfoType type;
+  String content;
+  IconData icon;
+
+  HealthSafetyInfo({
+    required this.id,
+    required this.name,
+    required this.type,
+    required this.content,
+    required this.icon,
+  });
+
+  String get linkText {
+    switch(type) {
+      case HealthSafetyInfoType.link:
+        return "External Link";
+      case HealthSafetyInfoType.app:
+        return "Open App";
+      case HealthSafetyInfoType.phone:
+        return content.replaceAllMapped(
+          RegExp(r'(\d{3})(\d{3})(\d+)'),
+          (Match m) => "(${m[1]}) ${m[2]}-${m[3]}"
+        );
+      case HealthSafetyInfoType.removed:
+        return "Removed";
+    }
+  }
+
+  void launch() async {
+    if(
+      type == HealthSafetyInfoType.link ||
+      type == HealthSafetyInfoType.phone
+    ) {
+      var url = (type == HealthSafetyInfoType.link)
+        ? Uri.parse(content)
+        : Uri(scheme: "tel", path: content);
+      if (await canLaunchUrl(url)) {
+        await launchUrl(
+          url,
+          mode: LaunchMode.externalApplication,
+        );
+      } else {
+        throw "Could not launch $url";
+      }
+    } else if (type == HealthSafetyInfoType.app) {
+      await LaunchApp.openApp(
+        androidPackageName: content.split("https://")[1],
+        iosUrlScheme: 'pulsesecure://',
+        appStoreLink: 'itms-apps://itunes.apple.com/us/app/pulse-secure/id945832041',
+      );
+    }
+  }
+  
+  factory HealthSafetyInfo.fromJson(Map<String, dynamic> json) {
+    getTypeFromString(String typeName) {
+      switch(typeName) {
+        case "phone":
+          return HealthSafetyInfoType.phone;
+        case "link":
+          return HealthSafetyInfoType.link;
+        case "app":
+          return HealthSafetyInfoType.app;
+        case "removed":
+          return HealthSafetyInfoType.removed;
+        default:
+          throw "Invalid health safety info type value \"$typeName\"";
+      }
+    }
+
+    Map<String, IconData> iconMap = {
+      "shield": FlutterRemix.shield_star_line,
+      "staroflife": FlutterRemix.star_line,
+      "car": FlutterRemix.car_line,
+      "bandage.fill": Icons.healing,
+      "person.circle": FlutterRemix.user_line,
+      "heart.circle": FlutterRemix.heart_line,
+    };
+
+    return HealthSafetyInfo(
+      id: int.parse(json["id"]),
+      name: json["name"],
+      type: getTypeFromString(json["type"]),
+      content: json["content"],
+      icon: iconMap[json["icon"]] ?? FlutterRemix.heart_line,
+    );
+  }
+}
+
+enum HealthSafetyInfoType {
+  app,
+  phone,
+  link,
+  removed,
+}
+

lib/src/services/restaurants/restaurant_service.dart

@@ -1,8 +1,10 @@
 import 'dart:convert';
 
 import 'package:flutter/painting.dart';
+import 'package:furman_now/src/services/days_of_week.dart';
 import 'package:latlong2/latlong.dart';
 import 'package:http/http.dart' as http;
+import 'package:palette_generator/palette_generator.dart';
 
 class RestaurantService {
   static Future<List<Restaurant>> fetchRestaurants() async {
@@ -13,7 +15,7 @@ class RestaurantService {
 
   static Future<Iterable<Restaurant>> _fetchRestaurants() async {
     final response = await http
-        .get(Uri.parse("https://cs.furman.edu/~csdaemon/FUNow/restaurantGet.php"));
+      .get(Uri.parse("https://cs.furman.edu/~csdaemon/FUNow/restaurantGet.php"));
 
     if (response.statusCode == 200) {
       // If the server did return a 200 OK response,
@@ -25,20 +27,20 @@ class RestaurantService {
     } else {
       // If the server did not return a 200 OK response,
       // then throw an exception.
-      throw Exception('Failed to load athletics events.');
+      throw Exception('Failed to load restaurants.');
     }
   }
 
   static Future<void> _fetchRestaurantHours(List<Restaurant> restaurants) async {
     final response = await http
-        .get(Uri.parse("https://cs.furman.edu/~csdaemon/FUNow/restaurantHoursGet.php"));
+      .get(Uri.parse("https://cs.furman.edu/~csdaemon/FUNow/restaurantHoursGet.php"));
 
     if (response.statusCode == 200) {
       // If the server did return a 200 OK response,
       // then parse the JSON.
       final hoursListJson = jsonDecode(response.body);
       for (var hoursJson in (hoursListJson["results"] as List<dynamic>)) {
-        var hours = Hours.fromJson(hoursJson);
+        var hours = RestaurantHours.fromJson(hoursJson);
         restaurants.firstWhere((restaurant) => restaurant.id == hours.id).hoursList.add(hours);
       }
     } else {
@@ -58,7 +60,8 @@ class Restaurant {
   int frequency;
   int busyness;
   String? url;
-  List<Hours> hoursList = <Hours>[];
+  List<RestaurantHours> hoursList = <RestaurantHours>[];
+  Color? backgroundColor;
 
   Restaurant({
     required this.id,
@@ -96,6 +99,18 @@ class Restaurant {
     return NetworkImage(imageUri);
   }
 
+  Future<void> _generateColor() async {
+    var paletteGenerator = await PaletteGenerator.fromImageProvider(
+      image,
+      maximumColorCount: 1,
+    );
+    if (paletteGenerator.colors.toList().isNotEmpty) {
+      var hslColor = HSLColor.fromColor(paletteGenerator.colors.toList()[0]);
+      var newColor = HSLColor.fromAHSL(1, hslColor.hue, 40/100, 90/100);
+      backgroundColor = newColor.toColor();
+    }
+  }
+
   factory Restaurant.fromJson(Map<String, dynamic> json) {
     return Restaurant(
         id: int.parse(json["id"]),
@@ -110,7 +125,7 @@ class Restaurant {
   }
 }
 
-class Hours {
+class RestaurantHours {
   int id;
   String? meal;
   Duration? startTime;
@@ -118,7 +133,7 @@ class Hours {
   DaysOfWeek daysOfWeek;
   int dayOrder;
 
-  Hours({
+  RestaurantHours({
     required this.id,
     this.meal,
     this.startTime,
@@ -136,8 +151,8 @@ class Hours {
     return Duration(hours: hours, minutes: minutes, seconds: seconds);
   }
 
-  factory Hours.fromJson(Map<String, dynamic> json) {
+  factory RestaurantHours.fromJson(Map<String, dynamic> json) {
-    return Hours(
+    return RestaurantHours(
       id: int.parse(json["id"]),
       meal: json["meal"],
       startTime: (json["start"] != null) ? _getDurationFromString(json["start"]) : null,
@@ -147,81 +162,3 @@ class Hours {
     );
   }
 }
-
-class DaysOfWeek {
-  final Weekday startDay;
-  final Weekday endDay;
-  final Map<Weekday, bool> days;
-
-  DaysOfWeek({
-    required this.startDay,
-    required this.endDay,
-    required this.days,
-  });
-
-  static Weekday _getDayFromShortName(String shortName) {
-    switch(shortName.toLowerCase()) {
-      case "mon":
-        return Weekday.monday;
-      case "tue":
-        return Weekday.tuesday;
-      case "wed":
-        return Weekday.wednesday;
-      case "thu":
-        return Weekday.thursday;
-      case "fri":
-        return Weekday.friday;
-      case "sat":
-        return Weekday.saturday;
-      case "sun":
-        return Weekday.sunday;
-      default:
-        throw "Invalid date short name.";
-    }
-  }
-
-  factory DaysOfWeek.parse(String s) {
-    final Map<Weekday, bool> days = { for (var e in Weekday.values) e : false };
-
-    // single day
-    if (!s.contains("-")) {
-      var day = _getDayFromShortName(s);
-      days.update(day, (val) => true);
-      return DaysOfWeek(startDay: day, endDay: day, days: days);
-    }
-
-    // date range
-    var dayNames = s.split("-");
-    final startDay = _getDayFromShortName(dayNames[0]);
-    final endDay = _getDayFromShortName(dayNames[1]);
-    int i = startDay.index;
-
-    // loop through to add all dates in date range to list
-    while(i != endDay.index) {
-      days.update(Weekday.values[i], (val) => true);
-
-      if (i < Weekday.values.length - 1) {
-        i++;
-      } else {
-        i = 0;
-      }
-    }
-    days.update(endDay, (val) => true);
-
-    return DaysOfWeek(
-      startDay: startDay,
-      endDay: endDay,
-      days: days,
-    );
-  }
-}
-
-enum Weekday {
-  monday,
-  tuesday,
-  wednesday,
-  thursday,
-  friday,
-  saturday,
-  sunday,
-}

lib/src/services/transportation/route.dart

@@ -0,0 +1,61 @@
+import 'dart:ui';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_map/flutter_map.dart';
+import 'package:furman_now/src/widgets/map/route_marker.dart';
+import 'package:latlong2/latlong.dart';
+
+class TransportationRoute {
+  final Polyline route;
+  final List<Stop> stops;
+
+  TransportationRoute({
+    required this.route,
+    required this.stops,
+  });
+
+  factory TransportationRoute.fromPoints({
+    required List<LatLng> points,
+    required Color color,
+    required List<Stop> stops,
+  }) {
+    var route = Polyline(
+      points: points,
+      color: color,
+      strokeWidth: 4,
+    );
+    return TransportationRoute(
+      route: route,
+      stops: stops,
+    );
+  }
+}
+
+class Stop {
+  int id;
+  String name;
+  LatLng location;
+
+  Stop({
+    required this.id,
+    required this.name,
+    required this.location,
+  });
+
+  factory Stop.fromLiveSafeJson(Map<String, dynamic> json) {
+    return Stop(
+      id: json["AddressID"],
+      name: json["Description"],
+      location: LatLng(json["Latitude"], json["Longitude"]),
+    );
+  }
+
+  Marker toMarker({required Color color}) {
+    return Marker(
+      point: location,
+      height: 100,
+      width: 100,
+      builder: (context) => RouteMarker(color: color),
+    );
+  }
+}

lib/src/services/transportation/saferide_shuttle.dart

@@ -1,3 +1,48 @@
-class TransportationSafeRideShuttleService {
+import 'dart:convert';
 
-}
+import 'package:flutter/material.dart';
+import 'package:furman_now/src/utils/decode_polyline.dart';
+import 'package:http/http.dart' as http;
+
+import 'route.dart';
+
+class TransportationSafeRideShuttleService {
+  static const service =
+      "https://furmansaferide.ridesystems.net/Services/JSONPRelay.svc";
+
+  static const apiKey = "8882812681";
+
+  static Future<http.Response> _serviceRequest(
+      String endpoint, Map<String, dynamic>? queryParameters) async {
+    Uri serviceUri = Uri.https(
+        'furmansaferide.ridesystems.net',
+        "/Services/JSONPRelay.svc/$endpoint",
+        {...?queryParameters, 'apiKey': apiKey});
+    return http.get(serviceUri);
+  }
+
+  static Future<TransportationRoute> fetchShuttleRoute() async {
+    final response = await _serviceRequest(
+        'GetRoutesForMapWithScheduleWithEncodedLine', {'isDispatch': 'false'});
+
+    if (response.statusCode == 200) {
+      // If the server did return a 200 OK response,
+      // then parse the JSON.
+      final json = jsonDecode(response.body);
+      String encodedPolyline = json[0]["EncodedPolyline"];
+      final points = decodeEncodedPolyline(encodedPolyline);
+      var stops = (json[0]["Stops"] as List<dynamic>)
+          .map((e) => Stop.fromLiveSafeJson(e))
+          .toList();
+      return TransportationRoute.fromPoints(
+        points: points,
+        color: Colors.red.shade300,
+        stops: stops,
+      );
+    } else {
+      // If the server did not return a 200 OK response,
+      // then throw an exception.
+      throw Exception('Failed to load SafeRide shuttle route.');
+    }
+  }
+}

lib/src/services/transportation/vehicle.dart

@@ -0,0 +1,20 @@
+import 'package:flutter/material.dart';
+
+abstract class TransportationVehicle {
+  // name of the vehicle
+  String get name;
+
+  // is the vehicle currently running?
+  VehicleStatus get status;
+
+  // name of vehicle's next stop
+  String get nextStop;
+
+  // vehicle icon
+  IconData get icon;
+
+  // vehicle route
+  TransitionRoute get route;
+}
+
+enum VehicleStatus { running, stopped }

lib/src/services/weather/weather_service.dart

@@ -0,0 +1,57 @@
+import 'package:furman_now/secrets.dart';
+import 'package:geolocator/geolocator.dart';
+import 'package:weather/weather.dart';
+
+class WeatherService {
+  static final WeatherFactory _factory = WeatherFactory(Secrets.openWeatherMapKey);
+
+  static Future<String> getWeatherMessage() async {
+    var position = await _determinePosition();
+    var weather = await _factory.currentWeatherByLocation(
+      position.latitude,
+      position.longitude,
+    );
+    return "It's ${weather.temperature?.fahrenheit?.round()}º with ${weather.weatherDescription}";
+  }
+
+  /// Determine the current position of the device.
+  ///
+  /// When the location services are not enabled or permissions
+  /// are denied the `Future` will return an error.
+  static Future<Position> _determinePosition() async {
+    bool serviceEnabled;
+    LocationPermission permission;
+
+    // Test if location services are enabled.
+    serviceEnabled = await Geolocator.isLocationServiceEnabled();
+    if (!serviceEnabled) {
+      // Location services are not enabled don't continue
+      // accessing the position and request users of the
+      // App to enable the location services.
+      return Future.error('Location services are disabled.');
+    }
+
+    permission = await Geolocator.checkPermission();
+    if (permission == LocationPermission.denied) {
+      permission = await Geolocator.requestPermission();
+      if (permission == LocationPermission.denied) {
+        // Permissions are denied, next time you could try
+        // requesting permissions again (this is also where
+        // Android's shouldShowRequestPermissionRationale
+        // returned true. According to Android guidelines
+        // your App should show an explanatory UI now.
+        return Future.error('Location permissions are denied');
+      }
+    }
+
+    if (permission == LocationPermission.deniedForever) {
+      // Permissions are denied forever, handle appropriately.
+      return Future.error(
+          'Location permissions are permanently denied, we cannot request permissions.');
+    }
+
+    // When we reach here, permissions are granted and we can
+    // continue accessing the position of the device.
+    return await Geolocator.getCurrentPosition();
+  }
+}

lib/src/store/index.dart

@@ -0,0 +1,37 @@
+import 'package:flutter/material.dart';
+import 'package:furman_now/src/services/buildings/buildings_service.dart';
+import 'package:furman_now/src/services/events/event.dart';
+import 'package:furman_now/src/services/events/events_service.dart';
+import 'package:furman_now/src/services/restaurants/restaurant_service.dart';
+
+class AppState extends ChangeNotifier {
+  late Future<List<Event>> events;
+  late Future<List<Restaurant>> restaurants;
+  late Future<List<Building>> buildings;
+
+  AppState() {
+    refresh();
+  }
+
+  void refresh() {
+    events = EventsService.fetchEvents();
+    restaurants = RestaurantService.fetchRestaurants();
+    buildings = BuildingsService.fetchBuildings();
+    notifyListeners();
+  }
+
+  @override
+  int get hashCode =>
+    events.hashCode ^
+    restaurants.hashCode ^
+    buildings.hashCode;
+
+  @override
+  bool operator ==(Object other) =>
+    identical(this, other) ||
+      other is AppState &&
+        runtimeType == other.runtimeType &&
+        events == other.events &&
+        restaurants == other.restaurants &&
+        buildings == other.buildings;
+}

lib/src/utils/conditional_parent_widget.dart

@@ -0,0 +1,51 @@
+import 'package:flutter/widgets.dart';
+
+/// Conditionally wrap a subtree with a parent widget without breaking the code tree.
+///
+/// [condition]: the condition depending on which the subtree [child] is wrapped with the parent.
+/// [child]: The subtree that should always be build.
+/// [conditionalBuilder]: builds the parent with the subtree [child].
+///
+/// ___________
+/// Usage:
+/// ```dart
+/// return ConditionalParentWidget(
+///   condition: shouldIncludeParent,
+///   child: Widget1(
+///     child: Widget2(
+///       child: Widget3(),
+///     ),
+///   ),
+///   conditionalBuilder: (Widget child) => SomeParentWidget(child: child),
+///);
+/// ```
+///
+/// ___________
+/// Instead of:
+/// ```dart
+/// Widget child = Widget1(
+///   child: Widget2(
+///     child: Widget3(),
+///   ),
+/// );
+///
+/// return shouldIncludeParent ? SomeParentWidget(child: child) : child;
+/// ```
+///
+class ConditionalParentWidget extends StatelessWidget {
+  const ConditionalParentWidget({
+    required this.child,
+    required this.condition,
+    required this.conditionalBuilder,
+    Key? key,
+  }) : super(key: key);
+
+  final Widget child;
+  final bool condition;
+  final Widget Function(Widget child) conditionalBuilder;
+
+  @override
+  Widget build(BuildContext context) {
+    return condition ? conditionalBuilder(child) : child;
+  }
+}

lib/src/utils/decode_polyline.dart

@@ -0,0 +1,34 @@
+import 'package:latlong2/latlong.dart';
+
+/// Decodes the an encoded polyline using the Encoded Polyline Algorithm Format
+/// for more info about the algorithm check
+/// https://developers.google.com/maps/documentation/utilities/polylinealgorithm
+List<LatLng> decodeEncodedPolyline(String encoded) {
+  List<LatLng> poly = [];
+  int index = 0, len = encoded.length;
+  int lat = 0, lng = 0;
+
+  while (index < len) {
+    int b, shift = 0, result = 0;
+    do {
+      b = encoded.codeUnitAt(index++) - 63;
+      result |= (b & 0x1f) << shift;
+      shift += 5;
+    } while (b >= 0x20);
+    int dlat = ((result & 1) != 0 ? ~(result >> 1) : (result >> 1));
+    lat += dlat;
+
+    shift = 0;
+    result = 0;
+    do {
+      b = encoded.codeUnitAt(index++) - 63;
+      result |= (b & 0x1f) << shift;
+      shift += 5;
+    } while (b >= 0x20);
+    int dlng = ((result & 1) != 0 ? ~(result >> 1) : (result >> 1));
+    lng += dlng;
+    LatLng p = LatLng((lat / 1E5).toDouble(), (lng / 1E5).toDouble());
+    poly.add(p);
+  }
+  return poly;
+}

lib/src/utils/hero_empty_router_page.dart

@@ -0,0 +1,14 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter/material.dart';
+
+class HeroEmptyRouterPage extends StatelessWidget {
+  const HeroEmptyRouterPage({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return HeroControllerScope(
+      controller: HeroController(),
+      child: const AutoRouter(),
+    );
+  }
+}

lib/src/utils/theme.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:google_fonts/google_fonts.dart';
 
 ThemeData _baseTheme = ThemeData(
@@ -8,26 +9,53 @@ ThemeData _baseTheme = ThemeData(
     unselectedItemColor: Colors.grey[500],
   ),
   textTheme: TextTheme(
-    headline1: TextStyle(
+    headlineLarge: TextStyle(
       color: Colors.grey[800],
       fontWeight: FontWeight.w900,
       fontSize: 22,
     ),
-    subtitle1: TextStyle(
+    titleLarge: TextStyle(
+      color: Colors.grey[800],
+      fontSize: 18,
+      fontWeight: FontWeight.w700,
+    ),
+    titleSmall: TextStyle(
+      color: Colors.grey[800],
+      fontWeight: FontWeight.w700,
+    ),
+    labelLarge: TextStyle(
       color: Colors.grey[500],
       fontWeight: FontWeight.w500,
       fontSize: 16,
     ),
-    subtitle2: TextStyle(
+    labelMedium: TextStyle(
       color: Colors.grey[500],
       fontWeight: FontWeight.w500,
       fontSize: 14,
     ),
   ),
+  pageTransitionsTheme: const PageTransitionsTheme(
+    builders: {
+      TargetPlatform.android:
+        CupertinoPageTransitionsBuilder(),
+      TargetPlatform.iOS:
+        CupertinoPageTransitionsBuilder(),
+    },
+  ),
 );
 
 ThemeData myFurmanTheme = _baseTheme.copyWith(
   textTheme: GoogleFonts.interTextTheme(_baseTheme.textTheme),
 );
 
-var furmanTextStyle = (TextStyle baseStyle) => GoogleFonts.inter(textStyle: baseStyle);
+var furmanTextStyle =
+    (TextStyle baseStyle) => GoogleFonts.inter(textStyle: baseStyle);
+
+SystemUiOverlayStyle constructOverlayStyle({bool dark = false}) {
+  return SystemUiOverlayStyle(
+      statusBarColor: Colors.transparent,
+      systemNavigationBarContrastEnforced: true,
+      statusBarIconBrightness: dark ? Brightness.dark : Brightness.light,
+      statusBarBrightness: dark ? Brightness.light : Brightness.dark,
+      systemNavigationBarColor: Colors.grey.shade50);
+}

lib/src/utils/translucent_route.dart

@@ -0,0 +1,51 @@
+import 'package:flutter/material.dart';
+
+class TranslucentRoute<T> extends TransitionRoute<T> {
+  final bool _opaque;
+  final Duration _transitionDuration;
+  final Widget Function(
+      BuildContext context,
+      Animation<double> animation,
+      Animation<double> secondaryAnimation,
+      Widget child
+    ) _transitionBuilder;
+  final Widget Function(BuildContext) _pageBuilder;
+
+  TranslucentRoute({
+    opaque = true,
+    transitionDuration = const Duration(milliseconds: 300),
+    required Widget Function(
+        BuildContext context,
+        Animation<double> animation,
+        Animation<double> secondaryAnimation,
+        Widget child
+      ) transitionBuilder,
+    required Widget Function(BuildContext) pageBuilder,
+    RouteSettings? settings,
+  }):
+    _opaque = opaque,
+    _transitionDuration = transitionDuration,
+    _transitionBuilder = transitionBuilder,
+    _pageBuilder = pageBuilder,
+    super(settings: settings);
+
+  @override
+  Iterable<OverlayEntry> createOverlayEntries() {
+    return <OverlayEntry>[
+      OverlayEntry(
+        builder: (context) => _transitionBuilder(
+          context,
+          animation!,
+          secondaryAnimation!,
+          _pageBuilder(context),
+        ),
+      ),
+    ];
+  }
+
+  @override
+  bool get opaque => _opaque;
+
+  @override
+  Duration get transitionDuration => _transitionDuration;
+}

lib/src/widgets/events/event_card.dart

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:furman_now/src/services/events/event.dart';
 import 'package:furman_now/src/utils/theme.dart';
 import 'package:furman_now/src/widgets/events/event_modal.dart';
+import 'package:furman_now/src/widgets/text_with_icon.dart';
 import 'package:intl/intl.dart';
 
 class EventCard extends StatelessWidget {
@@ -33,12 +34,6 @@ class EventCard extends StatelessWidget {
           context,
           event,
         );
-        // showModalBottomSheet<void>(
-        //     context: context,
-        //     builder: (BuildContext context) {
-        //       return EventModal(event: event);
-        //     }
-        // );
       },
       child: Container(
         decoration: const BoxDecoration(
@@ -53,8 +48,11 @@ class EventCard extends StatelessWidget {
                 child: Column(
                   mainAxisAlignment: MainAxisAlignment.center,
                   children: [
-                    Text(eventHour, style: furmanTextStyle(const TextStyle(fontWeight: FontWeight.w700))),
+                    Text(eventHour, style: furmanTextStyle(TextStyle(
-                    Text(eventAmPm, style: Theme.of(context).textTheme.subtitle2),
+                      color: Colors.grey[800],
+                      fontWeight: FontWeight.w700
+                    ))),
+                    Text(eventAmPm, style: Theme.of(context).textTheme.labelMedium),
                   ],
                 ),
               ),
@@ -69,35 +67,19 @@ class EventCard extends StatelessWidget {
                   child: Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
-                      Text(event.title, style: furmanTextStyle(const TextStyle(fontWeight: FontWeight.w600))),
+                      Text(event.title, style: Theme.of(context).textTheme.titleSmall),
                       const SizedBox(height: 6),
-                      RichText(text: TextSpan(
+                      TextWithIcon(
-                        style: Theme.of(context).textTheme.subtitle2,
+                        icon: Icons.place_outlined,
-                        children: [
+                        text: event.location,
-                          WidgetSpan(
+                        size: TextWithIconSize.small,
-                            alignment: PlaceholderAlignment.middle,
+                      ),
-                            child: Padding(
-                              padding: const EdgeInsets.only(right: 5.0),
-                              child: Icon(Icons.place_outlined, size: 20, color: Colors.grey[500])
-                            ),
-                          ),
-                          TextSpan(text: event.location),
-                        ],
-                      )),
                       const SizedBox(height: 2),
-                      RichText(text: TextSpan(
+                      TextWithIcon(
-                        style: Theme.of(context).textTheme.subtitle2,
+                        icon: Icons.sell_outlined,
-                        children: [
+                        text: event.category,
-                          WidgetSpan(
+                        size: TextWithIconSize.small,
-                            alignment: PlaceholderAlignment.middle,
+                      ),
-                            child: Padding(
-                                padding: const EdgeInsets.only(left: 1.0, right: 6.0),
-                                child: Icon(Icons.sell_outlined, size: 18, color: Colors.grey[500])
-                            ),
-                          ),
-                          TextSpan(text: event.category),
-                        ],
-                      )),
                     ],
                   ),
                 ),

lib/src/widgets/events/event_modal.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:furman_now/src/services/events/event.dart';
 import 'package:furman_now/src/services/events/events_service.dart';
+import 'package:furman_now/src/widgets/text_with_icon.dart';
 import 'package:intl/intl.dart';
 
 void showEventsModal(BuildContext context, Event event) {
@@ -30,17 +31,20 @@ class _EventModalState extends State<_EventModal> {
   var childSize = Size.zero;
   BoxConstraints? _parentConstraints;
   final _key = GlobalKey();
+
+  static const _maxDialogHeight = 0.8;
   
-  double _maxChildHeight = 0.75;
+  var _maxChildHeight = _maxDialogHeight;
 
   void updateMaxHeight() {
     if (_parentConstraints != null) {
       var listHeight = _key.currentContext?.size?.height;
       var parentHeight = _parentConstraints?.maxHeight;
       if (listHeight != null && parentHeight != null) {
-        var maxHeight = (listHeight + 50) / parentHeight;
+        var maxHeight = (listHeight + 70) / parentHeight;
         setState(() {
-          _maxChildHeight = (maxHeight < 0.75) ? maxHeight : 0.75;
+          _maxChildHeight = (maxHeight < _maxDialogHeight)
+              ? maxHeight : _maxDialogHeight;
         });
       }
     }
@@ -78,11 +82,13 @@ class _EventModalState extends State<_EventModal> {
                             child: CloseButton(),
                           ),
                           Flexible(
-                            child: NotificationListener<OverscrollIndicatorNotification>(
+                            child: NotificationListener
-                              onNotification: (OverscrollIndicatorNotification overscroll) {
+                              <OverscrollIndicatorNotification>(
-                                overscroll.disallowIndicator();
+                              onNotification:
-                                return true;
+                                (OverscrollIndicatorNotification overscroll) {
-                              },
+                                  overscroll.disallowIndicator();
+                                  return true;
+                                },
                               child: _EventModalContent(
                                 key: _key,
                                 controller: controller,
@@ -123,120 +129,55 @@ class _EventModalContent extends StatelessWidget {
         // Title
         Text(
           event.title,
-          style: Theme.of(context).textTheme.headline1,
+          style: Theme.of(context).textTheme.headlineLarge,
         ),
         const SizedBox(height: 10),
         // Location
-        RichText(text: TextSpan(
+        TextWithIcon(
-          style: Theme.of(context).textTheme.subtitle1,
+            icon: Icons.place_outlined,
-          children: [
+            text: event.location,
-            WidgetSpan(
+        ),
-              alignment: PlaceholderAlignment.middle,
-              child: Padding(
-                  padding: const EdgeInsets.only(right: 5.0),
-                  child: Icon(
-                      Icons.place_outlined, size: 24,
-                      color: Colors.grey[500])
-              ),
-            ),
-            TextSpan(text: event.location),
-          ],
-        )),
         const SizedBox(height: 5),
-        if (event is ClpEvent) ...[
+        // Additional info for CLP events
-          // Organization
+        if (event is ClpEvent) ...(() {
-          RichText(text: TextSpan(
+          final clpEvent = event as ClpEvent;
-            style: Theme.of(context).textTheme.subtitle1,
+          return [
-            children: [
+            // Organization
-              WidgetSpan(
+            TextWithIcon(
-                alignment: PlaceholderAlignment.middle,
+                icon: Icons.group_outlined,
-                child: Padding(
+                text: clpEvent.organization
-                    padding: const EdgeInsets.only(right: 5.0),
+            ),
-                    child: Icon(
+            const SizedBox(height: 5),
-                        Icons.group_outlined,
+            // Time
-                        size: 24,
+            TextWithIcon(
-                        color: Colors.grey[500]
+                icon: Icons.access_time_outlined,
-                    ),
+                text:
-                ),
+                  "${DateFormat("EEEE, MMMM d").format(clpEvent.startTime)}"
-              ),
+                  "\n"
-              TextSpan(text: (event as ClpEvent).organization),
+                  "${DateFormat.jm().format(clpEvent.startTime)} - ${DateFormat.jm().format(clpEvent.endTime)}",
-            ],
+            ),
-          )),
+            const SizedBox(height: 5),
-          const SizedBox(height: 5),
+            // Description
-          // Time
+            TextWithIcon(
-          RichText(text: TextSpan(
+              icon: Icons.notes,
-            style: Theme.of(context).textTheme.subtitle1,
+              text: clpEvent.description
-            children: [
+            ),
-              WidgetSpan(
+          ];
-                alignment: PlaceholderAlignment.middle,
+        })(),
-                child: Padding(
+        // Additional info for Athletics Events
-                    padding: const EdgeInsets.only(
+        if (event is AthleticsEvent) ...(() {
-                        right: 5.0),
+          final athleticsEvent = event as AthleticsEvent;
-                    child: Icon(
+          return [
-                        Icons.access_time_outlined,
+            // Time
-                        size: 24,
+            TextWithIcon(
-                        color: Colors.grey[500])
+              icon: Icons.access_time_outlined,
-                ),
+              text:
-              ),
+                "${DateFormat("EEEE, MMMM d").format(athleticsEvent.time)}"
-              WidgetSpan(
+                "\n"
-                  alignment: PlaceholderAlignment.top,
+                "${DateFormat.jm().format(athleticsEvent.time)}",
-                  child: Column(
+            ),
-                    crossAxisAlignment: CrossAxisAlignment
+          ];
-                        .start,
+        })(),
-                    children: [
-                      Text(
-                        DateFormat("EEEE, MMMM d")
-                            .format(
-                            (event as ClpEvent)
-                                .startTime),
-                        style: Theme
-                            .of(context)
-                            .textTheme
-                            .subtitle1,
-                      ),
-                      Text(
-                        "${DateFormat.jm().format(
-                            (event as ClpEvent)
-                                .startTime)} - ${DateFormat
-                            .jm().format(
-                            (event as ClpEvent)
-                                .endTime)}",
-                        style: Theme
-                            .of(context)
-                            .textTheme
-                            .subtitle1,
-                      ),
-                    ],
-                  )
-              ),
-            ],
-          )),
-          const SizedBox(height: 5),
-          // Description
-          Row(
-            crossAxisAlignment: CrossAxisAlignment
-                .start,
-            children: [
-              Padding(
-                  padding: const EdgeInsets.only(
-                      right: 5.0),
-                  child: Icon(Icons.notes, size: 24,
-                      color: Colors
-                          .grey[500])
-              ),
-              Flexible(
-                child: Text(
-                  (event as ClpEvent)
-                      .description,
-                  style: Theme
-                      .of(context)
-                      .textTheme
-                      .subtitle1,
-                ),
-              ),
-            ],
-          ),
-        ]
       ],
     );
   }

lib/src/widgets/events/events_list.dart

@@ -1,30 +1,36 @@
 import 'package:flutter/material.dart';
 import 'package:furman_now/src/services/events/event.dart';
-import 'package:furman_now/src/services/events/events_service.dart';
+import 'package:furman_now/src/store/index.dart';
 import 'package:furman_now/src/utils/theme.dart';
+import 'package:provider/provider.dart';
 
 import 'event_card.dart';
 
 class EventsList extends StatefulWidget {
   final DateTimeRange dateRange;
+  final int? limit;
 
   const EventsList._({
     required this.dateRange,
+    this.limit,
     Key? key,
   }) : super(key: key);
 
   factory EventsList({
     DateTimeRange? dateRange,
+    int? limit,
     Key? key,
   }) {
     if (dateRange == null) {
       final now = DateTime.now();
-      final today = DateTime(now.year, now.month, now.day);
+      // final today = DateTime(now.year, now.month, now.day);
       final tonight = DateTime(now.year, now.month, now.day, 23, 59, 59);
-      dateRange = DateTimeRange(start: today, end: tonight);
+      // dateRange = DateTimeRange(start: today, end: tonight);
+      dateRange = DateTimeRange(start: now, end: tonight);
     }
     return EventsList._(
       dateRange: dateRange,
+      limit: limit,
       key: key,
     );
   }
@@ -34,62 +40,64 @@ class EventsList extends StatefulWidget {
 }
 
 class _EventsListState extends State<EventsList> {
-  late Future<Iterable<Event>> futureEventList;
-
-  @override
-  void initState() {
-    super.initState();
-    futureEventList = EventsService.fetchEvents();
-  }
 
   @override
   Widget build(BuildContext context) {
-    return FutureBuilder<Iterable<Event>>(
+    return Consumer<AppState>(
-      future: futureEventList,
+      builder: (context, state, child) {
-      builder: (context, snapshot) {
+        return FutureBuilder<Iterable<Event>>(
-        if (snapshot.hasData) {
+          future: state.events,
-          var events = snapshot.data!.where((event) {
+          builder: (context, snapshot) {
-            return event.time.isAfter(widget.dateRange.start) && event.time.isBefore(widget.dateRange.end);
+            if (snapshot.hasData) {
-          });
+              var events = snapshot.data!.where((event) {
-          if (events.isNotEmpty) {
+              return event.time.isAfter(widget.dateRange.start) &&
-            return Column(
+                  event.time.isBefore(widget.dateRange.end);
-                children: events.map((event) {
+            });
-                  return Padding(
+            if (widget.limit != null) {
-                    padding: const EdgeInsets.only(bottom: 15),
+              events = events.take(widget.limit!);
-                    child: EventCard(event),
+            }
-                  );
+            if (events.isNotEmpty) {
-                }).toList());
+              return Column(
-          } else {
+                  children: events.map((event) {
-            return Padding(
+                return Padding(
-              padding: const EdgeInsets.only(bottom: 15),
+                  padding: const EdgeInsets.only(bottom: 15),
-              child: SizedBox(
+                  child: EventCard(event),
-                width: double.infinity,
+                );
-                height: 50,
+              }).toList());
-                child: Center(
+            } else {
-                  child: Text(
+              return Padding(
-                    "No events today :(",
+                padding: const EdgeInsets.only(bottom: 15),
-                    style: furmanTextStyle(TextStyle(
+                child: SizedBox(
-                      color: Colors.grey[600],
+                    width: double.infinity,
-                      fontSize: 16,
+                    height: 50,
-                      fontWeight: FontWeight.w600,
+                    child: Center(
-                    )),
+                      child: Text(
+                        "No events today :(",
+                        style: furmanTextStyle(TextStyle(
+                          color: Colors.grey[600],
+                          fontSize: 16,
+                          fontWeight: FontWeight.w600,
+                        )),
+                      ),
+                    ),
                   ),
-                ),
+                );
+              }
+            } else if (snapshot.hasError) {
+              return Text(
+                '${snapshot.error}', style: const TextStyle(color: Colors.red),);
+            }
+
+            // By default, show a loading spinner.
+            return const Center(
+              child: Padding(
+                  padding: EdgeInsets.symmetric(vertical: 25),
+                  child: CircularProgressIndicator()
               ),
             );
-          }
+          },
-        } else if (snapshot.hasError) {
-          return Text('${snapshot.error}', style: const TextStyle(color: Colors.red),);
-        }
-
-        // By default, show a loading spinner.
-        return const Center(
-          child: Padding(
-              padding: EdgeInsets.symmetric(vertical: 25),
-              child: CircularProgressIndicator()
-          ),
         );
-      },
+      }
     );
   }
 }

lib/src/widgets/header.dart

@@ -15,7 +15,7 @@ class HeaderWidget extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Container(
-      padding: const EdgeInsets.only(left: 40, right: 40, top: 20, bottom: 15),
+      padding: const EdgeInsets.only(left: 40, right: 36, top: 20, bottom: 15),
       child: Row(
         mainAxisAlignment: MainAxisAlignment.spaceBetween,
         crossAxisAlignment: CrossAxisAlignment.center,
@@ -31,13 +31,17 @@ class HeaderWidget extends StatelessWidget {
           if (link != null)
             GestureDetector(
               onTap: () => context.router.navigate(link!.href),
-              child: Text(
+              behavior: HitTestBehavior.translucent,
-                link!.text,
+              child: Padding(
-                style: furmanTextStyle(const TextStyle(
+                padding: const EdgeInsets.all(6),
-                  color: Color(0xff755898),
+                child: Text(
-                  fontSize: 12,
+                  link!.text,
-                  fontWeight: FontWeight.bold,
+                  style: furmanTextStyle(const TextStyle(
-                )),
+                    color: Color(0xff755898),
+                    fontSize: 12,
+                    fontWeight: FontWeight.bold,
+                  )),
+                ),
               ),
             ),
         ],

lib/src/widgets/home/restaurants/restaurants_list.dart

@@ -1,5 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:furman_now/src/services/restaurants/restaurant_service.dart';
+import 'package:furman_now/src/store/index.dart';
+import 'package:provider/provider.dart';
 
 import 'restaurant_card.dart';
 
@@ -11,51 +13,48 @@ class RestaurantsList extends StatefulWidget {
 }
 
 class _RestaurantsListState extends State<RestaurantsList> {
-  late Future<List<Restaurant>> futureEventList;
-
-  @override
-  void initState() {
-    super.initState();
-    futureEventList = RestaurantService.fetchRestaurants();
-  }
-
   @override
   Widget build(BuildContext context) {
-    return FutureBuilder<List<Restaurant>>(
+    return Consumer<AppState>(
-      future: futureEventList,
+      builder: (context, state, child) {
-      builder: (context, snapshot) {
+        return FutureBuilder<List<Restaurant>>(
-        if (snapshot.hasData) {
+          future: state.restaurants,
-          var restaurants = snapshot.data!..sort((r1, r2) => (r1.isOpen ? 0 : 1) - (r2.isOpen ? 0 : 1));
+          builder: (context, snapshot) {
-          return SizedBox(
+            if (snapshot.hasData) {
-            height: 175,
+              var restaurants = snapshot.data!..sort((r1, r2) => (r1.isOpen ? 0 : 1) - (r2.isOpen ? 0 : 1));
-            child: ListView.builder(
+              return SizedBox(
-              padding: const EdgeInsets.only(left: 20),
+                height: 175,
-              itemCount: restaurants.length,
+                child: ListView.builder(
-              cacheExtent: 10000,
+                  padding: const EdgeInsets.only(left: 20),
-              scrollDirection: Axis.horizontal,
+                  itemCount: restaurants.length,
-              prototypeItem: Padding(
+                  cacheExtent: 10000,
-                padding: const EdgeInsets.only(right: 15),
+                  scrollDirection: Axis.horizontal,
-                child: RestaurantCard(restaurant: restaurants.first),
+                  physics: const BouncingScrollPhysics(),
-              ),
+                  prototypeItem: Padding(
-              itemBuilder: (context, index) => Padding(
+                    padding: const EdgeInsets.only(right: 15),
-                padding: const EdgeInsets.only(right: 15),
+                    child: RestaurantCard(restaurant: restaurants.first),
-                child: RestaurantCard(restaurant: restaurants[index]),
+                  ),
-              ),
+                  itemBuilder: (context, index) => Padding(
-            ),
+                    padding: const EdgeInsets.only(right: 15),
-          );
+                    child: RestaurantCard(restaurant: restaurants[index]),
-        } else if (snapshot.hasError) {
+                  ),
-          return Padding(
+                ),
-            padding: const EdgeInsets.symmetric(horizontal: 20),
+              );
-            child: Text('${snapshot.error}', style: const TextStyle(color: Colors.red))
+            } else if (snapshot.hasError) {
-          );
+              return Padding(
-        }
+                  padding: const EdgeInsets.symmetric(horizontal: 20),
+                  child: Text('${snapshot.error}', style: const TextStyle(color: Colors.red))
+              );
+            }
 
-        // By default, show a loading spinner.
+            // By default, show a loading spinner.
-        return const Center(
+            return const Center(
-          child: Padding(
+              child: Padding(
-              padding: EdgeInsets.symmetric(vertical: 25),
+                  padding: EdgeInsets.symmetric(vertical: 25),
-              child: CircularProgressIndicator()
+                  child: CircularProgressIndicator()
-          ),
+              ),
+            );
+          },
         );
       },
     );

lib/src/widgets/info/info_card.dart

@@ -1,46 +1,76 @@
 import 'package:flutter/material.dart';
+import 'package:furman_now/src/utils/conditional_parent_widget.dart';
+import 'package:furman_now/src/widgets/text_with_icon.dart';
+
+class InfoCardItem {
+  final String name;
+  final IconData icon;
+
+  InfoCardItem({
+    required this.name,
+    required this.icon,
+  });
+}
 
 class InfoCard extends StatelessWidget {
-  final Color color;
-  final IconData icon;
   final String title;
-  final String description;
+  final IconData icon;
+  final List<InfoCardItem> items;
+  final void Function()? onClick;
 
   const InfoCard({
-    required this.color,
-    required this.icon,
     required this.title,
-    required this.description,
+    required this.icon,
+    required this.items,
+    this.onClick,
     Key? key
   }) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
-    return Container(
+    return ConditionalParentWidget(
-      decoration: BoxDecoration(
+      condition: onClick != null,
-        color: color,
+      conditionalBuilder: (child) => GestureDetector(
-        borderRadius: BorderRadius.circular(10),
+        onTap: onClick,
+        child: child,
       ),
-      child: Row(
+      child: Container(
-        children: [
+        decoration: BoxDecoration(
-          Padding(
+          color: Colors.grey.shade100,
+          borderRadius: BorderRadius.circular(10),
+        ),
+        child: Row(
+          children: [
+            Padding(
               padding: const EdgeInsets.only(left: 15, right: 5),
-              child: Icon(icon, size: 40,)
+              child: Icon(
-          ),
+                icon,
-          Flexible(
+                size: 40,
-            child: Container(
+                color: Colors.grey.shade800,
-              padding: const EdgeInsets.symmetric(horizontal: 15, vertical: 10),
-              child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    Text(title, style: Theme.of(context).textTheme.titleLarge,),
-                    Text(description),
-                  ]
               ),
             ),
-          )
+            Flexible(
-        ],
+              child: Container(
+                padding: const EdgeInsets.symmetric(horizontal: 15, vertical: 12),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Text(title, style: Theme.of(context).textTheme.titleSmall),
+                    const SizedBox(height: 6),
+                    ...(items.map((item) =>
+                      TextWithIcon(
+                        icon: item.icon,
+                        text: item.name,
+                        size: TextWithIconSize.small,
+                      )
+                    ).toList()),
+                  ]
+                ),
+              ),
+            )
+          ],
+        ),
       ),
     );
   }
-}
+}

lib/src/widgets/info/info_category_card.dart

@@ -0,0 +1,63 @@
+import 'package:flutter/material.dart';
+import 'package:furman_now/src/utils/theme.dart';
+
+class InfoCategoryCard extends StatelessWidget {
+  final Color color;
+  final IconData icon;
+  final String title;
+  final String description;
+
+  const InfoCategoryCard({
+    required this.color,
+    required this.icon,
+    required this.title,
+    required this.description,
+    Key? key
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      decoration: BoxDecoration(
+        color: color,
+        borderRadius: BorderRadius.circular(10),
+      ),
+      child: Row(
+        children: [
+          Padding(
+            padding: const EdgeInsets.only(left: 15, right: 5),
+            child: Icon(
+              icon,
+              size: 40,
+              color: Colors.grey.shade800,
+            ),
+          ),
+          Flexible(
+            child: Container(
+              padding: const EdgeInsets.symmetric(
+                horizontal: 15,
+                vertical: 12,
+              ),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Text(
+                    title,
+                    style: Theme.of(context).textTheme.titleLarge
+                  ),
+                  const SizedBox(height: 1),
+                  Text(
+                    description,
+                    style: furmanTextStyle(TextStyle(
+                      color: Colors.grey.shade700,
+                    )),
+                  ),
+                ],
+              ),
+            ),
+          )
+        ],
+      ),
+    );
+  }
+}

lib/src/widgets/map/filter_chip.dart

@@ -4,51 +4,56 @@ import 'package:furman_now/src/utils/theme.dart';
 class MapFilterChip extends StatelessWidget {
   final IconData icon;
   final String text;
+  final Function callback;
 
   const MapFilterChip({
     required this.icon,
     required this.text,
+    required this.callback,
     Key? key
   }) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
-    return Container(
+    return GestureDetector(
-      padding: const EdgeInsets.only(
+      onTapDown: (e) => callback(),
-          top: 6, bottom: 6, left: 8, right: 12),
+      child: Container(
-      decoration: BoxDecoration(
+        padding: const EdgeInsets.only(
-        color: Colors.white,
+            top: 6, bottom: 6, left: 8, right: 12),
-        borderRadius: BorderRadius.circular(100),
+        decoration: BoxDecoration(
-        boxShadow: const [
+          color: Colors.white,
-          BoxShadow(
+          borderRadius: BorderRadius.circular(100),
-            color: Color(0x33000000),
+          boxShadow: const [
-            blurRadius: 4,
+            BoxShadow(
-          ),
+              color: Color(0x33000000),
-        ],
+              blurRadius: 4,
-      ),
-      child: RichText(
-        text: TextSpan(
-          children: [
-            WidgetSpan(
-              child: Icon(icon,
-                  size: 18,
-                  color: Colors.grey.shade800),
-              alignment: PlaceholderAlignment.middle,
-            ),
-            const WidgetSpan(child: SizedBox(width: 6)),
-            WidgetSpan(
-              alignment: PlaceholderAlignment.middle,
-              child: Text(
-                text,
-                style: furmanTextStyle(TextStyle(
-                  fontSize: 14,
-                  fontWeight: FontWeight.w600,
-                  color: Colors.grey.shade800,
-                )),
-              ),
             ),
           ],
         ),
+        child: RichText(
+          text: TextSpan(
+            children: [
+              WidgetSpan(
+                child: Icon(icon,
+                    size: 18,
+                    color: Colors.grey.shade800),
+                alignment: PlaceholderAlignment.middle,
+              ),
+              const WidgetSpan(child: SizedBox(width: 6)),
+              WidgetSpan(
+                alignment: PlaceholderAlignment.middle,
+                child: Text(
+                  text,
+                  style: furmanTextStyle(TextStyle(
+                    fontSize: 14,
+                    fontWeight: FontWeight.w600,
+                    color: Colors.grey.shade800,
+                  )),
+                ),
+              ),
+            ],
+          ),
+        ),
       ),
     );
   }

lib/src/widgets/map/map_header.dart

@@ -0,0 +1,92 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_remix/flutter_remix.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+import 'package:furman_now/src/routes/index.gr.dart';
+import 'package:furman_now/src/screens/map/state.dart';
+import 'package:furman_now/src/utils/theme.dart';
+
+class MapHeader extends StatelessWidget {
+  final String? activeCategory;
+
+  const MapHeader({
+    this.activeCategory,
+    Key? key,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 12),
+      child: Container(
+        width: double.infinity,
+        height: 50,
+        padding: const EdgeInsets.only(left: 10, right: 20),
+        decoration: const BoxDecoration(
+          color: Colors.white,
+          borderRadius: BorderRadius.all(Radius.circular(60)),
+          boxShadow: [
+            BoxShadow(
+              color: Color(0x33000000),
+              blurRadius: 8,
+            ),
+          ],
+        ),
+        child: Stack(
+          children: [
+            Align(
+              alignment: Alignment.centerLeft,
+              child: AnimatedCrossFade(
+                duration: const Duration(milliseconds: 300),
+                crossFadeState: activeCategory == null ? CrossFadeState.showFirst : CrossFadeState.showSecond,
+                firstChild: GestureDetector(
+                  onTapDown: (e) => context.router.push(MapCategoryRoute(
+                    category: MapCategory(
+                      name: "Restaurants",
+                      icon: FlutterRemix.restaurant_line,
+                      activator: () => null,
+                    ),
+                  )),
+                  child: Wrap(
+                    crossAxisAlignment: WrapCrossAlignment.center,
+                    children: [
+                      SvgPicture.asset("assets/images/bell-tower.svg", color: Theme.of(context).primaryColor, height: 32),
+                      const SizedBox(width: 10),
+                      Text(
+                        "Search locations",
+                        style: furmanTextStyle(TextStyle(
+                          fontSize: 18,
+                          fontWeight: FontWeight.w500,
+                          color: Colors.grey.shade500,
+                        )),
+                      ),
+                    ],
+                  ),
+                ),
+                secondChild: Wrap(
+                  crossAxisAlignment: WrapCrossAlignment.center,
+                  children: [
+                    GestureDetector(
+                      onTapDown: (e) => context.router.navigateBack(),
+                      child: Icon(FlutterRemix.arrow_left_line, size: 28, color: Colors.grey.shade800,),
+                    ),
+                    const SizedBox(width: 10),
+                    if (activeCategory != null)
+                      Text(
+                        activeCategory!,
+                        style: furmanTextStyle(TextStyle(
+                          fontSize: 18,
+                          fontWeight: FontWeight.w600,
+                          color: Colors.grey.shade800,
+                        )),
+                      ),
+                  ],
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/src/widgets/scroll_view_height.dart

@@ -2,20 +2,34 @@ import 'package:flutter/material.dart';
 
 class ScrollViewWithHeight extends StatelessWidget {
   final Widget child;
+  final ScrollController? controller;
 
   const ScrollViewWithHeight({
     required this.child,
+    this.controller,
     Key? key,
   }) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
     return LayoutBuilder(builder: (BuildContext context, BoxConstraints constraints) {
-      return SingleChildScrollView(
+      return CustomScrollView(
-        child: ConstrainedBox(
+        controller: controller,
-          constraints: constraints.copyWith(minHeight: constraints.maxHeight, maxHeight: double.infinity),
+        physics: const BouncingScrollPhysics(
-          child: child,
+          parent: AlwaysScrollableScrollPhysics(),
         ),
+        slivers: [
+          SliverFillRemaining(
+            hasScrollBody: false,
+            child: ConstrainedBox(
+              constraints: constraints.copyWith(
+                minHeight: constraints.maxHeight,
+                maxHeight: double.infinity
+              ),
+              child: child,
+            ),
+          ),
+        ],
       );
     });
   }

lib/src/widgets/text_with_icon.dart

@@ -0,0 +1,44 @@
+import 'package:flutter/material.dart';
+
+enum TextWithIconSize {
+  small,
+  large,
+}
+
+class TextWithIcon extends StatelessWidget {
+  final IconData icon;
+  final String text;
+  final TextWithIconSize size;
+
+  const TextWithIcon({
+    super.key,
+    required this.icon,
+    required this.text,
+    this.size = TextWithIconSize.large,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Padding(
+          padding: const EdgeInsets.only(right: 5.0),
+          child: Icon(
+            icon,
+            size: size == TextWithIconSize.large ? 24 : 20,
+            color: Colors.grey[500],
+          ),
+        ),
+        Flexible(
+          child: Text(
+            text,
+            style: size == TextWithIconSize.large
+              ? Theme.of(context).textTheme.labelLarge
+              : Theme.of(context).textTheme.labelMedium,
+          ),
+        ),
+      ],
+    );
+  }
+}

pubspec.yaml

@@ -1,5 +1,5 @@
 name: furman_now
-description: A new Flutter project.
+description: The place for all things Furman.
 
 # The following line prevents the package from being accidentally published to
 # pub.dev using `flutter pub publish`. This is preferred for private packages.
@@ -35,7 +35,7 @@ dependencies:
   cupertino_icons: ^1.0.2
   english_words: ^4.0.0
   intl: ^0.17.0
-  google_fonts: ^3.0.1
+  google_fonts: ^4.0.4
   http: ^0.13.5
   convert: ^3.0.2
   crypto: ^3.0.2
@@ -47,6 +47,18 @@ dependencies:
   flutter_svg: ^1.1.4
   auto_route: ^5.0.1
   flutter_map_location_marker: ^4.1.4
+  salomon_bottom_bar: ^3.3.1
+  flutter_remix: ^0.0.3
+  provider: ^6.0.3
+  weather: ^2.0.1
+  geolocator: ^9.0.1
+  flutter_map_marker_cluster: ^0.5.4
+  transparent_pointer: ^1.0.0
+  url_launcher: ^6.1.5
+  external_app_launcher: ^3.1.0
+  morphable_shape: ^1.6.4
+  flutter_inappwebview: ^5.6.0+2
+  event: ^2.1.2
 
 dev_dependencies:
   flutter_test:

test/service_tests/transportation/saferide_shuttle_test.dart

@@ -0,0 +1,22 @@
+import "package:furman_now/src/services/transportation/saferide_shuttle.dart";
+import "package:test/test.dart";
+
+void main() {
+  test("shuttle status is fetched successfully", () async {
+    var route = await TransportationSafeRideShuttleService.fetchShuttleRoute();
+
+    // ensure polyline has points
+    expect(route.route.points.length, isNonZero);
+    // ensure stops are listed
+    expect(route.stops.length, isNonZero);
+  });
+
+  test("shuttle route is fetched successfully", () async {
+    var route = await TransportationSafeRideShuttleService.fetchShuttleRoute();
+
+    // ensure polyline has points
+    expect(route.route.points.length, isNonZero);
+    // ensure stops are listed
+    expect(route.stops.length, isNonZero);
+  });
+}