Ahmed Fwela

fixed GetNavigator

@@ -437,18 +437,18 @@ class GetDelegate extends RouterDelegate<GetNavConfig> @@ -437,18 +437,18 @@ class GetDelegate extends RouterDelegate<GetNavConfig>
437 } 437 }
438 438
439 class GetNavigator extends Navigator { 439 class GetNavigator extends Navigator {
440 - GetNavigator(  
441 - {GlobalKey<NavigatorState>? key,  
442 - bool Function(Route<dynamic>, dynamic)? onPopPage,  
443 - required List<GetPage> pages,  
444 - List<NavigatorObserver>? observers,  
445 - bool reportsRouteUpdateToEngine = false,  
446 - TransitionDelegate? transitionDelegate,  
447 - String? initialRoute})  
448 - : super( 440 + GetNavigator.onGenerateRoute({
  441 + GlobalKey<NavigatorState>? key,
  442 + bool Function(Route<dynamic>, dynamic)? onPopPage,
  443 + required List<GetPage> pages,
  444 + List<NavigatorObserver>? observers,
  445 + bool reportsRouteUpdateToEngine = false,
  446 + TransitionDelegate? transitionDelegate,
  447 + String? initialRoute,
  448 + }) : super(
449 //keys should be optional 449 //keys should be optional
450 key: key, 450 key: key,
451 - initialRoute: initialRoute ?? '/', 451 + initialRoute: initialRoute,
452 onPopPage: onPopPage ?? 452 onPopPage: onPopPage ??
453 (route, result) { 453 (route, result) {
454 final didPop = route.didPop(result); 454 final didPop = route.didPop(result);
@@ -472,7 +472,37 @@ class GetNavigator extends Navigator { @@ -472,7 +472,37 @@ class GetNavigator extends Navigator {
472 pages: pages, 472 pages: pages,
473 observers: [ 473 observers: [
474 // GetObserver(), 474 // GetObserver(),
475 - if (observers != null) ...observers, 475 + ...?observers,
  476 + ],
  477 + transitionDelegate:
  478 + transitionDelegate ?? const DefaultTransitionDelegate<dynamic>(),
  479 + );
  480 +
  481 + GetNavigator({
  482 + GlobalKey<NavigatorState>? key,
  483 + bool Function(Route<dynamic>, dynamic)? onPopPage,
  484 + required List<GetPage> pages,
  485 + List<NavigatorObserver>? observers,
  486 + bool reportsRouteUpdateToEngine = false,
  487 + TransitionDelegate? transitionDelegate,
  488 + String? initialRoute,
  489 + }) : super(
  490 + //keys should be optional
  491 + key: key,
  492 + initialRoute: initialRoute,
  493 + onPopPage: onPopPage ??
  494 + (route, result) {
  495 + final didPop = route.didPop(result);
  496 + if (!didPop) {
  497 + return false;
  498 + }
  499 + return true;
  500 + },
  501 + reportsRouteUpdateToEngine: reportsRouteUpdateToEngine,
  502 + pages: pages,
  503 + observers: [
  504 + // GetObserver(),
  505 + ...?observers,
476 ], 506 ],
477 transitionDelegate: 507 transitionDelegate:
478 transitionDelegate ?? const DefaultTransitionDelegate<dynamic>(), 508 transitionDelegate ?? const DefaultTransitionDelegate<dynamic>(),