From 609250be5a8bdd9998db58c8c0783de7e1e1ab82 Mon Sep 17 00:00:00 2001
From: justin <noborder@qq.com>
Date: Mon, 15 Jun 2020 15:32:04 +0800
Subject: [PATCH] Revert "fix 1.17"

This reverts commit 6e223c207c9ba92e94411843a420bf60044021ac.
---
 lib/container/boost_container.dart  | 83 ++++++++++++-----------------
 lib/container/boost_page_route.dart |  5 --
 2 files changed, 34 insertions(+), 54 deletions(-)

diff --git a/lib/container/boost_container.dart b/lib/container/boost_container.dart
index eb2c36c..c522e6e 100755
--- a/lib/container/boost_container.dart
+++ b/lib/container/boost_container.dart
@@ -39,9 +39,9 @@ enum ContainerLifeCycle {
 }
 
 typedef BoostContainerLifeCycleObserver = void Function(
-    ContainerLifeCycle state,
-    BoostContainerSettings settings,
-    );
+  ContainerLifeCycle state,
+  BoostContainerSettings settings,
+);
 
 class BoostContainer extends Navigator {
   const BoostContainer({
@@ -52,17 +52,17 @@ class BoostContainer extends Navigator {
     RouteFactory onUnknownRoute,
     List<NavigatorObserver> observers,
   }) : super(
-    key: key,
-    initialRoute: initialRoute,
-    onGenerateRoute: onGenerateRoute,
-    onUnknownRoute: onUnknownRoute,
-    observers: observers,
-  );
+          key: key,
+          initialRoute: initialRoute,
+          onGenerateRoute: onGenerateRoute,
+          onUnknownRoute: onUnknownRoute,
+          observers: observers,
+        );
 
   factory BoostContainer.copy(
-      Navigator navigator, [
-        BoostContainerSettings settings = const BoostContainerSettings(),
-      ]) =>
+    Navigator navigator, [
+    BoostContainerSettings settings = const BoostContainerSettings(),
+  ]) =>
       BoostContainer(
         key: GlobalKey<BoostContainerState>(),
         settings: settings,
@@ -73,9 +73,9 @@ class BoostContainer extends Navigator {
       );
 
   factory BoostContainer.obtain(
-      Navigator navigator,
-      BoostContainerSettings settings,
-      ) =>
+    Navigator navigator,
+    BoostContainerSettings settings,
+  ) =>
       BoostContainer(
         key: GlobalKey<BoostContainerState>(),
         settings: settings,
@@ -110,13 +110,13 @@ class BoostContainer extends Navigator {
 
   static BoostContainerState tryOf(BuildContext context) {
     final BoostContainerState container =
-    context.findAncestorStateOfType<BoostContainerState>();
+        context.findAncestorStateOfType<BoostContainerState>();
     return container;
   }
 
   static BoostContainerState of(BuildContext context) {
     final BoostContainerState container =
-    context.findAncestorStateOfType<BoostContainerState>();
+        context.findAncestorStateOfType<BoostContainerState>();
     assert(container != null, 'not in flutter boost');
     return container;
   }
@@ -161,15 +161,6 @@ class BoostContainerState extends NavigatorState {
   void initState() {
     super.initState();
     backPressedHandler = () => maybePop();
-    final String initRoute = widget.initialRoute ?? Navigator.defaultRouteName;
-    if (initRoute != null && routerHistory.isEmpty) {
-      routerHistory.addAll(
-          widget.onGenerateInitialRoutes(
-              this,
-              widget.initialRoute ?? Navigator.defaultRouteName
-          )
-      );
-    }
   }
 
   @override
@@ -186,28 +177,22 @@ class BoostContainerState extends NavigatorState {
 
   @override
   Future<bool> maybePop<T extends Object>([T result]) async {
-    if(routerHistory.isEmpty) {
-      pop(result);
-      return true;
-    }
-
     final Route<T> route = routerHistory.last as Route<T>;
-
     final RoutePopDisposition disposition = await route.willPop();
     if (mounted) {
-    switch (disposition) {
-    case RoutePopDisposition.pop:
-    pop(result);
-    return true;
-    break;
-    case RoutePopDisposition.doNotPop:
-    return false;
-    break;
-    case RoutePopDisposition.bubble:
-    pop(result);
-    return true;
-    break;
-    }
+      switch (disposition) {
+        case RoutePopDisposition.pop:
+          pop(result);
+          return true;
+          break;
+        case RoutePopDisposition.doNotPop:
+          return false;
+          break;
+        case RoutePopDisposition.bubble:
+          pop(result);
+          return true;
+          break;
+      }
     }
     return false;
   }
@@ -253,10 +238,10 @@ class BoostContainerState extends NavigatorState {
 
   VoidCallback addLifeCycleObserver(BoostContainerLifeCycleObserver observer) {
     return FlutterBoost.singleton.addBoostContainerLifeCycleObserver(
-          (
-          ContainerLifeCycle state,
-          BoostContainerSettings settings,
-          ) {
+      (
+        ContainerLifeCycle state,
+        BoostContainerSettings settings,
+      ) {
         if (settings.uniqueId == uniqueId) {
           observer(state, settings);
         }
diff --git a/lib/container/boost_page_route.dart b/lib/container/boost_page_route.dart
index 6314347..e3c4d8f 100755
--- a/lib/container/boost_page_route.dart
+++ b/lib/container/boost_page_route.dart
@@ -62,9 +62,4 @@ class BoostPageRoute<T> extends MaterialPageRoute<T> {
       return null;
     }
   }
-
-  @override
-  Future<RoutePopDisposition> willPop() {
-    return Future<RoutePopDisposition>.value(RoutePopDisposition.pop);
-  }
 }
-- 
2.26.2