Update pull down gesture to be much smoother, refactor home page routing, load weather from OpenWeatherMap
This commit is contained in:
@@ -1,10 +1,10 @@
|
||||
import 'package:auto_route/auto_route.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/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,16 +12,17 @@ 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", name: "HomePageRouter", page: HomeScreen, children: [
|
||||
CustomRoute(
|
||||
path: "",
|
||||
page: HomeScreen,
|
||||
transitionsBuilder: TransitionsBuilders.noTransition,
|
||||
page: HomePageHeader,
|
||||
name: "HomeRoute",
|
||||
transitionsBuilder: TransitionsBuilders.fadeIn,
|
||||
),
|
||||
CustomRoute(
|
||||
path: "student-id",
|
||||
page: StudentIdScreen,
|
||||
transitionsBuilder: TransitionsBuilders.noTransition,
|
||||
transitionsBuilder: TransitionsBuilders.fadeIn,
|
||||
),
|
||||
]),
|
||||
AutoRoute(path: "map", page: MapScreen),
|
||||
|
@@ -16,11 +16,11 @@ import 'package:flutter/material.dart' as _i9;
|
||||
|
||||
import '../layouts/main/index.dart' as _i1;
|
||||
import '../screens/events/index.dart' as _i4;
|
||||
import '../screens/home/index.dart' as _i6;
|
||||
import '../screens/home/home_header.dart' as _i6;
|
||||
import '../screens/home/index.dart' as _i2;
|
||||
import '../screens/info/index.dart' as _i5;
|
||||
import '../screens/map/index.dart' as _i3;
|
||||
import '../screens/student_id/index.dart' as _i7;
|
||||
import '../utils/hero_empty_router_page.dart' as _i2;
|
||||
|
||||
class AppRouter extends _i8.RootStackRouter {
|
||||
AppRouter([_i9.GlobalKey<_i9.NavigatorState>? navigatorKey])
|
||||
@@ -34,7 +34,7 @@ class AppRouter extends _i8.RootStackRouter {
|
||||
},
|
||||
HomePageRouter.name: (routeData) {
|
||||
return _i8.MaterialPageX<dynamic>(
|
||||
routeData: routeData, child: const _i2.HeroEmptyRouterPage());
|
||||
routeData: routeData, child: const _i2.HomeScreen());
|
||||
},
|
||||
MapRoute.name: (routeData) {
|
||||
return _i8.MaterialPageX<dynamic>(
|
||||
@@ -51,8 +51,8 @@ class AppRouter extends _i8.RootStackRouter {
|
||||
HomeRoute.name: (routeData) {
|
||||
return _i8.CustomPage<dynamic>(
|
||||
routeData: routeData,
|
||||
child: const _i6.HomeScreen(),
|
||||
transitionsBuilder: _i8.TransitionsBuilders.noTransition,
|
||||
child: const _i6.HomePageHeader(),
|
||||
transitionsBuilder: _i8.TransitionsBuilders.fadeIn,
|
||||
opaque: true,
|
||||
barrierDismissible: false);
|
||||
},
|
||||
@@ -60,7 +60,7 @@ class AppRouter extends _i8.RootStackRouter {
|
||||
return _i8.CustomPage<dynamic>(
|
||||
routeData: routeData,
|
||||
child: const _i7.StudentIdScreen(),
|
||||
transitionsBuilder: _i8.TransitionsBuilders.noTransition,
|
||||
transitionsBuilder: _i8.TransitionsBuilders.fadeIn,
|
||||
opaque: true,
|
||||
barrierDismissible: false);
|
||||
}
|
||||
@@ -96,7 +96,7 @@ class MainLayout extends _i8.PageRouteInfo<void> {
|
||||
}
|
||||
|
||||
/// generated route for
|
||||
/// [_i2.HeroEmptyRouterPage]
|
||||
/// [_i2.HomeScreen]
|
||||
class HomePageRouter extends _i8.PageRouteInfo<void> {
|
||||
const HomePageRouter({List<_i8.PageRouteInfo>? children})
|
||||
: super(HomePageRouter.name, path: 'home', initialChildren: children);
|
||||
@@ -129,7 +129,7 @@ class InfoRoute extends _i8.PageRouteInfo<void> {
|
||||
}
|
||||
|
||||
/// generated route for
|
||||
/// [_i6.HomeScreen]
|
||||
/// [_i6.HomePageHeader]
|
||||
class HomeRoute extends _i8.PageRouteInfo<void> {
|
||||
const HomeRoute() : super(HomeRoute.name, path: '');
|
||||
|
||||
|
Reference in New Issue
Block a user