ios/Podfile.lock

@@ -1,32 +1,20 @@
 PODS:
   - Flutter (1.0.0)
-  - flutter_compass (0.0.1):
-    - Flutter
-  - geolocator_apple (1.2.0):
-    - Flutter
   - path_provider_ios (0.0.1):
     - Flutter
 
 DEPENDENCIES:
   - Flutter (from `Flutter`)
-  - flutter_compass (from `.symlinks/plugins/flutter_compass/ios`)
-  - geolocator_apple (from `.symlinks/plugins/geolocator_apple/ios`)
   - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`)
 
 EXTERNAL SOURCES:
   Flutter:
     :path: Flutter
-  flutter_compass:
-    :path: ".symlinks/plugins/flutter_compass/ios"
-  geolocator_apple:
-    :path: ".symlinks/plugins/geolocator_apple/ios"
   path_provider_ios:
     :path: ".symlinks/plugins/path_provider_ios/ios"
 
 SPEC CHECKSUMS:
   Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
-  flutter_compass: cbbd285cea1584c7ac9c4e0c3e1f17cbea55e855
-  geolocator_apple: cc556e6844d508c95df1e87e3ea6fa4e58c50401
   path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02
 
 PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c

lib/main.dart

@@ -1,13 +1,6 @@
 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(
+  runApp(App());
-    ChangeNotifierProvider(
-      create: (context) => AppState(),
-      child: App(),
-    ),
-  );
 }

lib/src/layouts/main/index.dart

@@ -1,8 +1,7 @@
 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({
@@ -36,10 +35,9 @@ class _MainLayoutState extends State<MainLayout> {
   Widget build(BuildContext context) {
     return AutoTabsScaffold(
       routes: const [
-        HomePageRouter(children: [
         HomeRoute(),
-        ]),
         MapRoute(),
+        StudentIdRoute(),
         EventsRoute(),
         InfoRoute(),
       ],
@@ -63,25 +61,27 @@ class _MainLayoutState extends State<MainLayout> {
               }
             }
           },
-          child: Padding(
+          child: BottomNavigationBar(
-            padding: const EdgeInsets.symmetric(vertical: 5, horizontal: 20),
+            items: const <BottomNavigationBarItem>[
-            child: SalomonBottomBar(
+              BottomNavigationBarItem(
-              items: <SalomonBottomBarItem>[
+                icon: Icon(Icons.home),
-                SalomonBottomBarItem(
+                label: 'Home',
-                  icon: const Icon(FlutterRemix.home_line),
-                  title: const Text('Home'),
               ),
-                SalomonBottomBarItem(
+              BottomNavigationBarItem(
-                  icon: const Icon(FlutterRemix.map_2_line),
+                icon: Icon(Icons.map),
-                  title: const Text('Map'),
+                label: 'Map',
               ),
-                SalomonBottomBarItem(
+              BottomNavigationBarItem(
-                  icon: const Icon(FlutterRemix.calendar_line),
+                icon: Icon(Icons.perm_identity),
-                  title: const Text('Events'),
+                label: 'Meal Card',
               ),
-                SalomonBottomBarItem(
+              BottomNavigationBarItem(
-                  icon: const Icon(FlutterRemix.information_line),
+                icon: Icon(Icons.calendar_month),
-                  title: const Text('Info'),
+                label: 'Events',
+              ),
+              BottomNavigationBarItem(
+                icon: Icon(Icons.info_outline),
+                label: 'Info',
               ),
             ],
             currentIndex: tabsRouter.activeIndex,
@@ -89,7 +89,6 @@ class _MainLayoutState extends State<MainLayout> {
             unselectedItemColor: Colors.grey[600],
             onTap: tabsRouter.setActiveIndex,
           ),
-          ),
         );
       },
     );

lib/src/routes/index.dart

@@ -4,7 +4,6 @@ import 'package:furman_now/src/screens/home/index.dart';
 import 'package:furman_now/src/screens/info/index.dart';
 import 'package:furman_now/src/screens/map/index.dart';
 import 'package:furman_now/src/screens/student_id/index.dart';
-import 'package:furman_now/src/utils/hero_empty_router_page.dart';
 
 import '../layouts/main/index.dart';
 
@@ -12,28 +11,12 @@ import '../layouts/main/index.dart';
   replaceInRouteName: 'Screen,Route',
   routes: <AutoRoute>[
     AutoRoute(path: "/", page: MainLayout, children: [
-      AutoRoute(path: "home", name: "HomePageRouter", page: HeroEmptyRouterPage, children: [
+      AutoRoute(path: "home", page: HomeScreen),
-        CustomRoute(
-          path: "",
-          page: HomeScreen,
-          transitionsBuilder: TransitionsBuilders.noTransition,
-        ),
-        CustomRoute(
-          path: "student-id",
-          page: StudentIdScreen,
-          transitionsBuilder: TransitionsBuilders.noTransition,
-        ),
-      ]),
       AutoRoute(path: "map", page: MapScreen),
+      AutoRoute(path: "student-id", page: StudentIdScreen),
       AutoRoute(path: "events", page: EventsScreen),
       AutoRoute(path: "info", page: InfoScreen),
     ]),
-    // AutoRoute(
-    //   path: "/student-id",
-    //   page: StudentIdScreen,
-    //   // transitionsBuilder: TransitionsBuilders.slideTop,
-    //   // durationInMilliseconds: 200,
-    // ),
   ],
 )
 class $AppRouter {}

lib/src/routes/index.gr.dart

@@ -11,135 +11,108 @@
 // ignore_for_file: type=lint
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
-import 'package:auto_route/auto_route.dart' as _i8;
+import 'package:auto_route/auto_route.dart' as _i7;
-import 'package:flutter/material.dart' as _i9;
+import 'package:flutter/material.dart' as _i8;
 
 import '../layouts/main/index.dart' as _i1;
-import '../screens/events/index.dart' as _i4;
+import '../screens/events/index.dart' as _i5;
-import '../screens/home/index.dart' as _i6;
+import '../screens/home/index.dart' as _i2;
-import '../screens/info/index.dart' as _i5;
+import '../screens/info/index.dart' as _i6;
 import '../screens/map/index.dart' as _i3;
-import '../screens/student_id/index.dart' as _i7;
+import '../screens/student_id/index.dart' as _i4;
-import '../utils/hero_empty_router_page.dart' as _i2;
 
-class AppRouter extends _i8.RootStackRouter {
+class AppRouter extends _i7.RootStackRouter {
-  AppRouter([_i9.GlobalKey<_i9.NavigatorState>? navigatorKey])
+  AppRouter([_i8.GlobalKey<_i8.NavigatorState>? navigatorKey])
       : super(navigatorKey);
 
   @override
-  final Map<String, _i8.PageFactory> pagesMap = {
+  final Map<String, _i7.PageFactory> pagesMap = {
     MainLayout.name: (routeData) {
-      return _i8.MaterialPageX<dynamic>(
+      return _i7.MaterialPageX<dynamic>(
           routeData: routeData, child: const _i1.MainLayout());
     },
-    HomePageRouter.name: (routeData) {
+    HomeRoute.name: (routeData) {
-      return _i8.MaterialPageX<dynamic>(
+      return _i7.MaterialPageX<dynamic>(
-          routeData: routeData, child: const _i2.HeroEmptyRouterPage());
+          routeData: routeData, child: const _i2.HomeScreen());
     },
     MapRoute.name: (routeData) {
-      return _i8.MaterialPageX<dynamic>(
+      return _i7.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 _i8.MaterialPageX<dynamic>(
+      return _i7.MaterialPageX<dynamic>(
-          routeData: routeData, child: const _i4.EventsScreen());
+          routeData: routeData, child: const _i5.EventsScreen());
     },
     InfoRoute.name: (routeData) {
-      return _i8.MaterialPageX<dynamic>(
+      return _i7.MaterialPageX<dynamic>(
-          routeData: routeData, child: const _i5.InfoScreen());
+          routeData: routeData, child: const _i6.InfoScreen());
-    },
-    HomeRoute.name: (routeData) {
-      return _i8.CustomPage<dynamic>(
-          routeData: routeData,
-          child: const _i6.HomeScreen(),
-          transitionsBuilder: _i8.TransitionsBuilders.noTransition,
-          opaque: true,
-          barrierDismissible: false);
-    },
-    StudentIdRoute.name: (routeData) {
-      return _i8.CustomPage<dynamic>(
-          routeData: routeData,
-          child: const _i7.StudentIdScreen(),
-          transitionsBuilder: _i8.TransitionsBuilders.noTransition,
-          opaque: true,
-          barrierDismissible: false);
     }
   };
 
   @override
-  List<_i8.RouteConfig> get routes => [
+  List<_i7.RouteConfig> get routes => [
-        _i8.RouteConfig(MainLayout.name, path: '/', children: [
+        _i7.RouteConfig(MainLayout.name, path: '/', children: [
-          _i8.RouteConfig(HomePageRouter.name,
+          _i7.RouteConfig(HomeRoute.name,
-              path: 'home',
+              path: 'home', parent: MainLayout.name),
-              parent: MainLayout.name,
+          _i7.RouteConfig(MapRoute.name, path: 'map', parent: MainLayout.name),
-              children: [
+          _i7.RouteConfig(StudentIdRoute.name,
-                _i8.RouteConfig(HomeRoute.name,
+              path: 'student-id', parent: MainLayout.name),
-                    path: '', parent: HomePageRouter.name),
+          _i7.RouteConfig(EventsRoute.name,
-                _i8.RouteConfig(StudentIdRoute.name,
-                    path: 'student-id', parent: HomePageRouter.name)
-              ]),
-          _i8.RouteConfig(MapRoute.name, path: 'map', parent: MainLayout.name),
-          _i8.RouteConfig(EventsRoute.name,
               path: 'events', parent: MainLayout.name),
-          _i8.RouteConfig(InfoRoute.name, path: 'info', parent: MainLayout.name)
+          _i7.RouteConfig(InfoRoute.name, path: 'info', parent: MainLayout.name)
         ])
       ];
 }
 
 /// generated route for
 /// [_i1.MainLayout]
-class MainLayout extends _i8.PageRouteInfo<void> {
+class MainLayout extends _i7.PageRouteInfo<void> {
-  const MainLayout({List<_i8.PageRouteInfo>? children})
+  const MainLayout({List<_i7.PageRouteInfo>? children})
       : super(MainLayout.name, path: '/', initialChildren: children);
 
   static const String name = 'MainLayout';
 }
 
 /// generated route for
-/// [_i2.HeroEmptyRouterPage]
+/// [_i2.HomeScreen]
-class HomePageRouter extends _i8.PageRouteInfo<void> {
+class HomeRoute extends _i7.PageRouteInfo<void> {
-  const HomePageRouter({List<_i8.PageRouteInfo>? children})
+  const HomeRoute() : super(HomeRoute.name, path: 'home');
-      : super(HomePageRouter.name, path: 'home', initialChildren: children);
 
-  static const String name = 'HomePageRouter';
+  static const String name = 'HomeRoute';
 }
 
 /// generated route for
 /// [_i3.MapScreen]
-class MapRoute extends _i8.PageRouteInfo<void> {
+class MapRoute extends _i7.PageRouteInfo<void> {
   const MapRoute() : super(MapRoute.name, path: 'map');
 
   static const String name = 'MapRoute';
 }
 
 /// generated route for
-/// [_i4.EventsScreen]
+/// [_i4.StudentIdScreen]
-class EventsRoute extends _i8.PageRouteInfo<void> {
+class StudentIdRoute extends _i7.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
-/// [_i5.InfoScreen]
+/// [_i6.InfoScreen]
-class InfoRoute extends _i8.PageRouteInfo<void> {
+class InfoRoute extends _i7.PageRouteInfo<void> {
   const InfoRoute() : super(InfoRoute.name, path: 'info');
 
   static const String name = 'InfoRoute';
 }
-
-/// generated route for
-/// [_i6.HomeScreen]
-class HomeRoute extends _i8.PageRouteInfo<void> {
-  const HomeRoute() : super(HomeRoute.name, path: '');
-
-  static const String name = 'HomeRoute';
-}
-
-/// generated route for
-/// [_i7.StudentIdScreen]
-class StudentIdRoute extends _i8.PageRouteInfo<void> {
-  const StudentIdRoute() : super(StudentIdRoute.name, path: 'student-id');
-
-  static const String name = 'StudentIdRoute';
-}

lib/src/screens/home/index.dart

@@ -1,4 +1,3 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:furman_now/src/routes/index.gr.dart';
 import 'package:furman_now/src/utils/greeting.dart';
@@ -9,16 +8,9 @@ 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 StatefulWidget {
+class HomeScreen extends StatelessWidget {
   const HomeScreen({Key? key}) : super(key: key);
 
-  @override
-  State<HomeScreen> createState() => _HomeScreenState();
-}
-
-class _HomeScreenState extends State<HomeScreen> {
-  CrossFadeState _showScrollMessage = CrossFadeState.showFirst;
-
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -32,7 +24,7 @@ class _HomeScreenState extends State<HomeScreen> {
               children: [
                 Container(
                   width: double.infinity,
-                  height: 300,
+                  height: double.infinity,
                   decoration: const BoxDecoration(
                     gradient: LinearGradient(
                       begin: Alignment.topCenter,
@@ -40,7 +32,7 @@ class _HomeScreenState extends State<HomeScreen> {
                       colors: <Color>[
                         Color(0xffb7acc9),
                         Color(0xffb7acc9),
-                      ],
+                      ], // Gradient from https://learnui.design/tools/gradient-generator.html
                       tileMode: TileMode.mirror,
                     ),
                   ),
@@ -54,81 +46,19 @@ class _HomeScreenState extends State<HomeScreen> {
                         mainAxisAlignment: MainAxisAlignment.center,
                         crossAxisAlignment: CrossAxisAlignment.start,
                         children: [
-                          Hero(
+                          Text("${greeting()},\nMichael", style: furmanTextStyle(const TextStyle(color: Color(0xff26183d), fontSize: 36, fontWeight: FontWeight.w800))),
-                            tag: "title",
-                            child: Material(
-                              type: MaterialType.transparency,
-                              child: Text(
-                                "${greeting()},\nMichael",
-                                style: furmanTextStyle(const TextStyle(
-                                  color: Color(0xff26183d),
-                                  fontSize: 36,
-                                  fontWeight: FontWeight.w800,
-                                )),
-                              ),
-                            ),
-                          ),
                           const SizedBox(height: 5),
-                          AnimatedCrossFade(
+                          Text("It's 76º and partly cloudy", style: furmanTextStyle(const TextStyle(color: Color(0xff26183d), fontSize: 16, fontWeight: FontWeight.w500))),
-                            crossFadeState: _showScrollMessage,
-                            duration: const Duration(milliseconds: 100),
-                            firstChild: Text("It's 76º and partly cloudy",
-                              style: furmanTextStyle(const TextStyle(
-                                color: Color(0xff26183d),
-                                fontSize: 16,
-                                fontWeight: FontWeight.w500)
-                              ),
-                            ),
-                            secondChild: Text("Pull down to view your Meal ID",
-                              style: furmanTextStyle(const TextStyle(
-                                  color: Color(0xff26183d),
-                                  fontSize: 16,
-                                  fontWeight: FontWeight.w500)
-                              ),
-                            ),
-                          ),
                         ],
                       ),
                     ),
                   ),
                 ),
-                NotificationListener<ScrollNotification>(
+                ScrollViewWithHeight(
-                  onNotification: (notification) {
-                    if (notification is ScrollUpdateNotification) {
-                      final offset = notification.metrics.pixels;
-                      if (offset < 0) {
-                        var offsetAmount = offset.abs();
-                        if (offsetAmount > 50) {
-                          context.router.navigate(const StudentIdRoute());
-                        } else if (offsetAmount > 20) {
-                          setState(() {
-                            _showScrollMessage = CrossFadeState.showSecond;
-                          });
-                        } else {
-                          setState(() {
-                            _showScrollMessage = CrossFadeState.showFirst;
-                          });
-                        }
-                      } else {
-                        if (_showScrollMessage != CrossFadeState.showFirst) {
-                          setState(() {
-                            _showScrollMessage = CrossFadeState.showFirst;
-                          });
-                        }
-                      }
-                    }
-                    return true;
-                  },
-                  child: ScrollViewWithHeight(
-                    child: Hero(
-                      tag: "card",
-                      child: Material(
-                        type: MaterialType.transparency,
                   child: Container(
                     decoration: const BoxDecoration(
                       color: Colors.white,
-                            borderRadius:
+                      borderRadius: BorderRadius.vertical(top: Radius.circular(30)),
-                              BorderRadius.vertical(top: Radius.circular(30)),
                     ),
                     padding: const EdgeInsets.symmetric(vertical: 20),
                     margin: const EdgeInsets.only(top: 200),
@@ -138,10 +68,7 @@ class _HomeScreenState extends State<HomeScreen> {
                       children: [
                         const HeaderWidget(
                           title: "Today's Events",
-                                link: HeaderLink(
+                          link: HeaderLink(text: "View more", href: EventsRoute()),
-                                  text: "View more",
-                                  href: EventsRoute()
-                                ),
                         ),
                         Padding(
                           padding: const EdgeInsets.symmetric(horizontal: 20),
@@ -158,9 +85,6 @@ class _HomeScreenState extends State<HomeScreen> {
                     ),
                   ),
                 ),
-                    ),
-                  ),
-                ),
               ],
             ),
           ),

lib/src/screens/student_id/index.dart

@@ -1,9 +1,7 @@
 import 'dart:async';
 
-import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:barcode_widget/barcode_widget.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';
 
@@ -28,12 +26,6 @@ class _StudentIdScreenState extends State<StudentIdScreen> {
     );
   }
 
-  @override
-  void dispose() {
-    super.dispose();
-    timer?.cancel();
-  }
-
   void updateBarcode(Timer timer) {
     setState(() {
       barcodeNumber = BarcodeService.generateGetBarcode();
@@ -43,16 +35,7 @@ class _StudentIdScreenState extends State<StudentIdScreen> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      body: Listener(
+      body: Container(
-        onPointerMove: (details) {
-          int sensitivity = 8;
-          if (details.delta.dy > sensitivity) {
-            // Down Swipe
-          } else if (details.delta.dy < -sensitivity) {
-            context.router.navigate(const MainLayout());
-          }
-        },
-        child: Container(
         color: const Color(0xffb7acc9),
         child: SafeArea(
           child: ListView(
@@ -84,7 +67,6 @@ class _StudentIdScreenState extends State<StudentIdScreen> {
           ),
         ),
       ),
-      ),
     );
   }
 }

lib/src/store/index.dart

@@ -1,33 +0,0 @@
-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/services/restaurants/restaurant_service.dart';
-
-class AppState extends ChangeNotifier {
-  late Future<List<Event>> events;
-  late Future<List<Restaurant>> restaurants;
-
-  AppState() {
-    refresh();
-  }
-
-  void refresh() {
-    events = EventsService.fetchEvents();
-    restaurants = RestaurantService.fetchRestaurants();
-    notifyListeners();
-  }
-
-  @override
-  int get hashCode =>
-      events.hashCode ^
-      restaurants.hashCode;
-
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-          other is AppState &&
-              runtimeType == other.runtimeType &&
-              events == other.events &&
-              restaurants == other.restaurants;
-
-}

lib/src/utils/hero_empty_router_page.dart

@@ -1,14 +0,0 @@
-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/widgets/events/events_list.dart

@@ -1,8 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:furman_now/src/services/events/event.dart';
-import 'package:furman_now/src/store/index.dart';
+import 'package:furman_now/src/services/events/events_service.dart';
 import 'package:furman_now/src/utils/theme.dart';
-import 'package:provider/provider.dart';
 
 import 'event_card.dart';
 
@@ -35,18 +34,22 @@ 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 Consumer<AppState>(
-      builder: (context, state, child) {
     return FutureBuilder<Iterable<Event>>(
-          future: state.events,
+      future: futureEventList,
       builder: (context, snapshot) {
         if (snapshot.hasData) {
           var events = snapshot.data!.where((event) {
-                return event.time.isAfter(widget.dateRange.start) &&
+            return event.time.isAfter(widget.dateRange.start) && event.time.isBefore(widget.dateRange.end);
-                    event.time.isBefore(widget.dateRange.end);
           });
           if (events.isNotEmpty) {
             return Column(
@@ -76,8 +79,7 @@ class _EventsListState extends State<EventsList> {
             );
           }
         } else if (snapshot.hasError) {
-              return Text(
+          return Text('${snapshot.error}', style: const TextStyle(color: Colors.red),);
-                '${snapshot.error}', style: const TextStyle(color: Colors.red),);
         }
 
         // By default, show a loading spinner.
@@ -90,6 +92,4 @@ class _EventsListState extends State<EventsList> {
       },
     );
   }
-    );
-  }
 }

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

@@ -1,7 +1,5 @@
 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';
 
@@ -13,12 +11,18 @@ 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 Consumer<AppState>(
-      builder: (context, state, child) {
     return FutureBuilder<List<Restaurant>>(
-          future: state.restaurants,
+      future: futureEventList,
       builder: (context, snapshot) {
         if (snapshot.hasData) {
           var restaurants = snapshot.data!..sort((r1, r2) => (r1.isOpen ? 0 : 1) - (r2.isOpen ? 0 : 1));
@@ -55,7 +59,5 @@ class _RestaurantsListState extends State<RestaurantsList> {
         );
       },
     );
-      },
-    );
   }
 }

lib/src/widgets/scroll_view_height.dart

@@ -12,14 +12,8 @@ class ScrollViewWithHeight extends StatelessWidget {
   Widget build(BuildContext context) {
     return LayoutBuilder(builder: (BuildContext context, BoxConstraints constraints) {
       return SingleChildScrollView(
-        physics: const BouncingScrollPhysics(
-          parent: AlwaysScrollableScrollPhysics()
-        ),
         child: ConstrainedBox(
-          constraints: constraints.copyWith(
+          constraints: constraints.copyWith(minHeight: constraints.maxHeight, maxHeight: double.infinity),
-            minHeight: constraints.maxHeight,
-            maxHeight: double.infinity
-          ),
           child: child,
         ),
       );

pubspec.lock

@@ -265,13 +265,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "4.1.4"
-  flutter_remix:
-    dependency: "direct main"
-    description:
-      name: flutter_remix
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.0.3"
   flutter_svg:
     dependency: "direct main"
     description:
@@ -429,13 +422,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.1"
-  local_hero:
-    dependency: "direct main"
-    description:
-      name: local_hero
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.2.0"
   logging:
     dependency: transitive
     description:
@@ -478,13 +464,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.2"
-  nested:
-    dependency: transitive
-    description:
-      name: nested
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.0"
   node_preamble:
     dependency: transitive
     description:
@@ -632,13 +611,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.0"
-  provider:
-    dependency: "direct main"
-    description:
-      name: provider
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "6.0.3"
   pub_semver:
     dependency: transitive
     description:
@@ -667,13 +639,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "3.1.0"
-  salomon_bottom_bar:
-    dependency: "direct main"
-    description:
-      name: salomon_bottom_bar
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.3.1"
   shelf:
     dependency: transitive
     description:

pubspec.yaml

@@ -47,9 +47,6 @@ 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
 
 dev_dependencies:
   flutter_test: