Merge branch 'v0.1.61-androidx-hotfixes' into feature/base_flutter_1.12_upgrade_for_androidx

example/lib/main.dart

@@ -29,6 +29,7 @@ class _MyAppState extends State<MyApp> {
         return FlutterRouteWidget(params:params);
       },
     });
+    FlutterBoost.singleton.addBoostNavigatorObserver(TestBoostNavigatorObserver());
   }
 
   @override
@@ -45,3 +46,22 @@ class _MyAppState extends State<MyApp> {
       String pageName, String uniqueId, Map params, Route route, Future _) {
   }
 }
+class TestBoostNavigatorObserver extends NavigatorObserver{
+  void didPush(Route<dynamic> route, Route<dynamic> previousRoute) {
+
+    print("flutterboost#didPush");
+  }
+
+  void didPop(Route<dynamic> route, Route<dynamic> previousRoute) {
+    print("flutterboost#didPop");
+  }
+
+  void didRemove(Route<dynamic> route, Route<dynamic> previousRoute) {
+    print("flutterboost#didRemove");
+  }
+
+  void didReplace({Route<dynamic> newRoute, Route<dynamic> oldRoute}) {
+    print("flutterboost#didReplace");
+  }
+}
+

ios/Classes/Boost/FLBFlutterApplicationInterface.h

@@ -36,6 +36,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)startFlutterWithPlatform:(id<FLBPlatform>)platform
                       withEngine:(FlutterEngine* _Nullable)engine
+                        withPluginRegisterred:(BOOL)registerPlugin
                          onStart:(void (^)(FlutterEngine *engine))callback;
 
 - (FlutterViewController *)flutterViewController;

ios/Classes/Boost/FlutterBoostPlugin.h

@@ -32,7 +32,7 @@ NS_ASSUME_NONNULL_BEGIN
 + (instancetype)sharedInstance;
 
 /**
- * 初始化FlutterBoost混合栈环境。应在程序使用混合栈之前调用。如在AppDelegate中
+ * 初始化FlutterBoost混合栈环境。应在程序使用混合栈之前调用。如在AppDelegate中。本函数默认需要flutter boost来注册所有插件。
  *
  * @param platform 平台层实现FLBPlatform的对象
  * @param callback 启动之后回调
@@ -40,7 +40,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)startFlutterWithPlatform:(id<FLBPlatform>)platform
                          onStart:(void (^)(FlutterEngine *engine))callback;
 /**
- * 初始化FlutterBoost混合栈环境。应在程序使用混合栈之前调用。如在AppDelegate中
+ * 初始化FlutterBoost混合栈环境。应在程序使用混合栈之前调用。如在AppDelegate中。本函数默认需要flutter boost来注册所有插件。
  *
  * @param platform 平台层实现FLBPlatform的对象
  * @param engine   外部实例化engine后传入
@@ -50,6 +50,17 @@ NS_ASSUME_NONNULL_BEGIN
                           engine:(FlutterEngine* _Nullable)engine
                          onStart:(void (^)(FlutterEngine *engine))callback;
 
+/**
+ * 初始化FlutterBoost混合栈环境。应在程序使用混合栈之前调用。如在AppDelegate中。本函数可以控制是否需要flutter boost来注册所有插件
+ *
+ * @param platform 平台层实现FLBPlatform的对象
+ * @param engine   外部实例化engine后传入
+ * @param callback 启动之后回调
+ */
+- (void)startFlutterWithPlatform:(id<FLBPlatform>)platform
+                          engine:(FlutterEngine* _Nullable)engine
+                          pluginRegisterred:(BOOL)registerPlugin
+                         onStart:(void (^)(FlutterEngine *engine))callback;
 #pragma mark - Some properties.
 - (BOOL)isRunning;
 

ios/Classes/Boost/FlutterBoostPlugin.m

@@ -114,13 +114,26 @@
 - (void)startFlutterWithPlatform:(id<FLBPlatform>)platform
                          onStart:(void (^)(FlutterEngine *engine))callback;
 {
-    [self startFlutterWithPlatform:platform engine:nil onStart:callback];
+    [self startFlutterWithPlatform:platform
+                            engine:nil
+             pluginRegisterred:YES
+                           onStart:callback];
 }
 
 - (void)startFlutterWithPlatform:(id<FLBPlatform>)platform
                          engine:(FlutterEngine* _Nullable)engine
                          onStart:(void (^)(FlutterEngine *engine))callback;
 {
+    [self startFlutterWithPlatform:platform
+                                 engine:engine
+                                  pluginRegisterred:YES
+                                   onStart:callback];
+}
+
+- (void)startFlutterWithPlatform:(id<FLBPlatform>)platform
+                          engine:(FlutterEngine *)engine
+           pluginRegisterred:(BOOL)registerPlugin
+                         onStart:(void (^)(FlutterEngine * _Nonnull))callback{
     static dispatch_once_t onceToken;
     __weak __typeof__(self) weakSelf = self;
     dispatch_once(&onceToken, ^{
@@ -129,6 +142,7 @@
         self.application = [self->_factory createApplication:platform];
         [self.application startFlutterWithPlatform:platform
                                      withEngine:engine
+                                      withPluginRegisterred:registerPlugin
                                        onStart:callback];
     });
 }

ios/Classes/Engine/FLBFlutterApplication.m

@@ -51,6 +51,7 @@
 
 - (void)startFlutterWithPlatform:(id<FLBPlatform>)platform
                       withEngine:(FlutterEngine* _Nullable)engine
+                        withPluginRegisterred:(BOOL)registerPlugin
                          onStart:(void (^)(FlutterEngine *engine))callback
 {
     static dispatch_once_t onceToken;
@@ -58,6 +59,16 @@
         self.platform = platform;
         self.viewProvider = [[FLBFlutterEngine alloc] initWithPlatform:platform engine:engine];
         self.isRunning = YES;
+        if(registerPlugin){
+            Class clazz = NSClassFromString(@"GeneratedPluginRegistrant");
+            FlutterEngine *myengine = [self.viewProvider engine];
+            if (clazz && myengine) {
+                if ([clazz respondsToSelector:NSSelectorFromString(@"registerWithRegistry:")]) {
+                    [clazz performSelector:NSSelectorFromString(@"registerWithRegistry:")
+                                withObject:myengine];
+                }
+            }
+        }
         if(callback) callback(self.viewProvider.engine);
     });
 }

ios/Classes/Engine/FLBFlutterEngine.m

@@ -57,14 +57,6 @@
                                                           nibName:nil
                                                            bundle:nil];
         _dummy.name = kIgnoreMessageWithName;
-        
-        Class clazz = NSClassFromString(@"GeneratedPluginRegistrant");
-        if (clazz) {
-            if ([clazz respondsToSelector:NSSelectorFromString(@"registerWithRegistry:")]) {
-                [clazz performSelector:NSSelectorFromString(@"registerWithRegistry:")
-                            withObject:_engine];
-            }
-        }
     }
     
     return self;

lib/container/boost_container.dart

@@ -155,14 +155,11 @@ class BoostContainerState extends NavigatorState {
   @override
   void didUpdateWidget(Navigator oldWidget) {
     super.didUpdateWidget(oldWidget);
-    findContainerNavigatorObserver(oldWidget)?.removeBoostNavigatorObserver(
-        FlutterBoost.containerManager.navigatorObserver);
+
   }
 
   @override
   void dispose() {
-    findContainerNavigatorObserver(widget)?.removeBoostNavigatorObserver(
-        FlutterBoost.containerManager.navigatorObserver);
     routerHistory.clear();
     super.dispose();
   }
@@ -261,63 +258,52 @@ class ContainerElement extends StatefulElement {
 }
 
 class ContainerNavigatorObserver extends NavigatorObserver {
-  BoostNavigatorObserver observer;
 
-  final Set<BoostNavigatorObserver> _boostObservers =
-      Set<BoostNavigatorObserver>();
+  static final Set<NavigatorObserver> boostObservers =
+      Set<NavigatorObserver>();
 
   ContainerNavigatorObserver();
 
+
   factory ContainerNavigatorObserver.bindContainerManager() =>
-      ContainerNavigatorObserver()
-        ..addBoostNavigatorObserver(
-            FlutterBoost.containerManager.navigatorObserver);
+      ContainerNavigatorObserver();
 
-  VoidCallback addBoostNavigatorObserver(BoostNavigatorObserver observer) {
-    _boostObservers.add(observer);
+  VoidCallback addBoostNavigatorObserver(NavigatorObserver observer) {
+    boostObservers.add(observer);
 
-    return () => _boostObservers.remove(observer);
+    return () => boostObservers.remove(observer);
   }
 
-  void removeBoostNavigatorObserver(BoostNavigatorObserver observer) {
-    _boostObservers.remove(observer);
+  void removeBoostNavigatorObserver(NavigatorObserver observer) {
+    boostObservers.remove(observer);
   }
 
   @override
   void didPush(Route<dynamic> route, Route<dynamic> previousRoute) {
-    for (BoostNavigatorObserver observer in _boostObservers) {
+    for (NavigatorObserver observer in boostObservers) {
       observer.didPush(route, previousRoute);
     }
   }
 
   @override
   void didPop(Route<dynamic> route, Route<dynamic> previousRoute) {
-    for (BoostNavigatorObserver observer in _boostObservers) {
+    for (NavigatorObserver observer in boostObservers) {
       observer.didPop(route, previousRoute);
     }
   }
 
   @override
   void didRemove(Route<dynamic> route, Route<dynamic> previousRoute) {
-    for (BoostNavigatorObserver observer in _boostObservers) {
+    for (NavigatorObserver observer in boostObservers) {
       observer.didRemove(route, previousRoute);
     }
   }
 
   @override
   void didReplace({Route<dynamic> newRoute, Route<dynamic> oldRoute}) {
-    for (BoostNavigatorObserver observer in _boostObservers) {
+    for (NavigatorObserver observer in boostObservers) {
       observer.didReplace(newRoute: newRoute, oldRoute: oldRoute);
     }
   }
 }
 
-class BoostNavigatorObserver {
-  void didPush(Route<dynamic> route, Route<dynamic> previousRoute) {}
-
-  void didPop(Route<dynamic> route, Route<dynamic> previousRoute) {}
-
-  void didRemove(Route<dynamic> route, Route<dynamic> previousRoute) {}
-
-  void didReplace({Route<dynamic> newRoute, Route<dynamic> oldRoute}) {}
-}

lib/container/container_manager.dart

@@ -62,8 +62,6 @@ class BoostContainerManager extends StatefulWidget {
 class ContainerManagerState extends State<BoostContainerManager> {
   final GlobalKey<OverlayState> _overlayKey = GlobalKey<OverlayState>();
   final List<BoostContainer> _offstage = <BoostContainer>[];
-  final ManagerNavigatorObserver _navigatorObserver =
-      ManagerNavigatorObserver();
 
   List<_ContainerOverlayEntry> _leastEntries;
 
@@ -78,7 +76,6 @@ class ContainerManagerState extends State<BoostContainerManager> {
 
   bool get foreground => _foreground;
 
-  ManagerNavigatorObserver get navigatorObserver => _navigatorObserver;
 
   //Number of containers.
   int get containerCounts => _offstage.length;
@@ -347,51 +344,3 @@ class _ContainerOverlayEntry extends OverlayEntry {
   }
 }
 
-class ManagerNavigatorObserver extends BoostNavigatorObserver {
-  BoostNavigatorObserver observer;
-
-  final Set<BoostNavigatorObserver> _boostObservers =
-      Set<BoostNavigatorObserver>();
-
-  VoidCallback addBoostNavigatorObserver(BoostNavigatorObserver observer) {
-    _boostObservers.add(observer);
-
-    return () => _boostObservers.remove(observer);
-  }
-
-  void removeBoostNavigatorObserver(BoostNavigatorObserver observer) {
-    _boostObservers.remove(observer);
-  }
-
-  @override
-  void didPush(Route<dynamic> route, Route<dynamic> previousRoute) {
-    Logger.log('ManagerNavigatorObserver didPush');
-    for (BoostNavigatorObserver observer in _boostObservers) {
-      observer.didPush(route, previousRoute);
-    }
-  }
-
-  @override
-  void didPop(Route<dynamic> route, Route<dynamic> previousRoute) {
-    Logger.log('ManagerNavigatorObserver didPop');
-    for (BoostNavigatorObserver observer in _boostObservers) {
-      observer.didPop(route, previousRoute);
-    }
-  }
-
-  @override
-  void didRemove(Route<dynamic> route, Route<dynamic> previousRoute) {
-    Logger.log('ManagerNavigatorObserver didRemove');
-    for (BoostNavigatorObserver observer in _boostObservers) {
-      observer.didRemove(route, previousRoute);
-    }
-  }
-
-  @override
-  void didReplace({Route<dynamic> newRoute, Route<dynamic> oldRoute}) {
-    Logger.log('ManagerNavigatorObserver didReplace');
-    for (BoostNavigatorObserver observer in _boostObservers) {
-      observer.didReplace(newRoute: newRoute, oldRoute: oldRoute);
-    }
-  }
-}

lib/flutter_boost.dart

@@ -189,8 +189,8 @@ class FlutterBoost {
       _observersHolder.addObserver<BoostContainerLifeCycleObserver>(observer);
 
   ///register callbacks for Navigators push & pop
-  VoidCallback addBoostNavigatorObserver(BoostNavigatorObserver observer) =>
-      _observersHolder.addObserver<BoostNavigatorObserver>(observer);
+  void addBoostNavigatorObserver(NavigatorObserver observer) =>
+      ContainerNavigatorObserver.boostObservers.add(observer);
 
 
 }