react-native-navigation 7.23.1 → 7.24.0

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

@@ -34,7 +34,7 @@ import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 
 public class ModalPresenterTest extends BaseTest {
     private static final String MODAL_ID_1 = "modalId1";
@@ -50,6 +50,7 @@ public class ModalPresenterTest extends BaseTest {
 
     @Override
     public void beforeEach() {
+        super.beforeEach();
         Activity activity = newActivity();
         ChildControllersRegistry childRegistry = new ChildControllersRegistry();
 
@@ -108,7 +109,7 @@ public class ModalPresenterTest extends BaseTest {
         defaultOptions.animations.showModal = TransitionAnimationOptionsKt.parseTransitionAnimationOptions(disabledShowModalAnimation);
         uut.setDefaultOptions(defaultOptions);
         uut.showModal(modal1, root, new CommandListenerAdapter());
-        verifyZeroInteractions(animator);
+        verifyNoInteractions(animator);
     }
 
     @Test
@@ -162,7 +163,7 @@ public class ModalPresenterTest extends BaseTest {
         modal1.options.animations.showModal.setWaitForRender(new Bool(true));
         uut.showModal(modal1, root, new CommandListenerAdapter());
         verify(modal1).addOnAppearedListener(any());
-        verifyZeroInteractions(animator);
+        verifyNoInteractions(animator);
     }
 
     @Test
@@ -210,6 +211,7 @@ public class ModalPresenterTest extends BaseTest {
         uut.setRootLayout(spy);
 
         uut.showModal(modal1, root, new CommandListenerAdapter());
+        idleMainLooper();
         uut.dismissModal(modal1, root, root, new CommandListenerAdapter());
 
         verify(spy).addView(root.getView(), 0);
@@ -237,6 +239,7 @@ public class ModalPresenterTest extends BaseTest {
         verify(modal1).onViewWillAppear();
 
         uut.showModal(modal2, modal1, new CommandListenerAdapter());
+        idleMainLooper();
         assertThat(modal1.getView().getParent()).isNull();
 
         Shadows.shadowOf(Looper.getMainLooper()).idle();
@@ -253,6 +256,7 @@ public class ModalPresenterTest extends BaseTest {
 
         uut.showModal(modal1, root, new CommandListenerAdapter());
         uut.showModal(modal2, modal1, new CommandListenerAdapter());
+        idleMainLooper();
         assertThat(modal1.getView().getParent()).isNull();
         assertThat(root.getView().getParent()).isNull();
 

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

@@ -13,7 +13,7 @@ import com.reactnativenavigation.react.events.EventEmitter;
 import com.reactnativenavigation.viewcontrollers.child.ChildControllersRegistry;
 import com.reactnativenavigation.viewcontrollers.stack.StackController;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.ViewController;
-
+import com.reactnativenavigation.options.TransitionAnimationOptions;
 import org.junit.Test;
 import org.mockito.Mockito;
 
@@ -30,7 +30,8 @@ import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
 public class ModalStackTest extends BaseTest {
@@ -54,6 +55,7 @@ public class ModalStackTest extends BaseTest {
 
     @Override
     public void beforeEach() {
+        super.beforeEach();
         activity = newActivity();
         childRegistry = new ChildControllersRegistry();
         root = new SimpleViewController(activity, childRegistry, "root", new Options());
@@ -81,6 +83,16 @@ public class ModalStackTest extends BaseTest {
                 .build();
     }
 
+    @Test
+    public void showModal_DidAppearEventShouldWaitForReactViewToBeShown(){
+        CommandListener listener = spy(new CommandListenerAdapter());
+        uut.showModal(modal1, root, listener);
+        verify(modal1).addOnAppearedListener(any());
+        verify(listener).onSuccess(modal1.getId());
+        idleMainLooper();
+        verify(modal1).onViewDidAppear();
+    }
+
     @Test
     public void modalRefIsSaved() {
         disableShowModalAnimation(modal1);
@@ -94,6 +106,7 @@ public class ModalStackTest extends BaseTest {
     public void showModal() {
         CommandListener listener = spy(new CommandListenerAdapter());
         uut.showModal(modal1, root, listener);
+        idleMainLooper();
         verify(listener).onSuccess(modal1.getId());
         verify(modal1).onViewDidAppear();
         assertThat(uut.size()).isOne();
@@ -140,7 +153,7 @@ public class ModalStackTest extends BaseTest {
         uut.dismissModal(MODAL_ID_1, root, listener);
         verify(onModalWillDismiss, times(0)).run();
         verify(listener, times(1)).onError(anyString());
-        verifyZeroInteractions(listener);
+        verifyNoMoreInteractions(listener);
     }
 
     @Test
@@ -176,7 +189,7 @@ public class ModalStackTest extends BaseTest {
         });
         uut.dismissAllModals(root, Options.EMPTY, listener);
         verify(listener, times(1)).onSuccess(anyString());
-        verifyZeroInteractions(listener);
+        verifyNoMoreInteractions(listener);
     }
 
     @Test

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

@@ -507,7 +507,7 @@ public class NavigatorTest extends BaseTest {
         StackController stack2 = newStack(child2, child3, child4);
         BottomTabsController bottomTabsController = newTabs(Arrays.asList(stack1, stack2));
         uut.setRoot(bottomTabsController, new CommandListenerAdapter(), reactInstanceManager);
-
+        idleMainLooper();
         CommandListenerAdapter listener = spy(new CommandListenerAdapter() {
             @Override
             public void onSuccess(String childId) {
@@ -670,7 +670,7 @@ public class NavigatorTest extends BaseTest {
         final StackController stack2 = newStack(child2, child3);
         BottomTabsController bottomTabsController = newTabs(Arrays.asList(stack1, stack2));
         uut.setRoot(bottomTabsController, new CommandListenerAdapter(), reactInstanceManager);
-
+        idleMainLooper();
         CommandListenerAdapter listener = spy(new CommandListenerAdapter() {
             @Override
             public void onSuccess(String childId) {

package/lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/navigator/RootPresenterTest.kt

@@ -3,9 +3,6 @@ package com.reactnativenavigation.viewcontrollers.navigator
 import android.app.Activity
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import com.facebook.react.ReactInstanceManager
-import com.nhaarman.mockitokotlin2.any
-import com.nhaarman.mockitokotlin2.eq
-import com.nhaarman.mockitokotlin2.never
 import com.reactnativenavigation.BaseTest
 import com.reactnativenavigation.TestActivity
 import com.reactnativenavigation.hierarchy.root.RootAnimator
@@ -22,6 +19,9 @@ import org.assertj.core.api.Java6Assertions
 import org.junit.Test
 import org.mockito.ArgumentCaptor
 import org.mockito.Mockito
+import org.mockito.kotlin.any
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.never
 import org.robolectric.android.controller.ActivityController
 
 class RootPresenterTest : BaseTest() {
@@ -76,7 +76,7 @@ class RootPresenterTest : BaseTest() {
     fun setRoot_doesNotAnimateByDefault() {
         val listener = Mockito.spy(CommandListenerAdapter())
         uut.setRoot(root, null, defaultOptions, listener, reactInstanceManager)
-        Mockito.verifyZeroInteractions(animator)
+        Mockito.verifyNoInteractions(animator)
         Mockito.verify(listener).onSuccess(root.id)
     }
 
@@ -210,7 +210,7 @@ class RootPresenterTest : BaseTest() {
         uut.setRoot(spy, null, defaultOptions, listener, reactInstanceManager)
         Mockito.verify(spy).addOnAppearedListener(any())
         Java6Assertions.assertThat(spy.view.alpha).isZero()
-        Mockito.verifyZeroInteractions(listener)
+        Mockito.verifyNoInteractions(listener)
         spy.onViewWillAppear()
         idleMainLooper()
         Java6Assertions.assertThat(spy.view.alpha).isOne()

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

@@ -32,6 +32,7 @@ public class OverlayManagerTest extends BaseTest {
 
     @Override
     public void beforeEach() {
+        super.beforeEach();
         Activity activity = newActivity();
         contentLayout = new FrameLayout(activity);
         contentLayout.layout(0, 0, 1000, 1000);

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

@@ -264,6 +264,8 @@ public class ParentControllerTest extends BaseTest {
     @Test
     public void getTopInsetForChild() {
         ParentController<?> parent = Mockito.mock(ParentController.class);
+        Mockito.when(parent.resolveChildOptions(uut)).thenReturn(Options.EMPTY);
+
         when(parent.getTopInset(any())).thenReturn(123);
         uut.setParentController(parent);
 
@@ -280,6 +282,8 @@ public class ParentControllerTest extends BaseTest {
     @Test
     public void getBottomInsetForChild() {
         ParentController<?> parent = Mockito.mock(ParentController.class);
+        Mockito.when(parent.resolveChildOptions(uut)).thenReturn(Options.EMPTY);
+
         when(parent.getBottomInset(any())).thenReturn(123);
         uut.setParentController(parent);
 

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

@@ -2,6 +2,7 @@ package com.reactnativenavigation.viewcontrollers.sidemenu;
 
 import android.app.Activity;
 import android.content.res.Resources;
+import android.graphics.Path;
 import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.View;
@@ -55,6 +56,7 @@ public class SideMenuControllerTest extends BaseTest {
 
     @Override
     public void beforeEach() {
+        super.beforeEach();
         activity = createActivity();
 
         childRegistry = new ChildControllersRegistry();
@@ -72,6 +74,7 @@ public class SideMenuControllerTest extends BaseTest {
         };
         uut.setCenterController(center);
         parent = mock(ParentController.class);
+        Mockito.when(parent.resolveChildOptions(uut)).thenReturn(Options.EMPTY);
         uut.setParentController(parent);
     }
 
@@ -118,12 +121,12 @@ public class SideMenuControllerTest extends BaseTest {
 
     @Test
     public void onViewAppeared() {
-        ViewController<?> left = spy(this.left);
+        ViewController left = spy(this.left);
         ViewGroup leftView = spy(left.getView());
         when(left.findController(leftView)).thenReturn(left);
         Mockito.doReturn(leftView).when(left).getView();
 
-        ViewController<?> right = spy(this.right);
+        ViewController right = spy(this.right);
         ViewGroup rightView = spy(right.getView());
         when(right.findController(rightView)).thenReturn(right);
         Mockito.doReturn(rightView).when(right).getView();
@@ -369,6 +372,7 @@ public class SideMenuControllerTest extends BaseTest {
     @Test
     public void onMeasureChild_topInsetsAreApplied() {
         setLeftRight(spy(left), spy(right));
+        idleMainLooper();
         uut.applyTopInset();
         forEach(uut.getChildControllers(), c -> verify(c).applyTopInset());
     }

package/lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/stack/StackAnimatorTest.kt

@@ -4,7 +4,7 @@ import android.animation.AnimatorSet
 import android.animation.ObjectAnimator
 import android.app.Activity
 import android.widget.FrameLayout
-import com.nhaarman.mockitokotlin2.*
+import org.mockito.kotlin.*
 import com.reactnativenavigation.BaseTest
 import com.reactnativenavigation.mocks.Mocks
 import com.reactnativenavigation.mocks.SimpleViewController

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

@@ -6,7 +6,7 @@ import android.content.Context
 import android.view.View
 import android.widget.FrameLayout
 import androidx.coordinatorlayout.widget.CoordinatorLayout
-import com.nhaarman.mockitokotlin2.*
+import org.mockito.kotlin.*
 import com.reactnativenavigation.BaseTest
 import com.reactnativenavigation.TestUtils
 import com.reactnativenavigation.mocks.*
@@ -61,7 +61,7 @@ class StackControllerTest : BaseTest() {
         eventEmitter = mock()
         backButtonHelper = spy(BackButtonHelper())
         activity = newActivity()
-        StatusBarUtils.saveStatusBarHeight(63)
+        SystemUiUtils.saveStatusBarHeight(63)
         animator = spy(StackAnimator(activity))
         childRegistry = ChildControllersRegistry()
         presenter = spy(StackPresenter(
@@ -197,7 +197,7 @@ class StackControllerTest : BaseTest() {
     fun setRoot_pushDuringSetRootAnimationShouldNotCrash() {
         uut.push(child1, CommandListenerAdapter())
         uut.push(child2, CommandListenerAdapter())
-
+        idleMainLooper()
         uut.setRoot(listOf(child1), CommandListenerAdapter())
         uut.push(child3, CommandListenerAdapter())
         assertThat(uut.currentChild).isEqualTo(child3)
@@ -281,6 +281,7 @@ class StackControllerTest : BaseTest() {
         disablePushAnimation(child1, child2)
         uut.push(child1, CommandListenerAdapter()) // Initialize stack with a child
         uut.push(child2, CommandListenerAdapter())
+        idleMainLooper()
         verify(child2).onViewDidAppear()
     }
 
@@ -608,8 +609,9 @@ class StackControllerTest : BaseTest() {
         assertNotChildOf(uut.view, child1.view)
         uut.push(child1, CommandListenerAdapter())
         assertIsChild(uut.view, child1.view)
-
+        idleMainLooper()
         uut.push(child2, CommandListenerAdapter())
+        idleMainLooper()
         assertIsChild(uut.view, child2)
         assertNotChildOf(uut.view, child1)
     }
@@ -663,7 +665,7 @@ class StackControllerTest : BaseTest() {
         val child1View: View = child1.view
         uut.push(child1, CommandListenerAdapter())
         uut.push(child2, CommandListenerAdapter())
-
+        idleMainLooper()
         assertIsChild(uut.view, child2View)
         assertNotChildOf(uut.view, child1View)
         uut.pop(Options.EMPTY, CommandListenerAdapter())
@@ -715,7 +717,7 @@ class StackControllerTest : BaseTest() {
         uut.push(child2, CommandListenerAdapter())
         uut.push(child3, CommandListenerAdapter())
         uut.push(child4, CommandListenerAdapter())
-
+        idleMainLooper()
         uut.popTo(child2, Options.EMPTY, CommandListenerAdapter())
         verify(animator, never()).pop(any(), eq(child1), any(), any(), any())
         verify(animator, never()).pop(any(), eq(child2), any(), any(), any())
@@ -729,6 +731,7 @@ class StackControllerTest : BaseTest() {
         uut.push(child1, mock())
         uut.push(child2, mock())
         uut.push(child3, mock())
+        idleMainLooper()
         uut.popTo(child1, Options.EMPTY, mock())
         animator.endPushAnimation(child3)
         assertContainsOnlyId(child1.id)
@@ -759,8 +762,8 @@ class StackControllerTest : BaseTest() {
         disablePushAnimation(child1, child2, child3)
         uut.push(child1, CommandListenerAdapter())
         uut.push(child2, CommandListenerAdapter())
-
         uut.push(child3, CommandListenerAdapter())
+        idleMainLooper()
         uut.popToRoot(Options.EMPTY, object : CommandListenerAdapter() {
             override fun onSuccess(childId: String) {
                 verify(animator).pop(eq(child1), eq(child3), any(), any(), any())
@@ -776,6 +779,7 @@ class StackControllerTest : BaseTest() {
         uut.push(child1, CommandListenerAdapter())
         uut.push(child2, CommandListenerAdapter())
         uut.push(child3, CommandListenerAdapter())
+        idleMainLooper()
         uut.popToRoot(Options.EMPTY, object : CommandListenerAdapter() {
             override fun onSuccess(childId: String) {
                 verify(child1, never()).destroy()
@@ -811,6 +815,7 @@ class StackControllerTest : BaseTest() {
         uut.push(child1, mock())
         uut.push(child2, mock())
         uut.push(child3, mock())
+        idleMainLooper()
         uut.popToRoot(Options.EMPTY, mock())
         animator.endPushAnimation(child3)
         assertContainsOnlyId(child1.id)
@@ -1084,7 +1089,7 @@ class StackControllerTest : BaseTest() {
         disablePushAnimation(child1)
         uut.push(child1, CommandListenerAdapter())
         ShadowLooper.idleMainLooper()
-        assertThat(ViewUtils.topMargin(uut.topBar)).isEqualTo(StatusBarUtils.getStatusBarHeight(activity))
+        assertThat(ViewUtils.topMargin(uut.topBar)).isEqualTo(SystemUiUtils.getStatusBarHeight(activity))
     }
 
     @Test

package/lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/stack/StackPresenterTest.kt

@@ -7,7 +7,7 @@ import android.graphics.Color
 import android.graphics.Typeface
 import android.view.View
 import android.view.ViewGroup
-import com.nhaarman.mockitokotlin2.*
+import org.mockito.kotlin.*
 import com.reactnativenavigation.BaseTest
 import com.reactnativenavigation.TestUtils
 import com.reactnativenavigation.fakes.IconResolverFake
@@ -17,7 +17,10 @@ import com.reactnativenavigation.options.params.*
 import com.reactnativenavigation.options.params.Number
 import com.reactnativenavigation.options.parsers.TypefaceLoader
 import com.reactnativenavigation.react.CommandListenerAdapter
-import com.reactnativenavigation.utils.*
+import com.reactnativenavigation.utils.CollectionUtils
+import com.reactnativenavigation.utils.RenderChecker
+import com.reactnativenavigation.utils.TitleBarHelper
+import com.reactnativenavigation.utils.UiUtils
 import com.reactnativenavigation.viewcontrollers.child.ChildControllersRegistry
 import com.reactnativenavigation.viewcontrollers.stack.topbar.TopBarController
 import com.reactnativenavigation.viewcontrollers.stack.topbar.button.ButtonController
@@ -99,6 +102,7 @@ class StackPresenterTest : BaseTest() {
 
     @Test
     fun onConfigurationChange_shouldApplyColors() {
+        parent.setRoot(listOf(child), CommandListenerAdapter())
         val options = Options.EMPTY.copy()
         options.topBar.borderColor = ThemeColour.of(Color.BLACK, Color.RED)
         options.topBar.background = TopBarBackgroundOptions().apply {
@@ -122,7 +126,7 @@ class StackPresenterTest : BaseTest() {
         options.topTabs.unselectedTabColor = ThemeColour.of(Color.BLACK, Color.RED)
 
         mockConfiguration.uiMode = Configuration.UI_MODE_NIGHT_NO
-        uut.onConfigurationChanged(options)
+        uut.onConfigurationChanged(options, getCurrentChild())
 
         verify(topBar).setTitleTextColor(Color.BLACK)
         verify(topBar).setSubtitleColor(Color.BLACK)
@@ -133,7 +137,7 @@ class StackPresenterTest : BaseTest() {
         verify(topBar).setBackButton(any())
 
         mockConfiguration.uiMode = Configuration.UI_MODE_NIGHT_YES
-        uut.onConfigurationChanged(options)
+        uut.onConfigurationChanged(options, getCurrentChild())
 
         verify(topBar).setTitleTextColor(Color.RED)
         verify(topBar).setSubtitleColor(Color.RED)
@@ -147,15 +151,18 @@ class StackPresenterTest : BaseTest() {
 
     @Test
     fun onConfigurationChange_shouldApplyColorsOnTopBarButtons() {
+        parent.setRoot(listOf(child), CommandListenerAdapter())
+
         val options = Options.EMPTY.copy()
         options.topBar.buttons.left = arrayListOf(ButtonOptions())
         options.topBar.buttons.right = arrayListOf(ButtonOptions())
-        uut.applyChildOptions(options,parent,child)
 
-        uut.onConfigurationChanged(options)
+        uut.applyChildOptions(options,parent,child)
+        verify(topBarController, times(1)).applyRightButtonsOptions(any(),any(),any())
+        verify(topBarController, times(1)).applyLeftButtonsOptions(any(),any(),any())
 
-        verify(topBarController, times(2)).applyRightButtons(any())
-        verify(topBarController, times(2)).applyLeftButtons(any())
+        uut.onConfigurationChanged(options, getCurrentChild())
+        verify(topBarController, times(1)).onConfigurationChanged(any(), any(), any())
     }
 
     @Test
@@ -252,19 +259,19 @@ class StackPresenterTest : BaseTest() {
     @Test
     fun mergeButtons() {
         uut.mergeChildOptions(EMPTY_OPTIONS, EMPTY_OPTIONS, parent, child)
-        verify(topBarController, never()).applyRightButtons(any())
-        verify(topBarController, never()).applyLeftButtons(any())
+        verify(topBarController, never()).mergeLeftButtonsOptions(any(),any(),any())
+        verify(topBarController, never()).mergeRightButtonsOptions(any(),any(),any())
 
         val options = Options()
         val button = ButtonOptions()
         button.text = Text("btn")
         options.topBar.buttons.right = ArrayList(setOf(button))
         uut.mergeChildOptions(options, EMPTY_OPTIONS, parent, child)
-        verify(topBarController).mergeRightButtons(any(), any())
+        verify(topBarController).mergeRightButtonsOptions(any(), any(),any())
 
         options.topBar.buttons.left = ArrayList(setOf(button))
         uut.mergeChildOptions(options, EMPTY_OPTIONS, parent, child)
-        verify(topBarController).mergeLeftButtons(any(), any())
+        verify(topBarController).mergeLeftButtonsOptions(any(), any(), any())
     }
 
     @Test
@@ -313,8 +320,8 @@ class StackPresenterTest : BaseTest() {
         toApply.topBar.buttons.right = arrayListOf(textBtn1, componentBtn1)
         uut.applyChildOptions(toApply, parent, child)
 
-        val captor1 = argumentCaptor<List<ButtonController>>()
-        verify(topBarController).applyRightButtons(captor1.capture())
+        val captor1 = argumentCaptor<List<ButtonOptions>>()
+        verify(topBarController).applyRightButtonsOptions(any(),captor1.capture(), any())
         assertThat(topBar.rightButtonBar.menu.size()).isEqualTo(2)
 
         val appliedButtons = captor1.firstValue
@@ -325,12 +332,12 @@ class StackPresenterTest : BaseTest() {
         uut.mergeChildOptions(toMerge, Options.EMPTY, parent, child)
 
         assertThat(topBar.rightButtonBar.menu.size()).isEqualTo(3)
-        val captor2 = argumentCaptor<List<ButtonController>>()
-        verify(topBarController).mergeRightButtons(captor2.capture(), any())
+        val captor2 = argumentCaptor<List<ButtonOptions>>()
+        verify(topBarController).mergeRightButtonsOptions(any(),captor2.capture(), any())
         val mergedButtons = captor2.firstValue
         assertThat(mergedButtons).hasSize(3)
-        assertThat(appliedButtons[0]).isNotEqualTo(mergedButtons[0])
-        assertThat(appliedButtons[1]).isEqualTo(mergedButtons[2])
+        assertThat(appliedButtons[0].id).isNotEqualTo(mergedButtons[1].id)
+        assertThat(appliedButtons[1].id).isEqualTo(mergedButtons[2].id)
     }
 
     @Test
@@ -357,15 +364,14 @@ class StackPresenterTest : BaseTest() {
         options.topBar.buttons.left = ArrayList(listOf(textBtn2))
         uut.applyChildOptions(options, parent, child)
         ShadowLooper.idleMainLooper()
-        verify(topBar, times(1)).clearLeftButtons()
-        verify(topBar, times(1)).clearBackButton()
+        verify(topBarController, times(1)).applyLeftButtonsOptions(any(), any(), any())
+        verify(topBar, never()).setBackButton(any())
 
         val backButtonHidden = Options()
         backButtonHidden.topBar.buttons.back.setHidden()
         uut.mergeChildOptions(backButtonHidden, options, parent, child)
         ShadowLooper.idleMainLooper()
-        verify(topBar, times(1)).clearLeftButtons()
-        verify(topBar, times(2)).clearBackButton()
+        verify(topBar, times(1)).clearBackButton()
     }
 
     @Test
@@ -400,7 +406,7 @@ class StackPresenterTest : BaseTest() {
 
         assertThat(toMerge.topBar.buttons.back.hasValue()).isTrue()
         uut.mergeChildOptions(toMerge, Options.EMPTY, parent, child)
-        verify(topBarController).mergeLeftButtons(any(), any())
+        verify(topBarController).mergeLeftButtonsOptions(any(), any(),any())
         verify(topBar, never()).clearLeftButtons()
     }
 
@@ -662,15 +668,15 @@ class StackPresenterTest : BaseTest() {
         options.topBar.buttons.left = ArrayList()
         options.topBar.buttons.left!!.add(leftButton)
         uut.applyChildOptions(options, parent, child)
-        val rightCaptor = argumentCaptor<List<ButtonController>>()
-        verify(topBarController).applyRightButtons(rightCaptor.capture())
-        assertThat(rightCaptor.firstValue[0].button.color.get()).isEqualTo(options.topBar.rightButtonColor.get())
-        assertThat(rightCaptor.firstValue[1].button.color.get()).isEqualTo(options.topBar.rightButtonColor.get())
+        val rightCaptor = argumentCaptor<List<ButtonOptions>>()
+        verify(topBarController).applyRightButtonsOptions(any(),rightCaptor.capture(), any())
+        assertThat(rightCaptor.firstValue[0].color.get()).isEqualTo(options.topBar.rightButtonColor.get())
+        assertThat(rightCaptor.firstValue[1].color.get()).isEqualTo(options.topBar.rightButtonColor.get())
         assertThat(rightCaptor.firstValue[0]).isNotEqualTo(rightButton1)
         assertThat(rightCaptor.firstValue[1]).isNotEqualTo(rightButton2)
-        val leftCaptor = argumentCaptor<List<ButtonController>>()
-        verify(topBarController).applyLeftButtons(leftCaptor.capture())
-        assertThat(leftCaptor.firstValue[0].button.color).isEqualTo(options.topBar.leftButtonColor)
+        val leftCaptor = argumentCaptor<List<ButtonOptions>>()
+        verify(topBarController).applyLeftButtonsOptions(any(),leftCaptor.capture(),any())
+        assertThat(leftCaptor.firstValue[0].color).isEqualTo(options.topBar.leftButtonColor)
         assertThat(leftCaptor.firstValue[0]).isNotEqualTo(leftButton)
     }
 
@@ -790,15 +796,15 @@ class StackPresenterTest : BaseTest() {
         options2.topBar.buttons.left = ArrayList(listOf(leftButton))
 
         uut.mergeChildOptions(options2, appliedOptions, parent, child)
-        val rightCaptor = argumentCaptor<List<ButtonController>>()
-        verify(topBarController).mergeRightButtons(rightCaptor.capture(), any())
-        assertThat(rightCaptor.firstValue[0].button.color.get()).isEqualTo(appliedOptions.topBar.rightButtonColor.get())
-        assertThat(rightCaptor.firstValue[1].button.color.get()).isEqualTo(appliedOptions.topBar.rightButtonColor.get())
+        val rightCaptor = argumentCaptor<List<ButtonOptions>>()
+        verify(topBarController).mergeRightButtonsOptions(any(),rightCaptor.capture(), any())
+        assertThat(rightCaptor.firstValue[0].color.get()).isEqualTo(appliedOptions.topBar.rightButtonColor.get())
+        assertThat(rightCaptor.firstValue[1].color.get()).isEqualTo(appliedOptions.topBar.rightButtonColor.get())
         assertThat(rightCaptor.firstValue[0]).isNotEqualTo(rightButton1)
         assertThat(rightCaptor.firstValue[1]).isNotEqualTo(rightButton2)
-        val leftCaptor = argumentCaptor<List<ButtonController>>()
-        verify(topBarController).mergeLeftButtons(leftCaptor.capture(), any())
-        assertThat(leftCaptor.firstValue[0].button.color.get()).isEqualTo(appliedOptions.topBar.leftButtonColor.get())
+        val leftCaptor = argumentCaptor<List<ButtonOptions>>()
+        verify(topBarController).mergeLeftButtonsOptions(any(),leftCaptor.capture(), any())
+        assertThat(leftCaptor.firstValue[0].color.get()).isEqualTo(appliedOptions.topBar.leftButtonColor.get())
         assertThat(leftCaptor.firstValue[0]).isNotEqualTo(leftButton)
     }
 
@@ -816,15 +822,15 @@ class StackPresenterTest : BaseTest() {
         options2.topBar.buttons.left = ArrayList(listOf(leftButton))
 
         uut.mergeChildOptions(options2, resolvedOptions, parent, child)
-        val rightCaptor = argumentCaptor<List<ButtonController>>()
-        verify(topBarController).mergeRightButtons(rightCaptor.capture(), any())
-        assertThat(rightCaptor.firstValue[0].button.color.get()).isEqualTo(resolvedOptions.topBar.rightButtonColor.get())
-        assertThat(rightCaptor.firstValue[1].button.color.get()).isEqualTo(resolvedOptions.topBar.rightButtonColor.get())
+        val rightCaptor = argumentCaptor<List<ButtonOptions>>()
+        verify(topBarController).mergeRightButtonsOptions(any(),rightCaptor.capture(), any())
+        assertThat(rightCaptor.firstValue[0].color.get()).isEqualTo(resolvedOptions.topBar.rightButtonColor.get())
+        assertThat(rightCaptor.firstValue[1].color.get()).isEqualTo(resolvedOptions.topBar.rightButtonColor.get())
         assertThat(rightCaptor.firstValue[0]).isNotEqualTo(rightButton1)
         assertThat(rightCaptor.firstValue[1]).isNotEqualTo(rightButton2)
-        val leftCaptor = argumentCaptor<List<ButtonController>>()
-        verify(topBarController).mergeLeftButtons(leftCaptor.capture(), any())
-        assertThat(leftCaptor.firstValue[0].button.color.get()).isEqualTo(resolvedOptions.topBar.leftButtonColor.get())
+        val leftCaptor = argumentCaptor<List<ButtonOptions>>()
+        verify(topBarController).mergeLeftButtonsOptions(any(),leftCaptor.capture(), any())
+        assertThat(leftCaptor.firstValue[0].color.get()).isEqualTo(resolvedOptions.topBar.leftButtonColor.get())
         assertThat(leftCaptor.firstValue[0]).isNotEqualTo(leftButton)
     }
 
@@ -834,10 +840,10 @@ class StackPresenterTest : BaseTest() {
         options.topBar.buttons.right = ArrayList(listOf(textBtn1))
         options.topBar.buttons.left = ArrayList(listOf(textBtn1))
         uut.applyChildOptions(options, parent, child)
-        val rightCaptor = argumentCaptor<List<ButtonController>>()
-        val leftCaptor = argumentCaptor<List<ButtonController>>()
-        verify(topBarController).applyRightButtons(rightCaptor.capture())
-        verify(topBarController).applyLeftButtons(leftCaptor.capture())
+        val rightCaptor = argumentCaptor<List<ButtonOptions>>()
+        val leftCaptor = argumentCaptor<List<ButtonOptions>>()
+        verify(topBarController).applyRightButtonsOptions(any(),rightCaptor.capture(),any())
+        verify(topBarController).applyLeftButtonsOptions(any(),leftCaptor.capture(),any())
         assertThat(rightCaptor.firstValue.size).isOne()
         assertThat(leftCaptor.firstValue.size).isOne()
     }
@@ -939,7 +945,7 @@ class StackPresenterTest : BaseTest() {
             statusBar.drawBehind = Bool(true)
         }
         Mockito.`when`(child.resolveCurrentOptions()).thenReturn(options)
-        mockStatusBarUtils(statusBarHeight, statusBarHeightDp) {
+        mockSystemUiUtils(statusBarHeight, statusBarHeightDp) {
             uut.applyChildOptions(Options.EMPTY.copy().apply {
                 topBar.height = Number(topBarHeightDp)
             }, parent, child)
@@ -955,7 +961,7 @@ class StackPresenterTest : BaseTest() {
         val statusBarHeightDp = 20
         val topBarHeightDp = 100
 
-        mockStatusBarUtils(statusBarHeight, statusBarHeightDp) {
+        mockSystemUiUtils(statusBarHeight, statusBarHeightDp) {
             uut.mergeChildOptions(Options.EMPTY.copy().apply {
                 topBar.height = Number(topBarHeightDp)
                 statusBar.drawBehind = Bool(true)
@@ -972,7 +978,7 @@ class StackPresenterTest : BaseTest() {
         val statusBarHeightDp = 20
         val topBarHeightDp = 100
 
-        mockStatusBarUtils(statusBarHeight, statusBarHeightDp) {
+        mockSystemUiUtils(statusBarHeight, statusBarHeightDp) {
             uut.mergeChildOptions(Options.EMPTY.copy().apply {
                 topBar.height = Number(topBarHeightDp)
                 statusBar.drawBehind = Bool(false)
@@ -1022,6 +1028,7 @@ class StackPresenterTest : BaseTest() {
         assertThat((topBar.layoutParams as ViewGroup.MarginLayoutParams).topMargin).isEqualTo(10)
     }
 
+    private fun getCurrentChild()=parent.currentChild
     private fun assertTopBarOptions(options: Options, t: Int) {
         if (options.topBar.title.component.hasValue()) {
             verify(topBar, never()).title = any()