Implement statusBarBackgroundColor

* Set default statusBarBackgroundColor to Black
* Component and Parent controllers now extend ChildController
* Implement return to front logic for ChildControllers
* Apply statusBar color when view appears and returns to front

docs/docs/styling.md

@@ -56,12 +56,13 @@ Navigation.mergeOptions(this.props.componentId, {
 
 ```js
 {
-  statusBarHidden: false,
+  statusBarHidden: false, // iOS only
+  statusBarBackgroundColor: 'red', // Android only
+  statusBarHideWithTopBar: false, // iOS only
+  statusBarBlur: true, // iOS only
+  statusBarStyle: 'light', // iOS only
   screenBackgroundColor: 'white',
   orientation: ['portrait', 'landscape'],
-  statusBarBlur: true,
-  statusBarHideWithTopBar: false,
-  statusBarStyle: 'light',
   popGesture: true,
   backgroundImage: require('background.png'),
   rootBackgroundImage: require('rootBackground.png'),

lib/android/app/src/main/java/com/reactnativenavigation/NavigationActivity.java

@@ -10,6 +10,7 @@ import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
 import com.reactnativenavigation.presentation.OverlayManager;
 import com.reactnativenavigation.react.ReactGateway;
 import com.reactnativenavigation.utils.CommandListenerAdapter;
+import com.reactnativenavigation.viewcontrollers.ChildControllersRegistry;
 import com.reactnativenavigation.viewcontrollers.Navigator;
 
 public class NavigationActivity extends AppCompatActivity implements DefaultHardwareBackBtnHandler {
@@ -18,7 +19,7 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        navigator = new Navigator(this, new OverlayManager());
+        navigator = new Navigator(this, new ChildControllersRegistry(), new OverlayManager());
         getReactGateway().onActivityCreated(this);
         getReactGateway().addReloadListener(navigator);
         setContentView(navigator.getView());

lib/android/app/src/main/java/com/reactnativenavigation/parse/LayoutFactory.java

@@ -7,6 +7,7 @@ import com.reactnativenavigation.react.EventEmitter;
 import com.reactnativenavigation.utils.CommandListenerAdapter;
 import com.reactnativenavigation.utils.ImageLoader;
 import com.reactnativenavigation.utils.TypefaceLoader;
+import com.reactnativenavigation.viewcontrollers.ChildControllersRegistry;
 import com.reactnativenavigation.viewcontrollers.ComponentViewController;
 import com.reactnativenavigation.viewcontrollers.SideMenuController;
 import com.reactnativenavigation.viewcontrollers.StackController;
@@ -31,15 +32,17 @@ import java.util.Map;
 public class LayoutFactory {
 
 	private final Activity activity;
+    private final ChildControllersRegistry childRegistry;
 	private final ReactInstanceManager reactInstanceManager;
     private EventEmitter eventEmitter;
     private Map<String, ExternalComponentCreator> externalComponentCreators;
     private Options defaultOptions;
     private final TypefaceLoader typefaceManager;
 
-    public LayoutFactory(Activity activity, final ReactInstanceManager reactInstanceManager, EventEmitter eventEmitter, Map<String, ExternalComponentCreator> externalComponentCreators, Options defaultOptions) {
+    public LayoutFactory(Activity activity, ChildControllersRegistry childRegistry, final ReactInstanceManager reactInstanceManager, EventEmitter eventEmitter, Map<String, ExternalComponentCreator> externalComponentCreators, Options defaultOptions) {
 		this.activity = activity;
-		this.reactInstanceManager = reactInstanceManager;
+        this.childRegistry = childRegistry;
+        this.reactInstanceManager = reactInstanceManager;
         this.eventEmitter = eventEmitter;
         this.externalComponentCreators = externalComponentCreators;
         this.defaultOptions = defaultOptions;
@@ -72,7 +75,7 @@ public class LayoutFactory {
 	}
 
     private ViewController createSideMenuRoot(LayoutNode node) {
-        SideMenuController sideMenuController = new SideMenuController(activity, node.id, parseNodeOptions(node));
+        SideMenuController sideMenuController = new SideMenuController(activity, childRegistry, node.id, parseNodeOptions(node));
 		for (LayoutNode child : node.children) {
 			ViewController childController = create(child);
             childController.setParentController(sideMenuController);
@@ -109,6 +112,7 @@ public class LayoutFactory {
 		String id = node.id;
 		String name = node.data.optString("name");
         return new ComponentViewController(activity,
+                childRegistry,
                 id,
                 name,
                 new ComponentViewCreator(reactInstanceManager),
@@ -129,6 +133,7 @@ public class LayoutFactory {
 
 	private ViewController createStack(LayoutNode node) {
         StackController stackController = new StackControllerBuilder(activity)
+                .setChildRegistry(childRegistry)
                 .setTopBarButtonCreator(new TitleBarButtonCreator(reactInstanceManager))
                 .setTitleBarReactViewCreator(new TitleBarReactViewCreator(reactInstanceManager))
                 .setTopBarBackgroundViewController(new TopBarBackgroundViewController(activity, new TopBarBackgroundViewCreator(reactInstanceManager)))
@@ -147,7 +152,7 @@ public class LayoutFactory {
     }
 
     private ViewController createBottomTabs(LayoutNode node) {
-        final BottomTabsController tabsComponent = new BottomTabsController(activity, eventEmitter, new ImageLoader(), node.id, parseNodeOptions(node));
+        final BottomTabsController tabsComponent = new BottomTabsController(activity, childRegistry, eventEmitter, new ImageLoader(), node.id, parseNodeOptions(node));
 		List<ViewController> tabs = new ArrayList<>();
 		for (int i = 0; i < node.children.size(); i++) {
             tabs.add(create(node.children.get(i)));
@@ -164,7 +169,7 @@ public class LayoutFactory {
             options.setTopTabIndex(i);
             tabs.add(tabController);
         }
-        return new TopTabsController(activity, node.id, tabs, new TopTabsLayoutCreator(activity, tabs), parseNodeOptions(node));
+        return new TopTabsController(activity, childRegistry, node.id, tabs, new TopTabsLayoutCreator(activity, tabs), parseNodeOptions(node));
     }
 
     private Options parseNodeOptions(LayoutNode node) {

lib/android/app/src/main/java/com/reactnativenavigation/parse/StatusBarOptions.java

@@ -1,7 +1,6 @@
 package com.reactnativenavigation.parse;
 
 import com.reactnativenavigation.parse.params.Color;
-import com.reactnativenavigation.parse.params.NullColor;
 import com.reactnativenavigation.parse.parsers.ColorParser;
 
 import org.json.JSONObject;
@@ -16,7 +15,7 @@ public class StatusBarOptions {
         return result;
     }
 
-    public Color backgroundColor = new NullColor();
+    public Color backgroundColor = new Color(android.graphics.Color.BLACK);
 
     public void mergeWith(StatusBarOptions other) {
         if (other.backgroundColor.hasValue()) backgroundColor = other.backgroundColor;

lib/android/app/src/main/java/com/reactnativenavigation/presentation/OptionsPresenter.java

@@ -1,11 +1,14 @@
 package com.reactnativenavigation.presentation;
 
 import android.app.Activity;
+import android.os.Build;
 import android.view.View;
 
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.parse.OrientationOptions;
+import com.reactnativenavigation.parse.StatusBarOptions;
 
+@SuppressWarnings("FieldCanBeLocal")
 public class OptionsPresenter {
 
     private Activity activity;
@@ -17,6 +20,7 @@ public class OptionsPresenter {
     public void present(View view, Options options) {
         applyOrientation(options.orientationOptions);
         applyViewOptions(view, options);
+        applyStatusBarOptions(options.statusBar);
     }
 
     private void applyOrientation(OrientationOptions options) {
@@ -29,4 +33,13 @@ public class OptionsPresenter {
         }
     }
 
+    public void onViewBroughtToFront(Options options) {
+        applyStatusBarOptions(options.statusBar);
+    }
+
+    private void applyStatusBarOptions(StatusBarOptions statusBar) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            activity.getWindow().setStatusBarColor(statusBar.backgroundColor.get());
+        }
+    }
 }

lib/android/app/src/main/java/com/reactnativenavigation/react/NavigationModule.java

@@ -139,6 +139,7 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 	@NonNull
 	private LayoutFactory newLayoutFactory() {
 		return new LayoutFactory(activity(),
+                navigator().getChildRegistry(),
                 reactInstanceManager,
                 eventEmitter,
                 externalComponentCreator(),

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/ChildController.java

@@ -0,0 +1,44 @@
+package com.reactnativenavigation.viewcontrollers;
+
+import android.app.Activity;
+import android.view.ViewGroup;
+
+import com.reactnativenavigation.parse.Options;
+import com.reactnativenavigation.presentation.OptionsPresenter;
+
+public abstract class ChildController<T extends ViewGroup> extends ViewController<T>  {
+    private final OptionsPresenter presenter;
+    private final ChildControllersRegistry childRegistry;
+
+    public ChildControllersRegistry getChildRegistry() {
+        return childRegistry;
+    }
+
+    public ChildController(Activity activity, ChildControllersRegistry childRegistry, String id, Options initialOptions) {
+        super(activity, id, initialOptions);
+        presenter = new OptionsPresenter(activity);
+        this.childRegistry = childRegistry;
+    }
+
+    @Override
+    public void onViewAppeared() {
+        super.onViewAppeared();
+        childRegistry.onViewAppeared(this);
+    }
+
+    @Override
+    public void onViewDisappear() {
+        super.onViewDisappear();
+        childRegistry.onViewDisappear(this);
+    }
+
+    public void onViewBroughtToFront() {
+        presenter.onViewBroughtToFront(options);
+    }
+
+    @Override
+    public void applyOptions(Options options) {
+        super.applyOptions(options);
+        presenter.present(getView(), options);
+    }
+}

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/ChildControllersRegistry.java

@@ -0,0 +1,28 @@
+package com.reactnativenavigation.viewcontrollers;
+
+import java.util.ArrayDeque;
+
+public class ChildControllersRegistry {
+    private ArrayDeque<ChildController> children = new ArrayDeque<>();
+
+    public void onViewAppeared(ChildController child) {
+        children.push(child);
+    }
+
+    public void onViewDisappear(ChildController child) {
+        if (isTopChild(child)) {
+            children.pop();
+            if (!children.isEmpty()) children.peek().onViewBroughtToFront();
+        } else {
+            children.remove(child);
+        }
+    }
+
+    private boolean isTopChild(ChildController child) {
+        return children.peek().equals(child);
+    }
+
+    public int size() {
+        return children.size();
+    }
+}

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/ComponentViewController.java

@@ -7,18 +7,19 @@ import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.views.ComponentLayout;
 import com.reactnativenavigation.views.ReactComponent;
 
-public class ComponentViewController extends ViewController<ComponentLayout> {
+public class ComponentViewController extends ChildController<ComponentLayout> {
 
     private final String componentName;
 
     private final ReactViewCreator viewCreator;
 
     public ComponentViewController(final Activity activity,
+                                   final ChildControllersRegistry childRegistry,
                                    final String id,
                                    final String componentName,
                                    final ReactViewCreator viewCreator,
                                    final Options initialOptions) {
-        super(activity, id, initialOptions);
+        super(activity, childRegistry, id, initialOptions);
         this.componentName = componentName;
         this.viewCreator = viewCreator;
     }

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/Navigator.java

@@ -32,8 +32,16 @@ public class Navigator extends ParentController implements JsDevReloadHandler.Re
     private final OverlayManager overlayManager;
     private Options defaultOptions = new Options();
 
-    public Navigator(final Activity activity, OverlayManager overlayManager) {
-        super(activity, "navigator" + CompatUtils.generateViewId(), new Options());
+    public void setDefaultOptions(Options defaultOptions) {
+        this.defaultOptions = defaultOptions;
+    }
+
+    public Options getDefaultOptions() {
+        return defaultOptions;
+    }
+
+    public Navigator(final Activity activity, ChildControllersRegistry childRegistry, OverlayManager overlayManager) {
+        super(activity, childRegistry,"navigator" + CompatUtils.generateViewId(), new Options());
         modalStack = new ModalStack(new ModalPresenter(new ModalAnimator(activity)));
         this.overlayManager = overlayManager;
     }
@@ -108,14 +116,6 @@ public class Navigator extends ParentController implements JsDevReloadHandler.Re
         }
     }
 
-    public void setDefaultOptions(Options defaultOptions) {
-        this.defaultOptions = defaultOptions;
-    }
-
-    public Options getDefaultOptions() {
-        return defaultOptions;
-    }
-
     public void mergeOptions(final String componentId, Options options) {
         ViewController target = findControllerById(componentId);
         if (target != null) {

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/ParentController.java

@@ -12,10 +12,10 @@ import com.reactnativenavigation.views.Component;
 
 import java.util.Collection;
 
-public abstract class ParentController<T extends ViewGroup> extends ViewController {
+public abstract class ParentController<T extends ViewGroup> extends ChildController {
 
-	public ParentController(final Activity activity, final String id, Options initialOptions) {
-		super(activity, id, initialOptions);
+	public ParentController(Activity activity, ChildControllersRegistry childRegistry, String id, Options initialOptions) {
+		super(activity, childRegistry, id, initialOptions);
 	}
 
 	@NonNull

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/SideMenuController.java

@@ -22,8 +22,8 @@ public class SideMenuController extends ParentController<DrawerLayout> {
 	private ViewController leftController;
 	private ViewController rightController;
 
-	public SideMenuController(final Activity activity, final String id, Options initialOptions) {
-		super(activity, id, initialOptions);
+	public SideMenuController(Activity activity, ChildControllersRegistry childRegistry, String id, Options initialOptions) {
+		super(activity, childRegistry, id, initialOptions);
 	}
 
 	@NonNull

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/StackController.java

@@ -31,8 +31,8 @@ public class StackController extends ParentController<StackLayout> {
     private TopBarBackgroundViewController topBarBackgroundViewController;
     private TopBarController topBarController;
 
-    public StackController(final Activity activity, ReactViewCreator topBarButtonCreator, TitleBarReactViewCreator titleBarReactViewCreator, TopBarBackgroundViewController topBarBackgroundViewController, TopBarController topBarController, NavigationAnimator animator, String id, Options initialOptions) {
-        super(activity, id, initialOptions);
+    public StackController(Activity activity, ChildControllersRegistry childRegistry, ReactViewCreator topBarButtonCreator, TitleBarReactViewCreator titleBarReactViewCreator, TopBarBackgroundViewController topBarBackgroundViewController, TopBarController topBarController, NavigationAnimator animator, String id, Options initialOptions) {
+        super(activity, childRegistry, id, initialOptions);
         this.topBarController = topBarController;
         this.topBarButtonCreator = topBarButtonCreator;
         this.titleBarReactViewCreator = titleBarReactViewCreator;

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/StackControllerBuilder.java

@@ -10,6 +10,7 @@ import com.reactnativenavigation.views.titlebar.TitleBarReactViewCreator;
 
 public class StackControllerBuilder {
     private Activity activity;
+    private ChildControllersRegistry childRegistry;
     private ReactViewCreator topBarButtonCreator;
     private TitleBarReactViewCreator titleBarReactViewCreator;
     private TopBarBackgroundViewController topBarBackgroundViewController;
@@ -23,6 +24,11 @@ public class StackControllerBuilder {
         animator = new NavigationAnimator(activity);
     }
 
+    public StackControllerBuilder setChildRegistry(ChildControllersRegistry childRegistry) {
+        this.childRegistry = childRegistry;
+        return this;
+    }
+
     public StackControllerBuilder setTopBarButtonCreator(ReactViewCreator topBarButtonCreator) {
         this.topBarButtonCreator = topBarButtonCreator;
         return this;
@@ -59,6 +65,6 @@ public class StackControllerBuilder {
     }
 
     public StackController createStackController() {
-        return new StackController(activity, topBarButtonCreator, titleBarReactViewCreator, topBarBackgroundViewController, topBarController, animator, id, initialOptions);
+        return new StackController(activity, childRegistry, topBarButtonCreator, titleBarReactViewCreator, topBarBackgroundViewController, topBarController, animator, id, initialOptions);
     }
 }

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/ViewController.java

@@ -12,7 +12,6 @@ import android.view.ViewTreeObserver;
 
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.presentation.FabOptionsPresenter;
-import com.reactnativenavigation.presentation.OptionsPresenter;
 import com.reactnativenavigation.utils.CommandListener;
 import com.reactnativenavigation.utils.StringUtils;
 import com.reactnativenavigation.utils.Task;
@@ -43,13 +42,11 @@ public abstract class ViewController<T extends ViewGroup> implements ViewTreeObs
     private boolean isShown;
     private boolean isDestroyed;
     private ViewVisibilityListener viewVisibilityListener = new ViewVisibilityListenerAdapter();
-    private OptionsPresenter presenter;
     FabOptionsPresenter fabOptionsPresenter;
 
     public ViewController(Activity activity, String id, Options initialOptions) {
         this.activity = activity;
         this.id = id;
-        presenter = new OptionsPresenter(activity);
         fabOptionsPresenter = new FabOptionsPresenter();
         this.initialOptions = initialOptions;
         options = initialOptions.copy();
@@ -79,7 +76,7 @@ public abstract class ViewController<T extends ViewGroup> implements ViewTreeObs
 
     @CallSuper
     public void applyOptions(Options options) {
-        presenter.present(getView(), options);
+
     }
 
     public Activity getActivity() {
@@ -157,6 +154,7 @@ public abstract class ViewController<T extends ViewGroup> implements ViewTreeObs
 
     }
 
+    @CallSuper
     public void onViewAppeared() {
         isShown = true;
         applyOptions(options);
@@ -170,6 +168,7 @@ public abstract class ViewController<T extends ViewGroup> implements ViewTreeObs
 
     }
 
+    @CallSuper
     public void onViewDisappear() {
         isShown = false;
     }

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/bottomtabs/BottomTabsController.java

@@ -14,6 +14,7 @@ import com.reactnativenavigation.presentation.BottomTabsOptionsPresenter;
 import com.reactnativenavigation.react.EventEmitter;
 import com.reactnativenavigation.utils.CommandListener;
 import com.reactnativenavigation.utils.ImageLoader;
+import com.reactnativenavigation.viewcontrollers.ChildControllersRegistry;
 import com.reactnativenavigation.viewcontrollers.ParentController;
 import com.reactnativenavigation.viewcontrollers.ViewController;
 import com.reactnativenavigation.views.BottomTabs;
@@ -36,8 +37,8 @@ public class BottomTabsController extends ParentController implements AHBottomNa
     private BottomTabsOptionsPresenter presenter;
     private final BottomTabFinder bottomTabFinder = new BottomTabFinder();
 
-    public BottomTabsController(final Activity activity, EventEmitter eventEmitter, ImageLoader imageLoader, final String id, Options initialOptions) {
-		super(activity, id, initialOptions);
+    public BottomTabsController(Activity activity, ChildControllersRegistry childRegistry, EventEmitter eventEmitter, ImageLoader imageLoader, String id, Options initialOptions) {
+		super(activity, childRegistry, id, initialOptions);
         this.eventEmitter = eventEmitter;
         this.imageLoader = imageLoader;
     }

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/toptabs/TopTabsController.java

@@ -6,6 +6,7 @@ import android.view.View;
 
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.utils.Task;
+import com.reactnativenavigation.viewcontrollers.ChildControllersRegistry;
 import com.reactnativenavigation.viewcontrollers.ParentController;
 import com.reactnativenavigation.viewcontrollers.ViewController;
 import com.reactnativenavigation.viewcontrollers.ViewVisibilityListenerAdapter;
@@ -21,8 +22,8 @@ public class TopTabsController extends ParentController<TopTabsViewPager> {
     private List<ViewController> tabs;
     private TopTabsLayoutCreator viewCreator;
 
-    public TopTabsController(Activity activity, String id, List<ViewController> tabs, TopTabsLayoutCreator viewCreator, Options options) {
-        super(activity, id, options);
+    public TopTabsController(Activity activity, ChildControllersRegistry childRegistry, String id, List<ViewController> tabs, TopTabsLayoutCreator viewCreator, Options options) {
+        super(activity, childRegistry, id, options);
         this.viewCreator = viewCreator;
         this.tabs = tabs;
         for (ViewController tab : tabs) {
@@ -51,7 +52,7 @@ public class TopTabsController extends ParentController<TopTabsViewPager> {
 
     @Override
     public void onViewAppeared() {
-        applyOptions(options);
+        super.onViewAppeared();
         applyOnParentController(parentController -> ((ParentController) parentController).setupTopTabsWithViewPager(getView()));
         performOnCurrentTab(ViewController::onViewAppeared);
     }
@@ -63,6 +64,7 @@ public class TopTabsController extends ParentController<TopTabsViewPager> {
 
     @Override
     public void onViewDisappear() {
+        super.onViewDisappear();
         performOnCurrentTab(ViewController::onViewDisappear);
         applyOnParentController(parentController -> ((ParentController) parentController).clearTopTabs());
     }
@@ -74,6 +76,7 @@ public class TopTabsController extends ParentController<TopTabsViewPager> {
 
     @Override
     public void applyOptions(Options options) {
+        super.applyOptions(options);
         getView().applyOptions(options);
     }
 

lib/android/app/src/test/java/com/reactnativenavigation/mocks/SimpleComponentViewController.java

@@ -6,7 +6,7 @@ import com.reactnativenavigation.parse.*;
 import com.reactnativenavigation.viewcontrollers.*;
 
 public class SimpleComponentViewController extends ComponentViewController {
-    public SimpleComponentViewController(final Activity activity, final String id, Options initialOptions) {
-        super(activity, id, "theComponentName", new TestComponentViewCreator(), initialOptions);
+    public SimpleComponentViewController(Activity activity, ChildControllersRegistry childRegistry, String id, Options initialOptions) {
+        super(activity, childRegistry,id, "theComponentName", new TestComponentViewCreator(), initialOptions);
     }
 }

lib/android/app/src/test/java/com/reactnativenavigation/mocks/SimpleViewController.java

@@ -9,17 +9,18 @@ import android.widget.FrameLayout;
 
 import com.reactnativenavigation.interfaces.ScrollEventListener;
 import com.reactnativenavigation.parse.Options;
-import com.reactnativenavigation.viewcontrollers.ViewController;
+import com.reactnativenavigation.viewcontrollers.ChildController;
+import com.reactnativenavigation.viewcontrollers.ChildControllersRegistry;
 import com.reactnativenavigation.views.Component;
 import com.reactnativenavigation.views.ReactComponent;
 import com.reactnativenavigation.views.topbar.TopBar;
 
-public class SimpleViewController extends ViewController<FrameLayout> {
+public class SimpleViewController extends ChildController<FrameLayout> {
 
     private SimpleView simpleView;
 
-    public SimpleViewController(final Activity activity, String id, Options options) {
-        super(activity, id, options);
+    public SimpleViewController(Activity activity, ChildControllersRegistry childRegistry, String id, Options options) {
+        super(activity, childRegistry, id, options);
     }
 
     @Override

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/BottomTabsControllerTest.java

@@ -50,17 +50,19 @@ public class BottomTabsControllerTest extends BaseTest {
     private Options tabOptions = OptionHelper.createBottomTabOptions();
     private ImageLoader imageLoaderMock = ImageLoaderMock.mock();
     private EventEmitter eventEmitter;
+    private ChildControllersRegistry childRegistry;
 
     @Override
     public void beforeEach() {
         activity = newActivity();
+        childRegistry = new ChildControllersRegistry();
         eventEmitter = Mockito.mock(EventEmitter.class);
-        uut = spy(new BottomTabsController(activity, eventEmitter, imageLoaderMock, "uut", new Options()));
-        child1 = spy(new SimpleViewController(activity, "child1", tabOptions));
-        child2 = spy(new SimpleViewController(activity, "child2", tabOptions));
-        child3 = spy(new SimpleViewController(activity, "child3", tabOptions));
-        child4 = spy(new SimpleViewController(activity, "child4", tabOptions));
-        child5 = spy(new SimpleViewController(activity, "child5", tabOptions));
+        uut = spy(new BottomTabsController(activity, childRegistry, eventEmitter, imageLoaderMock, "uut", new Options()));
+        child1 = spy(new SimpleViewController(activity, childRegistry, "child1", tabOptions));
+        child2 = spy(new SimpleViewController(activity, childRegistry, "child2", tabOptions));
+        child3 = spy(new SimpleViewController(activity, childRegistry, "child3", tabOptions));
+        child4 = spy(new SimpleViewController(activity, childRegistry, "child4", tabOptions));
+        child5 = spy(new SimpleViewController(activity, childRegistry, "child5", tabOptions));
     }
 
     @Test
@@ -72,7 +74,7 @@ public class BottomTabsControllerTest extends BaseTest {
     @Test(expected = RuntimeException.class)
     public void setTabs_ThrowWhenMoreThan5() {
         List<ViewController> tabs = createTabs();
-        tabs.add(new SimpleViewController(activity, "6", tabOptions));
+        tabs.add(new SimpleViewController(activity, childRegistry, "6", tabOptions));
         uut.setTabs(tabs);
     }
 

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/ComponentViewControllerTest.java

@@ -38,7 +38,7 @@ public class ComponentViewControllerTest extends BaseTest {
                 .setId("stack")
                 .setInitialOptions(new Options())
                 .createStackController();
-        uut = new ComponentViewController(activity, "componentId1", "componentName", (activity1, componentId, componentName) -> view, new Options());
+        uut = new ComponentViewController(activity, new ChildControllersRegistry(), "componentId1", "componentName", (activity1, componentId, componentName) -> view, new Options());
         uut.setParentController(parentController);
         parentController.ensureViewIsCreated();
     }

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/FloatingActionButtonTest.java

@@ -32,11 +32,13 @@ public class FloatingActionButtonTest extends BaseTest {
     private SimpleViewController childFab;
     private SimpleViewController childNoFab;
     private Activity activity;
+    private ChildControllersRegistry childRegistry;
 
     @Override
     public void beforeEach() {
         super.beforeEach();
         activity = newActivity();
+        childRegistry = new ChildControllersRegistry();
         stackController = new StackControllerBuilder(activity)
                 .setTopBarButtonCreator(new TopBarButtonCreatorMock())
                 .setTitleBarReactViewCreator(new TitleBarReactViewCreatorMock())
@@ -46,8 +48,8 @@ public class FloatingActionButtonTest extends BaseTest {
                 .setInitialOptions(new Options())
                 .createStackController();
         Options options = getOptionsWithFab();
-        childFab = new SimpleViewController(activity, "child1", options);
-        childNoFab = new SimpleViewController(activity, "child2", new Options());
+        childFab = new SimpleViewController(activity, childRegistry, "child1", options);
+        childNoFab = new SimpleViewController(activity, childRegistry, "child2", new Options());
     }
 
     @NonNull
@@ -129,7 +131,7 @@ public class FloatingActionButtonTest extends BaseTest {
 
     @Test
     public void hasChildren() {
-        childFab = new SimpleViewController(activity, "child1", getOptionsWithFabActions());
+        childFab = new SimpleViewController(activity, childRegistry, "child1", getOptionsWithFabActions());
         stackController.push(childFab, new CommandListenerAdapter());
         childFab.onViewAppeared();
         assertThat(hasFab()).isTrue();

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/NavigatorTest.java

@@ -39,6 +39,7 @@ import static org.mockito.Mockito.when;
 
 public class NavigatorTest extends BaseTest {
     private TestActivity activity;
+    private ChildControllersRegistry childRegistry;
     private Navigator uut;
     private StackController parentController;
     private SimpleViewController child1;
@@ -54,21 +55,22 @@ public class NavigatorTest extends BaseTest {
 
     @Override
     public void beforeEach() {
+        childRegistry = new ChildControllersRegistry();
         eventEmitter = Mockito.mock(EventEmitter.class);
         overlayManager = Mockito.mock(OverlayManager.class);
         imageLoaderMock = ImageLoaderMock.mock();
         activityController = newActivityController(TestActivity.class);
         activity = activityController.create().get();
-        uut = new Navigator(activity, overlayManager);
+        uut = new Navigator(activity, childRegistry, overlayManager);
         activity.setNavigator(uut);
 
         parentController = spy(newStack());
         parentController.ensureViewIsCreated();
-        child1 = new SimpleViewController(activity, "child1", tabOptions);
-        child2 = new SimpleViewController(activity, "child2", tabOptions);
-        child3 = new SimpleViewController(activity, "child3", tabOptions);
-        child4 = new SimpleViewController(activity, "child4", tabOptions);
-        child5 = new SimpleViewController(activity, "child5", tabOptions);
+        child1 = new SimpleViewController(activity, childRegistry, "child1", tabOptions);
+        child2 = new SimpleViewController(activity, childRegistry, "child2", tabOptions);
+        child3 = new SimpleViewController(activity, childRegistry, "child3", tabOptions);
+        child4 = new SimpleViewController(activity, childRegistry, "child4", tabOptions);
+        child5 = new SimpleViewController(activity, childRegistry, "child5", tabOptions);
         activity.setContentView(uut.getView());
 
         activityController.visible();
@@ -91,7 +93,7 @@ public class NavigatorTest extends BaseTest {
     @Test
     public void hasUniqueId() {
         assertThat(uut.getId()).startsWith("navigator");
-        assertThat(new Navigator(activity, overlayManager).getId()).isNotEqualTo(uut.getId());
+        assertThat(new Navigator(activity, childRegistry, overlayManager).getId()).isNotEqualTo(uut.getId());
     }
 
     @Test
@@ -126,7 +128,7 @@ public class NavigatorTest extends BaseTest {
         bottomTabsController.setTabs(Arrays.asList(stack1, stack2));
         uut.setRoot(bottomTabsController, new CommandListenerAdapter());
 
-        SimpleViewController newChild = new SimpleViewController(activity, "new child", tabOptions);
+        SimpleViewController newChild = new SimpleViewController(activity, childRegistry, "new child", tabOptions);
         uut.push(child2.getId(), newChild, new CommandListenerAdapter());
 
         assertThat(stack1.getChildControllers()).doesNotContain(newChild);
@@ -257,7 +259,7 @@ public class NavigatorTest extends BaseTest {
 
     @Test
     public void mergeOptions_CallsApplyNavigationOptions() {
-        ComponentViewController componentVc = new SimpleComponentViewController(activity, "theId", new Options());
+        ComponentViewController componentVc = new SimpleComponentViewController(activity, childRegistry, "theId", new Options());
         componentVc.setParentController(parentController);
         assertThat(componentVc.options.topBar.title.text.get("")).isEmpty();
         uut.setRoot(componentVc, new CommandListenerAdapter());
@@ -276,12 +278,13 @@ public class NavigatorTest extends BaseTest {
 
     @NonNull
     private BottomTabsController newTabs() {
-        return new BottomTabsController(activity, eventEmitter, imageLoaderMock, "tabsController", new Options());
+        return new BottomTabsController(activity, childRegistry, eventEmitter, imageLoaderMock, "tabsController", new Options());
     }
 
     @NonNull
     private StackController newStack() {
         return new StackControllerBuilder(activity)
+                .setChildRegistry(childRegistry)
                 .setTopBarButtonCreator(new TopBarButtonCreatorMock())
                 .setTitleBarReactViewCreator(new TitleBarReactViewCreatorMock())
                 .setTopBarBackgroundViewController(new TopBarBackgroundViewController(activity, new TopBarBackgroundViewCreatorMock()))

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/OptionsApplyingTest.java

@@ -48,6 +48,7 @@ public class OptionsApplyingTest extends BaseTest {
         view = spy(new TestComponentLayout(activity, new TestReactView(activity)));
         view.asView().setLayoutParams(new RelativeLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT));
         uut = new ComponentViewController(activity,
+                new ChildControllersRegistry(),
                 "componentId1",
                 "componentName",
                 (activity1, componentId, componentName) -> view,

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/ParentControllerTest.java

@@ -33,6 +33,7 @@ public class ParentControllerTest extends BaseTest {
 
     private static final String INITIAL_TITLE = "initial title";
     private Activity activity;
+    private ChildControllersRegistry childRegistry;
     private List<ViewController> children;
     private ParentController uut;
 
@@ -40,10 +41,11 @@ public class ParentControllerTest extends BaseTest {
     public void beforeEach() {
         super.beforeEach();
         activity = newActivity();
+        childRegistry = new ChildControllersRegistry();
         children = new ArrayList<>();
         Options initialOptions = new Options();
         initialOptions.topBar.title.text = new Text(INITIAL_TITLE);
-        uut = spy(new ParentController(activity, "uut", initialOptions) {
+        uut = spy(new ParentController(activity, childRegistry, "uut", initialOptions) {
 
             @NonNull
             @Override
@@ -81,8 +83,8 @@ public class ParentControllerTest extends BaseTest {
 
     @Test
     public void findControllerById_ChildById() {
-        SimpleViewController child1 = new SimpleViewController(activity, "child1", new Options());
-        SimpleViewController child2 = new SimpleViewController(activity, "child2", new Options());
+        SimpleViewController child1 = new SimpleViewController(activity, childRegistry, "child1", new Options());
+        SimpleViewController child2 = new SimpleViewController(activity, childRegistry, "child2", new Options());
         children.add(child1);
         children.add(child2);
 
@@ -93,8 +95,8 @@ public class ParentControllerTest extends BaseTest {
     @Test
     public void findControllerById_Recursive() {
         StackController stackController = createStack();
-        SimpleViewController child1 = new SimpleViewController(activity, "child1", new Options());
-        SimpleViewController child2 = new SimpleViewController(activity, "child2", new Options());
+        SimpleViewController child1 = new SimpleViewController(activity, childRegistry, "child1", new Options());
+        SimpleViewController child2 = new SimpleViewController(activity, childRegistry, "child2", new Options());
         stackController.push(child1, new CommandListenerAdapter());
         stackController.push(child2, new CommandListenerAdapter());
         children.add(stackController);
@@ -104,7 +106,7 @@ public class ParentControllerTest extends BaseTest {
 
     @Test
     public void destroy_DestroysChildren() {
-        ViewController child1 = spy(new SimpleViewController(activity, "child1", new Options()));
+        ViewController child1 = spy(new SimpleViewController(activity, childRegistry, "child1", new Options()));
         children.add(child1);
 
         verify(child1, times(0)).destroy();
@@ -115,7 +117,7 @@ public class ParentControllerTest extends BaseTest {
     @Test
     public void optionsAreClearedWhenChildIsAppeared() {
         StackController stackController = spy(createStack());
-        SimpleViewController child1 = new SimpleViewController(activity, "child1", new Options());
+        SimpleViewController child1 = new SimpleViewController(activity, childRegistry, "child1", new Options());
         stackController.push(child1, new CommandListenerAdapter());
 
         child1.onViewAppeared();
@@ -126,7 +128,7 @@ public class ParentControllerTest extends BaseTest {
     public void mergeOptions_optionsAreMergedWhenChildAppears() {
         Options options = new Options();
         options.topBar.title.text = new Text("new title");
-        ViewController child1 = spy(new SimpleViewController(activity, "child1", options));
+        ViewController child1 = spy(new SimpleViewController(activity, childRegistry, "child1", options));
         children.add(child1);
         uut.ensureViewIsCreated();
 
@@ -144,7 +146,7 @@ public class ParentControllerTest extends BaseTest {
     public void mergeOptions_initialParentOptionsAreNotMutatedWhenChildAppears() {
         Options options = new Options();
         options.topBar.title.text = new Text("new title");
-        ViewController child1 = spy(new SimpleViewController(activity, "child1", options));
+        ViewController child1 = spy(new SimpleViewController(activity, childRegistry, "child1", options));
         children.add(child1);
 
         uut.ensureViewIsCreated();

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/SideMenuControllerTest.java

@@ -15,16 +15,18 @@ import static org.assertj.core.api.Java6Assertions.assertThat;
 public class SideMenuControllerTest extends BaseTest {
     private SideMenuController uut;
     private Activity activity;
+    private ChildControllersRegistry childRegistry;
 
     @Override
     public void beforeEach() {
         activity = newActivity();
-        uut = new SideMenuController(activity, "sideMenu", new Options());
+        childRegistry = new ChildControllersRegistry();
+        uut = new SideMenuController(activity, childRegistry, "sideMenu", new Options());
     }
 
     @Test
     public void mergeOptions_openLeftSideMenu() {
-        uut.setLeftController(new SimpleComponentViewController(activity, "left", new Options()));
+        uut.setLeftController(new SimpleComponentViewController(activity, childRegistry, "left", new Options()));
 
         Options options = new Options();
         options.sideMenuRootOptions.left.visible = new Bool(true);
@@ -35,7 +37,7 @@ public class SideMenuControllerTest extends BaseTest {
 
     @Test
     public void mergeOptions_openRightSideMenu() {
-        uut.setRightController(new SimpleComponentViewController(activity, "right", new Options()));
+        uut.setRightController(new SimpleComponentViewController(activity, childRegistry, "right", new Options()));
 
         Options options = new Options();
         options.sideMenuRootOptions.right.visible = new Bool(true);

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/StackControllerTest.java

@@ -41,6 +41,7 @@ import static org.mockito.Mockito.verify;
 public class StackControllerTest extends BaseTest {
 
     private Activity activity;
+    private ChildControllersRegistry childRegistry;
     private StackController uut;
     private ViewController child1;
     private ViewController child2;
@@ -54,11 +55,12 @@ public class StackControllerTest extends BaseTest {
         super.beforeEach();
         animator = Mockito.mock(NavigationAnimator.class);
         activity = newActivity();
+        childRegistry = new ChildControllersRegistry();
         uut = createStackController();
-        child1 = spy(new SimpleViewController(activity, "child1", new Options()));
-        child2 = spy(new SimpleViewController(activity, "child2", new Options()));
-        child3 = spy(new SimpleViewController(activity, "child3", new Options()));
-        child4 = spy(new SimpleViewController(activity, "child4", new Options()));
+        child1 = spy(new SimpleViewController(activity, childRegistry, "child1", new Options()));
+        child2 = spy(new SimpleViewController(activity, childRegistry, "child2", new Options()));
+        child3 = spy(new SimpleViewController(activity, childRegistry, "child3", new Options()));
+        child4 = spy(new SimpleViewController(activity, childRegistry, "child4", new Options()));
     }
 
     @Test
@@ -728,6 +730,7 @@ public class StackControllerTest extends BaseTest {
             }
         });
         return new StackControllerBuilder(activity)
+                .setChildRegistry(childRegistry)
                 .setTopBarButtonCreator(new TopBarButtonCreatorMock())
                 .setTitleBarReactViewCreator(new TitleBarReactViewCreatorMock())
                 .setTopBarBackgroundViewController(new TopBarBackgroundViewController(activity, new TopBarBackgroundViewCreatorMock()))

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/TopTabsViewControllerTest.java

@@ -48,19 +48,21 @@ public class TopTabsViewControllerTest extends BaseTest {
     private final Options options = new Options();
     private TopTabsViewPager topTabsLayout;
     private Activity activity;
+    private ChildControllersRegistry childRegistry;
 
     @Override
     public void beforeEach() {
         super.beforeEach();
 
         activity = newActivity();
+        childRegistry = new ChildControllersRegistry();
         tabOptions = createOptions();
         tabControllers = createTabsControllers(activity, tabOptions);
 
         topTabsLayout = spy(new TopTabsViewPager(activity, tabControllers, new TopTabsAdapter(tabControllers)));
         TopTabsLayoutCreator layoutCreator = Mockito.mock(TopTabsLayoutCreator.class);
         Mockito.when(layoutCreator.create()).thenReturn(topTabsLayout);
-        uut = spy(new TopTabsController(activity, "componentId", tabControllers, layoutCreator, options));
+        uut = spy(new TopTabsController(activity, childRegistry, "componentId", tabControllers, layoutCreator, options));
         tabControllers.forEach(viewController -> viewController.setParentController(uut));
 
         parentController = spy(createStackController("stackId"));
@@ -97,6 +99,7 @@ public class TopTabsViewControllerTest extends BaseTest {
         for (int i = 0; i < SIZE; i++) {
             ComponentViewController viewController = new ComponentViewController(
                     activity,
+                    childRegistry,
                     "idTab" + i,
                     "theComponentName",
                     new TestComponentViewCreator(),
@@ -233,6 +236,7 @@ public class TopTabsViewControllerTest extends BaseTest {
         StackController stackController = spy(createStackController("stack"));
         ComponentViewController first = new ComponentViewController(
                 activity,
+                childRegistry,
                 "firstScreen",
                 "comp1",
                 new TestComponentViewCreator(),
@@ -259,6 +263,7 @@ public class TopTabsViewControllerTest extends BaseTest {
     @Test
     public void onNavigationButtonPressInvokedOnCurrentTab() {
         uut.ensureViewIsCreated();
+        uut.onViewAppeared();
         uut.switchToTab(1);
         uut.sendOnNavigationButtonPressed("btn1");
         verify(tabControllers.get(1), times(1)).sendOnNavigationButtonPressed("btn1");

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/ViewControllerTest.java

@@ -32,12 +32,14 @@ public class ViewControllerTest extends BaseTest {
 
     private ViewController uut;
     private Activity activity;
+    private ChildControllersRegistry childRegistry;
 
     @Override
     public void beforeEach() {
         super.beforeEach();
         activity = newActivity();
-        uut = new SimpleViewController(activity, "uut", new Options());
+        childRegistry = new ChildControllersRegistry();
+        uut = new SimpleViewController(activity, childRegistry, "uut", new Options());
     }
 
     @Test
@@ -161,7 +163,7 @@ public class ViewControllerTest extends BaseTest {
 
     @Test
     public void onDestroy_RemovesGlobalLayoutListener() throws Exception {
-        new SimpleViewController(activity, "ensureNotNull", new Options()).destroy();
+        new SimpleViewController(activity, childRegistry, "ensureNotNull", new Options()).destroy();
 
         ViewController spy = spy(uut);
         View view = spy.getView();

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/child/ChildControllerTest.java

@@ -0,0 +1,39 @@
+package com.reactnativenavigation.viewcontrollers.child;
+
+import com.reactnativenavigation.BaseTest;
+import com.reactnativenavigation.mocks.SimpleViewController;
+import com.reactnativenavigation.parse.Options;
+import com.reactnativenavigation.viewcontrollers.ChildController;
+import com.reactnativenavigation.viewcontrollers.ChildControllersRegistry;
+
+import org.junit.Test;
+
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+public class ChildControllerTest extends BaseTest {
+
+    private ChildController uut;
+    private ChildControllersRegistry childRegistry;
+
+    @Override
+    public void beforeEach() {
+        childRegistry = spy(new ChildControllersRegistry());
+        uut = new SimpleViewController(newActivity(), childRegistry, "childId", new Options());
+    }
+
+    @Test
+    public void onViewAppeared() {
+        uut.onViewAppeared();
+        verify(childRegistry, times(1)).onViewAppeared(uut);
+    }
+
+    @Test
+    public void onViewDisappear() {
+        uut.onViewAppeared();
+
+        uut.onViewDisappear();
+        verify(childRegistry, times(1)).onViewDisappear(uut);
+    }
+}

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/child/ChildControllersRegistryTest.java

@@ -0,0 +1,47 @@
+package com.reactnativenavigation.viewcontrollers.child;
+
+import android.app.Activity;
+
+import com.reactnativenavigation.BaseTest;
+import com.reactnativenavigation.mocks.SimpleViewController;
+import com.reactnativenavigation.parse.Options;
+import com.reactnativenavigation.viewcontrollers.ChildController;
+import com.reactnativenavigation.viewcontrollers.ChildControllersRegistry;
+
+import org.junit.Test;
+
+import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+public class ChildControllersRegistryTest extends BaseTest {
+    private ChildControllersRegistry uut;
+    private ChildController child1;
+    private ChildController child2;
+
+    @Override
+    public void beforeEach() {
+        Activity activity = newActivity();
+        uut = new ChildControllersRegistry();
+        child1 = spy(new SimpleViewController(activity, uut, "child1", new Options()));
+        child2 = spy(new SimpleViewController(activity, uut, "child2", new Options()));
+    }
+
+    @Test
+    public void onViewAppeared() {
+        child1.onViewAppeared();
+        verify(child1, times(0)).onViewBroughtToFront();
+        assertThat(uut.size()).isOne();
+    }
+
+    @Test
+    public void onViewDisappear() {
+        child1.onViewAppeared();
+        child2.onViewAppeared();
+        assertThat(uut.size()).isEqualTo(2);
+        child2.onViewDisappear();
+        verify(child1, times(1)).onViewBroughtToFront();
+        assertThat(uut.size()).isOne();
+    }
+}

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/modal/ModalPresenterTest.java

@@ -11,6 +11,8 @@ import com.reactnativenavigation.parse.ModalPresentationStyle;
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.utils.CommandListener;
 import com.reactnativenavigation.utils.CommandListenerAdapter;
+import com.reactnativenavigation.viewcontrollers.ChildController;
+import com.reactnativenavigation.viewcontrollers.ChildControllersRegistry;
 import com.reactnativenavigation.viewcontrollers.ParentController;
 import com.reactnativenavigation.viewcontrollers.ViewController;
 
@@ -29,16 +31,18 @@ public class ModalPresenterTest extends BaseTest {
     private static final String MODAL_ID_1 = "modalId1";
     private static final String MODAL_ID_2 = "modalId2";
 
-    private ViewController modal1;
-    private ViewController modal2;
+    private ChildController modal1;
+    private ChildController modal2;
     private ModalPresenter uut;
     private FrameLayout contentLayout;
     private ModalAnimator animator;
     private ViewController rootController;
+    private ChildControllersRegistry childRegistry;
 
     @Override
     public void beforeEach() {
         Activity activity = newActivity();
+        childRegistry = new ChildControllersRegistry();
 
         ViewGroup root = new FrameLayout(activity);
         rootController = Mockito.mock(ParentController.class);
@@ -50,8 +54,8 @@ public class ModalPresenterTest extends BaseTest {
         animator = spy(new ModalAnimator(activity));
         uut = new ModalPresenter(animator);
         uut.setContentLayout(contentLayout);
-        modal1 = spy(new SimpleViewController(activity, MODAL_ID_1, new Options()));
-        modal2 = spy(new SimpleViewController(activity, MODAL_ID_2, new Options()));
+        modal1 = spy(new SimpleViewController(activity, childRegistry, MODAL_ID_1, new Options()));
+        modal2 = spy(new SimpleViewController(activity, childRegistry, MODAL_ID_2, new Options()));
     }
 
     @Test
@@ -130,6 +134,17 @@ public class ModalPresenterTest extends BaseTest {
         verify(spy, times(1)).addView(modal2.getView(), 0);
     }
 
+    @Test
+    public void dismissModal_onViewBroughtToFront_invokedOnPreviousView() {
+        disableShowModalAnimation(modal1, modal2);
+        disableDismissModalAnimation(modal1, modal2);
+
+        uut.showModal(modal1, rootController, new CommandListenerAdapter());
+        uut.showModal(modal2, rootController, new CommandListenerAdapter());
+        uut.dismissModal(modal2, modal1, new CommandListenerAdapter());
+        verify(modal1, times(1)).onViewBroughtToFront();
+    }
+
     @Test
     public void dismissModal_noAnimation() {
         disableShowModalAnimation(modal1);

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/modal/ModalStackTest.java

@@ -10,6 +10,7 @@ import com.reactnativenavigation.mocks.SimpleViewController;
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.utils.CommandListener;
 import com.reactnativenavigation.utils.CommandListenerAdapter;
+import com.reactnativenavigation.viewcontrollers.ChildControllersRegistry;
 import com.reactnativenavigation.viewcontrollers.ParentController;
 import com.reactnativenavigation.viewcontrollers.ViewController;
 
@@ -39,6 +40,7 @@ public class ModalStackTest extends BaseTest {
     private ViewController modal2;
     private ViewController modal3;
     private Activity activity;
+    private ChildControllersRegistry childRegistry;
     private ModalPresenter presenter;
     private ModalAnimator animator;
     private ViewController rootController;
@@ -46,6 +48,7 @@ public class ModalStackTest extends BaseTest {
     @Override
     public void beforeEach() {
         activity = newActivity();
+        childRegistry = new ChildControllersRegistry();
 
         ViewGroup root = new FrameLayout(activity);
         rootController = Mockito.mock(ParentController.class);
@@ -58,9 +61,9 @@ public class ModalStackTest extends BaseTest {
         presenter = spy(new ModalPresenter(animator));
         uut = new ModalStack(presenter);
         uut.setContentLayout(activityContentView);
-        modal1 = spy(new SimpleViewController(activity, MODAL_ID_1, new Options()));
-        modal2 = spy(new SimpleViewController(activity, MODAL_ID_2, new Options()));
-        modal3 = spy(new SimpleViewController(activity, MODAL_ID_3, new Options()));
+        modal1 = spy(new SimpleViewController(activity, childRegistry, MODAL_ID_1, new Options()));
+        modal2 = spy(new SimpleViewController(activity, childRegistry, MODAL_ID_2, new Options()));
+        modal3 = spy(new SimpleViewController(activity, childRegistry, MODAL_ID_3, new Options()));
     }
 
     @Test
@@ -224,7 +227,7 @@ public class ModalStackTest extends BaseTest {
 
     @Test
     public void handleBack_ViewControllerTakesPrecedenceOverModal() {
-        ViewController backHandlingModal = spy(new SimpleViewController(activity, "stack", new Options()){
+        ViewController backHandlingModal = spy(new SimpleViewController(activity, childRegistry, "stack", new Options()){
             @Override
             public boolean handleBack(CommandListener listener) {
                 return true;

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/overlay/OverlayManagerTest.java

@@ -9,6 +9,7 @@ import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.presentation.OverlayManager;
 import com.reactnativenavigation.utils.CommandListener;
 import com.reactnativenavigation.utils.CommandListenerAdapter;
+import com.reactnativenavigation.viewcontrollers.ChildControllersRegistry;
 
 import org.junit.Test;
 
@@ -20,8 +21,11 @@ import static org.mockito.Mockito.verify;
 
 public class OverlayManagerTest extends BaseTest {
     private static final String OVERLAY_ID_1 = "OVERLAY_1";
+    private static final String OVERLAY_ID_2 = "OVERLAY_2";
+
     private OverlayManager uut;
     private SimpleViewController overlay1;
+    private SimpleViewController overlay2;
     private FrameLayout root;
 
     @Override
@@ -31,7 +35,9 @@ public class OverlayManagerTest extends BaseTest {
         root.layout(0, 0, 1000, 1000);
         activity.setContentView(root);
 
-        overlay1 = spy(new SimpleViewController(activity, OVERLAY_ID_1, new Options()));
+        ChildControllersRegistry childRegistry = new ChildControllersRegistry();
+        overlay1 = spy(new SimpleViewController(activity, childRegistry, OVERLAY_ID_1, new Options()));
+        overlay2 = spy(new SimpleViewController(activity, childRegistry, OVERLAY_ID_2, new Options()));
         uut = new OverlayManager();
     }
 
@@ -60,4 +66,14 @@ public class OverlayManagerTest extends BaseTest {
         uut.dismiss(overlay1.getId(), listener);
         verify(listener, times(1)).onError(any());
     }
+
+    @Test
+    public void dismiss_onViewReturnedToFront() {
+        uut.show(root, overlay1, new CommandListenerAdapter());
+        uut.show(root, overlay2, new CommandListenerAdapter());
+        verify(overlay1, times(0)).onViewBroughtToFront();
+
+        uut.dismiss(OVERLAY_ID_2, new CommandListenerAdapter());
+        verify(overlay1, times(1)).onViewBroughtToFront();
+    }
 }