Merge branch 'v1.9.1-hotfixes'

# Conflicts:
#	android/build.gradle
#	android/src/main/java/com/idlefish/flutterboost/Platform.java
#	example/android/app/build.gradle
#	ios/Classes/Boost/FlutterBoostPlugin.h
#	ios/Classes/Engine/FLBFlutterEngine.m
#	lib/flutter_boost.dart

android/build.gradle

@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.2'
+        classpath 'com.android.tools.build:gradle:3.2.0'
     }
 }
 
@@ -23,11 +23,11 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 28
-    buildToolsVersion '27.0.3'
+    buildToolsVersion '28.0.3'
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 28
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
@@ -35,11 +35,12 @@ android {
 }
 
 dependencies {
-    compileOnly 'com.android.support:appcompat-v7:28.0.0'
-    compileOnly 'com.android.support:design:28.0.0'
-    compileOnly 'com.android.support:support-v4:28.0.0'
-    implementation 'android.arch.lifecycle:common-java8:1.1.1'
-    compileOnly 'com.alibaba:fastjson:1.2.41'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.annotation:annotation:1.0.0'
+    implementation 'androidx.lifecycle:lifecycle-common-java8:2.1.0'
+    implementation 'com.alibaba:fastjson:1.2.41'
 
 }
 

android/gradle.properties

 org.gradle.jvmargs=-Xmx1536M
+android.useAndroidX=true
+android.enableJetifier=true
\ No newline at end of file

android/src/main/java/com/idlefish/flutterboost/BoostRegistrar.java

@@ -2,7 +2,7 @@ package com.idlefish.flutterboost;
 
 import android.app.Activity;
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import io.flutter.Log;
 import io.flutter.embedding.engine.plugins.FlutterPlugin;
 import io.flutter.embedding.engine.plugins.activity.ActivityAware;

android/src/main/java/com/idlefish/flutterboost/FlutterBoost.java

@@ -5,7 +5,7 @@ import android.app.Activity;
 import android.app.Application;
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import com.idlefish.flutterboost.interfaces.*;
 import io.flutter.embedding.android.FlutterView;
 import io.flutter.embedding.engine.FlutterEngine;

android/src/main/java/com/idlefish/flutterboost/FlutterBoostPlugin.java

 package com.idlefish.flutterboost;
 
-import android.support.annotation.Nullable;
+import android.os.Handler;
+import androidx.annotation.Nullable;
 
 import com.idlefish.flutterboost.interfaces.IContainerRecord;
 

android/src/main/java/com/idlefish/flutterboost/Platform.java

@@ -19,6 +19,7 @@ public abstract class Platform {
 
     public abstract int whenEngineStart();
 
+    public abstract int whenEngineDestroy();
 
     public abstract FlutterView.RenderMode renderMode();
 
@@ -41,6 +42,14 @@ public abstract class Platform {
         
         if(pluginsRegister!=null){
             pluginsRegister.registerPlugins(mRegistry);
+        }else{
+            try {
+                Class clz = Class.forName("io.flutter.plugins.GeneratedPluginRegistrant");
+                Method method = clz.getDeclaredMethod("registerWith", PluginRegistry.class);
+                method.invoke(null, mRegistry);
+            } catch (Throwable t) {
+                Log.i("flutterboost.platform",t.toString());
+            }
         }
 
         if (lifecycleListener!= null) {

android/src/main/java/com/idlefish/flutterboost/XAndroidKeyProcessor.java

 package com.idlefish.flutterboost;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.view.KeyCharacterMap;
 import android.view.KeyEvent;
 

android/src/main/java/com/idlefish/flutterboost/XFlutterTextureView.java

@@ -2,8 +2,8 @@ package com.idlefish.flutterboost;
 
 import android.content.Context;
 import android.graphics.SurfaceTexture;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.Surface;
 import android.view.TextureView;

android/src/main/java/com/idlefish/flutterboost/XFlutterView.java

@@ -8,11 +8,11 @@ import android.content.res.Configuration;
 import android.graphics.Rect;
 import android.os.Build;
 import android.os.LocaleList;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
-import android.support.annotation.VisibleForTesting;
-import android.support.v4.view.ViewCompat;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.annotation.VisibleForTesting;
+import androidx.core.view.ViewCompat;
 import android.text.format.DateFormat;
 import android.util.AttributeSet;
 import android.view.KeyEvent;

android/src/main/java/com/idlefish/flutterboost/XTextInputPlugin.java

 package com.idlefish.flutterboost;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.Selection;
@@ -191,8 +191,13 @@ public class XTextInputPlugin {
             if (isInputConnectionLocked) {
                 return lastInputConnection;
             }
-            lastInputConnection = platformViewsController.getPlatformViewById(inputTarget.id).onCreateInputConnection(outAttrs);
+            View platformView = platformViewsController.getPlatformViewById(inputTarget.id);
+            if (platformView != null) {
+                lastInputConnection = platformView.onCreateInputConnection(outAttrs);
                 return lastInputConnection;
+            } else {
+                return null;
+            }
         }
 
         outAttrs.inputType = inputTypeFromTextInputType(

android/src/main/java/com/idlefish/flutterboost/containers/BoostFlutterActivity.java

@@ -2,9 +2,9 @@ package com.idlefish.flutterboost.containers;
 
 
 import android.app.Activity;
-import android.arch.lifecycle.Lifecycle;
-import android.arch.lifecycle.LifecycleOwner;
-import android.arch.lifecycle.LifecycleRegistry;
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.LifecycleRegistry;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
@@ -15,8 +15,8 @@ import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.view.*;
 import android.widget.*;
 import com.idlefish.flutterboost.FlutterBoost;

android/src/main/java/com/idlefish/flutterboost/containers/FlutterActivityAndFragmentDelegate.java

@@ -2,14 +2,14 @@ package com.idlefish.flutterboost.containers;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
-import android.arch.lifecycle.Lifecycle;
+import androidx.lifecycle.Lifecycle;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.PixelFormat;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

android/src/main/java/com/idlefish/flutterboost/containers/FlutterFragment.java

 package com.idlefish.flutterboost.containers;
 
 import android.app.Activity;
-import android.arch.lifecycle.Lifecycle;
+import androidx.lifecycle.Lifecycle;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

android/src/main/java/com/idlefish/flutterboost/containers/FlutterSplashView.java

@@ -6,8 +6,8 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.FrameLayout;

example/android/app/build.gradle

@@ -38,7 +38,7 @@ android {
         targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -56,11 +56,8 @@ flutter {
  
 dependencies {
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support:design:28.0.0'
-    implementation 'com.android.support:support-v4:28.0.0'
-    implementation 'com.alibaba:fastjson:1.2.41'
+    androidTestImplementation 'androidx.test:runner:1.1.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
 
 }

example/android/app/src/main/java/com/taobao/idlefish/flutterboostexample/FlutterFragmentPageActivity.java

@@ -6,9 +6,9 @@ import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;

example/android/app/src/main/java/com/taobao/idlefish/flutterboostexample/MainActivity.java

 package com.taobao.idlefish.flutterboostexample;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.TextView;
 

example/android/app/src/main/java/com/taobao/idlefish/flutterboostexample/NativePageActivity.java

 package com.taobao.idlefish.flutterboostexample;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.TextView;
 

example/android/build.gradle

@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.2'
+        classpath 'com.android.tools.build:gradle:3.2.0'
     }
 }
 

example/android/gradle.properties

 org.gradle.jvmargs=-Xmx1536M
+android.useAndroidX=true
+android.enableJetifier=true
\ No newline at end of file

example/android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

example/lib/main.dart

@@ -30,6 +30,7 @@ class _MyAppState extends State<MyApp> {
         return FlutterRouteWidget(params:params);
       },
     });
+    FlutterBoost.singleton.addBoostNavigatorObserver(TestBoostNavigatorObserver());
   }
 
   @override
@@ -44,3 +45,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");
+  }
+}
+

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;
@@ -349,51 +346,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

@@ -44,6 +44,7 @@ typedef void PostPushRoute(
     String url, String uniqueId, Map params, Route route, Future result);
 
 class FlutterBoost {
+
   static final FlutterBoost _instance = FlutterBoost();
   final GlobalKey<ContainerManagerState> containerManagerKey =
       GlobalKey<ContainerManagerState>();
@@ -55,14 +56,23 @@ class FlutterBoost {
   static ContainerManagerState get containerManager =>
       _instance.containerManagerKey.currentState;
 
-  static void onPageStart() {
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      singleton.channel.invokeMethod<Map>('pageOnStart').then((Map pageInfo) {
+  static TransitionBuilder init(
+      {TransitionBuilder builder,
+        PrePushRoute prePush,
+        PostPushRoute postPush}) {
+
+    if(Platform.isAndroid){
+
+      WidgetsBinding.instance.addPostFrameCallback((_){
+
+        singleton.channel.invokeMethod<Map>('pageOnStart').then((Map pageInfo){
+
           if (pageInfo == null || pageInfo.isEmpty) return;
 
           if (pageInfo.containsKey("name") &&
               pageInfo.containsKey("params") &&
               pageInfo.containsKey("uniqueId")) {
+
             ContainerCoordinator.singleton.nativeContainerDidShow(
                 pageInfo["name"], pageInfo["params"], pageInfo["uniqueId"]);
           }
@@ -70,22 +80,6 @@ class FlutterBoost {
       });
     }
 
-  static TransitionBuilder init(
-      {TransitionBuilder builder,
-      PrePushRoute prePush,
-      PostPushRoute postPush}) {
-    if (Platform.isAndroid) {
-      onPageStart();
-    }
-    assert(() {
-      () async {
-        if (Platform.isIOS) {
-          onPageStart();
-        }
-      }();
-
-      return true;
-    }());
     
     return (BuildContext context, Widget child) {
       assert(child is Navigator, 'child must be Navigator, what is wrong?');
@@ -108,7 +102,7 @@ class FlutterBoost {
 
   BoostChannel get channel => _boostChannel;
 
-  FlutterBoost() {
+  FlutterBoost(){
     ContainerCoordinator(_boostChannel);
   }
 
@@ -122,29 +116,30 @@ class FlutterBoost {
     ContainerCoordinator.singleton.registerPageBuilders(builders);
   }
 
-  Future<Map<dynamic, dynamic>> open(String url,
-      {Map<dynamic, dynamic> urlParams, Map<dynamic, dynamic> exts}) {
+  Future<Map<dynamic,dynamic>> open(String url,{Map<dynamic,dynamic> urlParams,Map<dynamic,dynamic> exts}){
+
     Map<dynamic, dynamic> properties = new Map<dynamic, dynamic>();
     properties["url"] = url;
     properties["urlParams"] = urlParams;
     properties["exts"] = exts;
-    return channel.invokeMethod<Map<dynamic, dynamic>>('openPage', properties);
+    return channel.invokeMethod<Map<dynamic,dynamic>>(
+        'openPage', properties);
   }
 
-  Future<bool> close(String id,
-      {Map<dynamic, dynamic> result, Map<dynamic, dynamic> exts}) {
+  Future<bool> close(String id,{Map<dynamic,dynamic> result,Map<dynamic,dynamic> exts}){
+
     assert(id != null);
 
     BoostContainerSettings settings = containerManager?.onstageSettings;
     Map<dynamic, dynamic> properties = new Map<dynamic, dynamic>();
 
-    if (exts == null) {
-      exts = Map<dynamic, dynamic>();
+    if(exts == null){
+      exts = Map<dynamic,dynamic>();
     }
 
     exts["params"] = settings.params;
 
-    if (!exts.containsKey("animated")) {
+    if(!exts.containsKey("animated")){
       exts["animated"] = true;
     }
 
@@ -160,30 +155,28 @@ class FlutterBoost {
     return channel.invokeMethod<bool>('closePage', properties);
   }
 
-  Future<bool> closeCurrent(
-      {Map<String, dynamic> result, Map<String, dynamic> exts}) {
+  Future<bool> closeCurrent({Map<String,dynamic> result,Map<String,dynamic> exts}) {
     BoostContainerSettings settings = containerManager?.onstageSettings;
-    if (exts == null) {
-      exts = Map<String, dynamic>();
+    if(exts == null){
+      exts = Map<String,dynamic>();
     }
     exts["params"] = settings.params;
-    if (!exts.containsKey("animated")) {
+    if(!exts.containsKey("animated")){
       exts["animated"] = true;
     }
-    return close(settings.uniqueId, result: result, exts: exts);
+    return close(settings.uniqueId,result: result,exts: exts);
   }
 
-  Future<bool> closeByContext(BuildContext context,
-      {Map<String, dynamic> result, Map<String, dynamic> exts}) {
+  Future<bool> closeByContext(BuildContext context,{Map<String,dynamic> result,Map<String,dynamic> exts}) {
     BoostContainerSettings settings = containerManager?.onstageSettings;
-    if (exts == null) {
-      exts = Map<String, dynamic>();
+    if(exts == null){
+      exts = Map<String,dynamic>();
     }
     exts["params"] = settings.params;
-    if (!exts.containsKey("animated")) {
+    if(!exts.containsKey("animated")){
       exts["animated"] = true;
     }
-    return close(settings.uniqueId, result: result, exts: exts);
+    return close(settings.uniqueId,result: result,exts: exts);
   }
 
   ///register for Container changed callbacks
@@ -196,6 +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);
+
+
 }