diff --git a/lib/get_navigation/src/router_report.dart b/lib/get_navigation/src/router_report.dart index 4a272ab90..1da63ea3f 100644 --- a/lib/get_navigation/src/router_report.dart +++ b/lib/get_navigation/src/router_report.dart @@ -117,7 +117,7 @@ class RouterReportManager { _routesKey[routeName]?.remove(element); } } - + _routesKey.remove(routeName); keysToRemove.clear(); diff --git a/lib/get_navigation/src/routes/get_navigator.dart b/lib/get_navigation/src/routes/get_navigator.dart index 53cb02dba..313c745a4 100644 --- a/lib/get_navigation/src/routes/get_navigator.dart +++ b/lib/get_navigation/src/routes/get_navigator.dart @@ -5,8 +5,9 @@ import '../../../get.dart'; class GetNavigator extends Navigator { GetNavigator.onGenerateRoute({ GlobalKey? super.key, - bool Function(Route, dynamic)? onPopPage, + // bool Function(Route, dynamic)? onPopPage, required List super.pages, + super.onDidRemovePage, List? observers, super.reportsRouteUpdateToEngine, TransitionDelegate? transitionDelegate, @@ -14,14 +15,14 @@ class GetNavigator extends Navigator { super.restorationScopeId, }) : super( //keys should be optional - onPopPage: onPopPage ?? - (route, result) { - final didPop = route.didPop(result); - if (!didPop) { - return false; - } - return true; - }, + // onPopPage: onPopPage ?? + // (route, result) { + // final didPop = route.didPop(result); + // if (!didPop) { + // return false; + // } + // return true; + // }, onGenerateRoute: (settings) { final selectedPageList = pages.where((element) => element.name == settings.name); diff --git a/pubspec.yaml b/pubspec.yaml index 2d12bd35b..9aa649997 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,7 +15,7 @@ dependencies: web: ">=0.5.0 <2.0.0" dev_dependencies: - flutter_lints: ^4.0.0 + flutter_lints: ^5.0.0 flutter_test: sdk: flutter