react-native-navigation 7.25.4 → 7.26.0-alpha.1

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/topbar/TopBarController.kt

@@ -2,16 +2,13 @@ package com.reactnativenavigation.viewcontrollers.stack.topbar
 
 import android.animation.Animator
 import android.content.Context
-import android.graphics.Color
 import android.view.MenuItem
 import android.view.View
-import androidx.transition.AutoTransition
-import androidx.transition.TransitionManager
 import androidx.viewpager.widget.ViewPager
 import com.reactnativenavigation.options.Alignment
 import com.reactnativenavigation.options.AnimationOptions
-import com.reactnativenavigation.options.ButtonOptions
 import com.reactnativenavigation.options.Options
+import com.reactnativenavigation.utils.CollectionUtils.forEachIndexed
 import com.reactnativenavigation.utils.ViewUtils
 import com.reactnativenavigation.utils.resetViewProperties
 import com.reactnativenavigation.viewcontrollers.stack.topbar.button.ButtonController
@@ -20,13 +17,12 @@ import com.reactnativenavigation.views.stack.StackLayout
 import com.reactnativenavigation.views.stack.topbar.TopBar
 import com.reactnativenavigation.views.stack.topbar.titlebar.ButtonBar
 
-const val DEFAULT_BORDER_COLOR = Color.BLACK
 
 open class TopBarController(private val animator: TopBarAnimator = TopBarAnimator()) {
     lateinit var view: TopBar
     private lateinit var leftButtonBar: ButtonBar
     private lateinit var rightButtonBar: ButtonBar
-    private val buttonsTransition = AutoTransition()
+
 
     val height: Int
         get() = view.height
@@ -58,26 +54,26 @@ open class TopBarController(private val animator: TopBarAnimator = TopBarAnimato
     fun getPushAnimation(appearingOptions: Options, additionalDy: Float = 0f): Animator? {
         if (appearingOptions.topBar.animate.isFalse) return null
         return animator.getPushAnimation(
-            appearingOptions.animations.push.topBar,
-            appearingOptions.topBar.visible,
-            additionalDy
+                appearingOptions.animations.push.topBar,
+                appearingOptions.topBar.visible,
+                additionalDy
         )
     }
 
     fun getPopAnimation(appearingOptions: Options, disappearingOptions: Options): Animator? {
         if (appearingOptions.topBar.animate.isFalse) return null
         return animator.getPopAnimation(
-            disappearingOptions.animations.pop.topBar,
-            appearingOptions.topBar.visible
+                disappearingOptions.animations.pop.topBar,
+                appearingOptions.topBar.visible
         )
     }
 
     fun getSetStackRootAnimation(appearingOptions: Options, additionalDy: Float = 0f): Animator? {
         if (appearingOptions.topBar.animate.isFalse) return null
         return animator.getSetStackRootAnimation(
-            appearingOptions.animations.setStackRoot.topBar,
-            appearingOptions.topBar.visible,
-            additionalDy
+                appearingOptions.animations.setStackRoot.topBar,
+                appearingOptions.topBar.visible,
+                additionalDy
         )
     }
 
@@ -109,184 +105,25 @@ open class TopBarController(private val animator: TopBarAnimator = TopBarAnimato
         view.alignTitleComponent(alignment)
     }
 
-    fun clearRightButtons() {
+    fun applyRightButtons(toAdd: List<ButtonController>) {
         view.clearRightButtons()
+        toAdd.reversed().forEachIndexed { i, b -> b.addToMenu(rightButtonBar, i * 10) }
     }
 
-    fun clearLeftButtons() {
-        view.clearLeftButtons()
+    fun mergeRightButtons(toAdd: List<ButtonController>, toRemove: List<ButtonController>) {
+        toRemove.forEach { view.removeRightButton(it) }
+        toAdd.reversed().forEachIndexed { i, b -> b.addToMenu(rightButtonBar, i * 10) }
     }
 
-    fun clearBackButton() {
+    open fun applyLeftButtons(toAdd: List<ButtonController>) {
         view.clearBackButton()
+        view.clearLeftButtons()
+        forEachIndexed(toAdd) { b: ButtonController, i: Int -> b.addToMenu(leftButtonBar, i * 10) }
     }
 
-    fun setBackButton(backButton: ButtonController?) {
-        backButton?.let { view.setBackButton(it) }
-    }
-
-    fun animateRightButtons(shouldAnimate: Boolean) {
-        view.animateRightButtons(shouldAnimate)
-    }
-
-    fun animateLeftButtons(shouldAnimate: Boolean) {
-        view.animateLeftButtons(shouldAnimate)
-    }
-
-    fun mergeRightButtonsOptions(
-        btnControllers: MutableMap<String, ButtonController>,
-        rightButtons: List<ButtonOptions>,
-        controllerCreator: (ButtonOptions) -> ButtonController
-    ) {
-        mergeButtonOptions(btnControllers, rightButtons.reversed(), controllerCreator, rightButtonBar)
-    }
-
-    fun mergeLeftButtonsOptions(
-        btnControllers: MutableMap<String, ButtonController>,
-        leftButtons: List<ButtonOptions>,
-        controllerCreator: (ButtonOptions) -> ButtonController
-    ) {
-        clearBackButton()
-        mergeButtonOptions(btnControllers, leftButtons, controllerCreator, leftButtonBar)
-    }
-
-    fun applyRightButtonsOptions(
-        btnControllers: MutableMap<String, ButtonController>,
-        rightButtons: List<ButtonOptions>,
-        controllerCreator: (ButtonOptions) -> ButtonController
-    ) {
-        applyButtonsOptions(
-            btnControllers,
-            rightButtons.reversed(),
-            controllerCreator,
-            rightButtonBar
-        )
-    }
-
-    fun applyLeftButtonsOptions(
-        btnControllers: MutableMap<String, ButtonController>,
-        leftButtons: List<ButtonOptions>,
-        controllerCreator: (ButtonOptions) -> ButtonController
-    ) {
-        applyButtonsOptions(btnControllers, leftButtons, controllerCreator, leftButtonBar)
-    }
-
-    private fun applyButtonsOptions(
-        btnControllers: MutableMap<String, ButtonController>,
-        buttons: List<ButtonOptions>,
-        controllerCreator: (ButtonOptions) -> ButtonController,
-        buttonBar: ButtonBar
-    ) {
-        buttonBar.clearButtons()
-        if (buttonBar.shouldAnimate)
-            TransitionManager.beginDelayedTransition(buttonBar, buttonsTransition)
-
-        buttons.forEachIndexed { index, it ->
-            val order = index * 10
-            val newController = if (btnControllers.containsKey(it.id)) {
-                btnControllers.remove(it.id)?.apply {
-                    this.mergeButtonOptions(it,buttonBar)
-                }
-            } else {
-                controllerCreator(it)
-            }!!
-
-            newController.addToMenu(buttonBar, order)
-            btnControllers[it.id] = newController
-        }
-    }
-
-
-    private fun mergeButtonOptions(
-        btnControllers: MutableMap<String, ButtonController>,
-        buttons: List<ButtonOptions>,
-        controllerCreator: (ButtonOptions) -> ButtonController,
-        buttonBar: ButtonBar
-    ) {
-        fun hasChangedOrder(): Boolean {
-            val values = btnControllers.values
-            return buttons.filterIndexed { index, buttonOptions ->
-                val buttonController = btnControllers[buttonOptions.id]
-                values.indexOf(buttonController) == index
-            }.size != buttons.size
-        }
-
-        fun sameIdDifferentCompId(
-            toUpdate: MutableMap<String, Int>,
-            ctrl: Map.Entry<String, ButtonController>,
-            buttons: List<ButtonOptions>
-        ) = if (toUpdate.containsKey(ctrl.key)
-            && ctrl.value.button.hasComponent()
-            && buttons[toUpdate[ctrl.key]!!].component.componentId != ctrl.value.button.component.componentId
-        ) {
-            toUpdate.remove(ctrl.key)
-            true
-        } else false
-
-        val requestedButtons = buttons.mapIndexed { index, buttonOptions -> buttonOptions.id to index }.toMap()
-        var toUpdate = requestedButtons.filter {
-            btnControllers[it.key]?.areButtonOptionsChanged(buttons[it.value]) ?: false
-        }.toMutableMap()
-        var toAdd = requestedButtons.filter { !btnControllers.containsKey(it.key) }
-        var toRemove = btnControllers.filter { ctrl -> !requestedButtons.containsKey(ctrl.key) }
-        val toDestroy = btnControllers.filter { ctrl -> sameIdDifferentCompId(toUpdate, ctrl, buttons) }
-            .toMutableMap().apply { this.putAll(toRemove) }
-
-        fun  needsRebuild(): Boolean {
-           return if (toUpdate.size == buttons.size) {
-                hasChangedOrder()
-            } else toAdd.isNotEmpty() || toRemove.isNotEmpty()
-        }
-
-        if (needsRebuild()) {
-            toUpdate = mutableMapOf()
-            toAdd = requestedButtons
-            toRemove = btnControllers.toMap()
-            if (buttonBar.shouldAnimate)
-                TransitionManager.beginDelayedTransition(buttonBar, buttonsTransition)
-        }
-
-        toUpdate.forEach {
-            val button = buttons[it.value]
-            btnControllers[button.id]?.mergeButtonOptions(button, buttonBar)
-        }
-        toRemove.forEach {
-            buttonBar.removeButton(it.value.buttonIntId)
-        }
-        toDestroy.values.forEach {
-            btnControllers.remove(it.id)
-            it.destroy()
-        }
-        toAdd.forEach {
-            val button = buttons[it.value]
-            val order = it.value * 10
-            val newController = btnControllers[button.id] ?: controllerCreator(button)
-            newController.addToMenu(buttonBar, order)
-            btnControllers[button.id] = newController
-        }
-    }
-
-
-    fun onConfigurationChanged(
-        options: Options,
-        leftBtnControllers: MutableMap<String, ButtonController>?,
-        rightBtnControllers: MutableMap<String, ButtonController>?
-    ) {
-        leftBtnControllers?.values?.forEach {
-            it.onConfigurationChanged(leftButtonBar)
-        }
-        rightBtnControllers?.values?.forEach {
-            it.onConfigurationChanged(rightButtonBar)
-        }
-
-        view.setOverflowButtonColor(options.topBar.rightButtonColor.get(Color.BLACK)!!)
-        view.applyTopTabsColors(
-            options.topTabs.selectedTabColor,
-            options.topTabs.unselectedTabColor
-        )
-        view.setBorderColor(options.topBar.borderColor.get(DEFAULT_BORDER_COLOR)!!)
-        view.setBackgroundColor(options.topBar.background.color.get(Color.WHITE)!!)
-        view.setTitleTextColor(options.topBar.title.color.get(TopBar.DEFAULT_TITLE_COLOR)!!)
-        view.setSubtitleColor(options.topBar.subtitle.color.get(TopBar.DEFAULT_TITLE_COLOR)!!)
+    open fun mergeLeftButtons(toAdd: List<ButtonController>, toRemove: List<ButtonController>) {
+        view.clearBackButton()
+        toRemove.forEach { view.removeLeftButton(it) }
+        forEachIndexed(toAdd) { b: ButtonController, i: Int -> b.addToMenu(leftButtonBar, i * 10) }
     }
 }

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/topbar/button/ButtonController.kt

@@ -4,7 +4,6 @@ import android.annotation.SuppressLint
 import android.app.Activity
 import android.view.Menu
 import android.view.MenuItem
-import android.view.View
 import androidx.appcompat.widget.Toolbar
 import com.reactnativenavigation.options.ButtonOptions
 import com.reactnativenavigation.options.Options
@@ -23,8 +22,7 @@ open class ButtonController(activity: Activity,
                             private val viewCreator: TitleBarButtonCreator,
                             private val onPressListener: OnClickListener) : ViewController<TitleBarReactButtonView>(activity, button.id, YellowBoxDelegate(activity), Options(), ViewControllerOverlay(activity)), MenuItem.OnMenuItemClickListener {
 
-    var menuItem: MenuItem? = null
-    private set
+    private var menuItem: MenuItem? = null
 
     interface OnClickListener {
         fun onPress(button: ButtonOptions)
@@ -73,10 +71,6 @@ open class ButtonController(activity: Activity,
         return if (other.id != id) false else button.equals(other.button)
     }
 
-    fun areButtonOptionsChanged(otherOptions:ButtonOptions):Boolean{
-        return otherOptions.id == id  && !button.equals(otherOptions)
-    }
-
     fun applyNavigationIcon(toolbar: Toolbar) {
         presenter.applyNavigationIcon(toolbar) {
             onPressListener.onPress(it)
@@ -89,34 +83,13 @@ open class ButtonController(activity: Activity,
 
     fun addToMenu(buttonBar: ButtonBar, order: Int) {
         if (button.component.hasValue() && buttonBar.containsButton(menuItem, order)) return
-            buttonBar.menu.removeItem(button.intId)
-            menuItem = buttonBar.addButton(Menu.NONE,
+        buttonBar.menu.removeItem(button.intId)
+        menuItem = buttonBar.addButton(Menu.NONE,
                 button.intId,
                 order,
                 presenter.styledText)?.also { menuItem ->
-                menuItem.setOnMenuItemClickListener(this@ButtonController)
-                presenter.applyOptions(buttonBar, menuItem, this@ButtonController::getView)
-            }
-    }
-
-    fun mergeButtonOptions(optionsToMerge: ButtonOptions,buttonBar: ButtonBar) {
-        button.mergeWith(optionsToMerge)
-        presenter.button = this.button
-        buttonBar.getButtonById(button.intId)?.let {
-                menuItem->
-            presenter.applyOptions(buttonBar,menuItem,this::getView)
+            menuItem.setOnMenuItemClickListener(this@ButtonController)
+            presenter.applyOptions(buttonBar, menuItem, this@ButtonController::getView)
         }
     }
-
-    fun onConfigurationChanged(buttonBar: ButtonBar) {
-        buttonBar.getButtonById(button.intId)?.let {
-                menuItem->
-            presenter.applyOptions(buttonBar,menuItem,this::getView)
-        }
-    }
-
-   fun getNullableView(): View?{
-       return view
-   }
-
 }

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/topbar/button/ButtonPresenter.kt

@@ -25,8 +25,7 @@ import com.reactnativenavigation.utils.ViewUtils
 import com.reactnativenavigation.views.stack.topbar.titlebar.IconBackgroundDrawable
 import kotlin.math.max
 
-open class ButtonPresenter(private val context: Context,var button: ButtonOptions, private val iconResolver:
-IconResolver) {
+open class ButtonPresenter(private val context: Context, private val button: ButtonOptions, private val iconResolver: IconResolver) {
     companion object {
         const val DISABLED_COLOR = Color.LTGRAY
     }
@@ -48,8 +47,6 @@ IconResolver) {
         applyComponent(menuItem, viewCreator)
         applyAccessibilityLabel(menuItem)
         applyIcon(menuItem)
-        applyText(menuItem)
-
 
         applyOptionsDirectlyOnView(toolbar, menuItem) {
             applyTestId(it)
@@ -58,11 +55,6 @@ IconResolver) {
         }
     }
 
-    private fun applyText(menuItem: MenuItem) {
-        if (button.text.hasValue())
-            menuItem.title = styledText
-    }
-
     fun applyColor(toolbar: Toolbar, menuItem: MenuItem, color: ThemeColour) {
         button.color = color
         applyIcon(menuItem)

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/viewcontroller/RootPresenter.java

@@ -11,6 +11,7 @@ import androidx.annotation.VisibleForTesting;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 
 import kotlin.Unit;
+import kotlin.jvm.functions.Function0;
 
 import static com.reactnativenavigation.utils.CoordinatorLayoutUtils.matchParentWithBehaviour;
 

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

@@ -12,13 +12,11 @@ import android.view.ViewTreeObserver;
 
 import androidx.annotation.CallSuper;
 import androidx.annotation.CheckResult;
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 
 import com.reactnativenavigation.options.Options;
-import com.reactnativenavigation.options.OverlayAttachOptions;
 import com.reactnativenavigation.options.params.Bool;
 import com.reactnativenavigation.options.params.NullBool;
 import com.reactnativenavigation.react.CommandListener;
@@ -30,7 +28,6 @@ import com.reactnativenavigation.viewcontrollers.parent.ParentController;
 import com.reactnativenavigation.viewcontrollers.stack.StackController;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.overlay.ViewControllerOverlay;
 import com.reactnativenavigation.views.BehaviourAdapter;
-import com.reactnativenavigation.views.overlay.ViewTooltip;
 import com.reactnativenavigation.views.component.Component;
 import com.reactnativenavigation.views.component.Renderable;
 
@@ -395,15 +392,6 @@ public abstract class ViewController<T extends ViewGroup> implements ViewTreeObs
 
     }
 
-    protected View findTooltipAnchorView(OverlayAttachOptions options) {
-        return null;
-    }
-
-    public ViewTooltip.TooltipView showAnchoredOverlay(@NonNull View anchorView,
-                                                       @NonNull OverlayAttachOptions overlayAttachOptions,
-                                                       @NonNull   ViewController<?> overlayViewController) {
-        return null;
-    }
     public int getBottomInset() {
         return perform(parentController, 0, p -> p.getBottomInset(this));
     }

package/lib/android/app/src/main/java/com/reactnativenavigation/views/bottomtabs/BottomTabs.java

@@ -12,9 +12,7 @@ import com.reactnativenavigation.R;
 import com.reactnativenavigation.options.LayoutDirection;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import androidx.annotation.IntRange;
 
@@ -23,11 +21,10 @@ import static com.reactnativenavigation.utils.ViewUtils.findChildByClass;
 
 @SuppressLint("ViewConstructor")
 public class BottomTabs extends AHBottomNavigation {
-    public final static int TAB_NOT_FOUND = -1;
     private boolean itemsCreationEnabled = true;
     private boolean shouldCreateItems = true;
     private List<Runnable> onItemCreationEnabled = new ArrayList<>();
-    private final Map<String,Integer> idPositionMapping = new HashMap<>();
+
     public BottomTabs(Context context) {
         super(context);
         setId(R.id.bottomTabs);
@@ -135,29 +132,4 @@ public class BottomTabs extends AHBottomNavigation {
     private boolean hasItemsAndIsMeasured(int w, int h, int oldw, int oldh) {
         return w != 0 && h != 0 && (w != oldw || h != oldh) && getItemsCount() > 0;
     }
-
-
-    public void setTagForTabIndex(int index, String tag) {
-        if(tag==null){
-            String oldTag = null;
-            for(Map.Entry<String,Integer>  e: idPositionMapping.entrySet()){
-                if(e.getValue() == index){
-                    oldTag = e.getKey();
-                    break;
-                }
-            }
-            if(oldTag!=null){
-                idPositionMapping.remove(oldTag);
-            }
-        }else{
-            idPositionMapping.put(tag,index);
-        }
-    }
-
-    public int getTabIndexByTag(String tag) {
-        if(tag!=null && idPositionMapping.containsKey(tag)){
-         return idPositionMapping.get(tag);
-        }
-        return TAB_NOT_FOUND;
-    }
 }

package/lib/android/app/src/main/java/com/reactnativenavigation/views/bottomtabs/BottomTabsContainer.kt

@@ -48,7 +48,6 @@ class BottomTabsContainer(context: Context, val bottomTabs: BottomTabs) : Shadow
         this.topOutLineView.visibility = View.GONE
 
         this.addView(linearLayout, LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)
-
     }
 
     override var shadowRadius: Float

package/lib/android/app/src/main/java/com/reactnativenavigation/views/bottomtabs/BottomTabsLayout.java

@@ -10,21 +10,12 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
 import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
 
-import com.reactnativenavigation.views.overlay.AttachedOverlayContainer;
-
 public class BottomTabsLayout extends CoordinatorLayout {
 
     private BottomTabsContainer bottomTabsContainer;
-    final private AttachedOverlayContainer attachedOverlayContainer ;
 
     public BottomTabsLayout(Context context) {
         super(context);
-        attachedOverlayContainer=new AttachedOverlayContainer(context);
-        this.addView(attachedOverlayContainer, LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
-    }
-
-    public AttachedOverlayContainer getAttachedOverlayContainer() {
-        return attachedOverlayContainer;
     }
 
     @Override
@@ -42,4 +33,4 @@ public class BottomTabsLayout extends CoordinatorLayout {
         addView(bottomTabsContainer, lp);
         this.bottomTabsContainer = bottomTabsContainer;
     }
-}
+}

package/lib/android/app/src/main/java/com/reactnativenavigation/views/component/ComponentLayout.java

@@ -4,16 +4,15 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.view.MotionEvent;
 import android.view.ViewGroup;
+import android.view.WindowInsets;
 
 import com.reactnativenavigation.options.ButtonOptions;
-import com.reactnativenavigation.utils.CoordinatorLayoutUtils;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.ScrollEventListener;
 import com.reactnativenavigation.options.Options;
 import com.reactnativenavigation.options.params.Bool;
 import com.reactnativenavigation.react.ReactView;
 import com.reactnativenavigation.react.events.ComponentType;
 import com.reactnativenavigation.viewcontrollers.stack.topbar.button.ButtonController;
-import com.reactnativenavigation.views.overlay.AttachedOverlayContainer;
 import com.reactnativenavigation.views.touch.OverlayTouchDelegate;
 
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
@@ -26,21 +25,14 @@ public class ComponentLayout extends CoordinatorLayout implements ReactComponent
     private boolean willAppearSent = false;
     private ReactView reactView;
     private final OverlayTouchDelegate touchDelegate;
-    final private AttachedOverlayContainer attachedOverlayContainer ;
 
     public ComponentLayout(Context context, ReactView reactView) {
         super(context);
         this.reactView = reactView;
-        attachedOverlayContainer =  new AttachedOverlayContainer(context);
         addView(reactView.asView(), matchParentLP());
-        addView(attachedOverlayContainer, CoordinatorLayoutUtils.matchParentLP());
         touchDelegate = new OverlayTouchDelegate(this, reactView);
     }
 
-    public AttachedOverlayContainer getAttachedOverlayContainer() {
-        return attachedOverlayContainer;
-    }
-
     @Override
     public boolean isReady() {
         return reactView.isReady();
@@ -117,4 +109,4 @@ public class ComponentLayout extends CoordinatorLayout implements ReactComponent
     public boolean superOnInterceptTouchEvent(MotionEvent event) {
         return super.onInterceptTouchEvent(event);
     }
-}
+}

package/lib/android/app/src/main/java/com/reactnativenavigation/views/sidemenu/SideMenuRoot.java

@@ -12,7 +12,6 @@ import com.reactnativenavigation.options.SideMenuOptions;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.ViewController;
 import com.reactnativenavigation.views.BehaviourAdapter;
 import com.reactnativenavigation.views.BehaviourDelegate;
-import com.reactnativenavigation.views.overlay.AttachedOverlayContainer;
 
 import androidx.annotation.RestrictTo;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
@@ -24,16 +23,9 @@ import static com.reactnativenavigation.utils.CoordinatorLayoutUtils.matchParent
 
 public class SideMenuRoot extends CoordinatorLayout {
     private SideMenu sideMenu;
-    final private AttachedOverlayContainer attachedOverlayContainer ;
 
     public SideMenuRoot(Context context) {
         super(context);
-        attachedOverlayContainer =  new AttachedOverlayContainer(context);
-        addView(attachedOverlayContainer,LayoutParams.MATCH_PARENT,LayoutParams.MATCH_PARENT);
-    }
-
-    public AttachedOverlayContainer getAttachedOverlayContainer() {
-        return attachedOverlayContainer;
     }
 
     public void addSideMenu(SideMenu sideMenu, BehaviourAdapter behaviourAdapter) {
@@ -97,4 +89,4 @@ public class SideMenuRoot extends CoordinatorLayout {
     public SideMenu getSideMenu() {
         return sideMenu;
     }
-}
+}

package/lib/android/app/src/main/java/com/reactnativenavigation/views/stack/StackLayout.java

@@ -9,7 +9,6 @@ import com.reactnativenavigation.viewcontrollers.stack.topbar.TopBarController;
 import com.reactnativenavigation.views.component.Component;
 import com.reactnativenavigation.views.component.Renderable;
 import com.reactnativenavigation.views.stack.topbar.ScrollDIsabledBehavior;
-import com.reactnativenavigation.views.overlay.AttachedOverlayContainer;
 
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 
@@ -18,27 +17,18 @@ import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
 @SuppressLint("ViewConstructor")
 public class StackLayout extends CoordinatorLayout implements Component {
     private String stackId;
-    final private AttachedOverlayContainer attachedOverlayContainer ;
 
     public StackLayout(Context context, TopBarController topBarController, String stackId) {
         super(context);
         this.stackId = stackId;
-        attachedOverlayContainer =  new AttachedOverlayContainer(getContext());
         createLayout(topBarController);
     }
 
-    public AttachedOverlayContainer getAttachedOverlayContainer() {
-        return attachedOverlayContainer;
-    }
-
     private void createLayout(TopBarController topBarController) {
         View topBar = topBarController.createView(getContext(), this);
-
         CoordinatorLayout.LayoutParams lp = new LayoutParams(MATCH_PARENT, UiUtils.getTopBarHeight(getContext()));
         lp.setBehavior(new ScrollDIsabledBehavior());
         addView(topBar, lp);
-        addView(attachedOverlayContainer,LayoutParams.MATCH_PARENT,LayoutParams.MATCH_PARENT);
-
     }
 
     public String getStackId() {
@@ -47,8 +37,8 @@ public class StackLayout extends CoordinatorLayout implements Component {
 
     @Override
     public boolean isRendered() {
-        return getChildCount() >= 3 &&
-                getChildAt(2) instanceof Renderable &&
-                ((Renderable) getChildAt(2)).isRendered();
+        return getChildCount() >= 2 &&
+               getChildAt(1) instanceof Renderable &&
+               ((Renderable) getChildAt(1)).isRendered();
     }
-}
+}

package/lib/android/app/src/main/java/com/reactnativenavigation/views/stack/topbar/TopBar.java

@@ -31,6 +31,7 @@ import com.reactnativenavigation.options.params.Number;
 import com.reactnativenavigation.options.params.ThemeColour;
 import com.reactnativenavigation.options.parsers.TypefaceLoader;
 import com.reactnativenavigation.utils.CompatUtils;
+import com.reactnativenavigation.utils.ContextKt;
 import com.reactnativenavigation.utils.UiUtils;
 import com.reactnativenavigation.viewcontrollers.stack.topbar.TopBarCollapseBehavior;
 import com.reactnativenavigation.viewcontrollers.stack.topbar.button.ButtonController;