react-native-screens 4.10.0-beta.2 → 4.10.0

package/android/src/main/java/com/swmansion/rnscreens/ScreenStackFragment.kt

@@ -7,7 +7,6 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
-import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.Menu
@@ -16,33 +15,23 @@ import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import android.view.WindowInsets
-import android.view.WindowManager
 import android.view.animation.Animation
 import android.view.animation.AnimationSet
 import android.view.animation.Transformation
-import android.view.inputmethod.InputMethodManager
 import android.widget.LinearLayout
-import androidx.annotation.RequiresApi
 import androidx.appcompat.widget.Toolbar
 import androidx.coordinatorlayout.widget.CoordinatorLayout
-import androidx.core.view.WindowInsetsCompat
 import com.facebook.react.uimanager.PixelUtil
 import com.facebook.react.uimanager.ReactPointerEventsView
 import com.facebook.react.uimanager.UIManagerHelper
 import com.google.android.material.appbar.AppBarLayout
 import com.google.android.material.appbar.AppBarLayout.ScrollingViewBehavior
 import com.google.android.material.bottomsheet.BottomSheetBehavior
-import com.google.android.material.bottomsheet.BottomSheetBehavior.BottomSheetCallback
 import com.google.android.material.shape.CornerFamily
 import com.google.android.material.shape.MaterialShapeDrawable
 import com.google.android.material.shape.ShapeAppearanceModel
 import com.swmansion.rnscreens.bottomsheet.DimmingViewManager
 import com.swmansion.rnscreens.bottomsheet.SheetDelegate
-import com.swmansion.rnscreens.bottomsheet.SheetUtils
-import com.swmansion.rnscreens.bottomsheet.isSheetFitToContents
-import com.swmansion.rnscreens.bottomsheet.useSingleDetent
-import com.swmansion.rnscreens.bottomsheet.useThreeDetents
-import com.swmansion.rnscreens.bottomsheet.useTwoDetents
 import com.swmansion.rnscreens.bottomsheet.usesFormSheetPresentation
 import com.swmansion.rnscreens.events.ScreenAnimationDelegate
 import com.swmansion.rnscreens.events.ScreenDismissedEvent
@@ -65,7 +54,6 @@ class KeyboardVisible(
 class ScreenStackFragment :
     ScreenFragment,
     ScreenStackFragmentWrapper {
-    public var nativeDismissalObserver: NativeDismissalObserver? = null
     private var appBarLayout: AppBarLayout? = null
     private var toolbar: Toolbar? = null
     private var isToolbarShadowHidden = false
@@ -159,51 +147,6 @@ class ScreenStackFragment :
         }
     }
 
-    // If the Screen has `formSheet` presentation this callback is attached to its behavior.
-    // It is responsible for firing detent changed events & removing the sheet from the container
-    // once it is hidden by user gesture.
-    private val bottomSheetStateCallback =
-        object : BottomSheetCallback() {
-            private var lastStableState: Int =
-                SheetUtils.sheetStateFromDetentIndex(
-                    screen.sheetInitialDetentIndex,
-                    screen.sheetDetents.count(),
-                )
-
-            override fun onStateChanged(
-                bottomSheet: View,
-                newState: Int,
-            ) {
-                if (SheetUtils.isStateStable(newState)) {
-                    lastStableState = newState
-                    screen.notifySheetDetentChange(
-                        SheetUtils.detentIndexFromSheetState(
-                            lastStableState,
-                            screen.sheetDetents.count(),
-                        ),
-                        true,
-                    )
-                } else if (newState == BottomSheetBehavior.STATE_DRAGGING) {
-                    screen.notifySheetDetentChange(
-                        SheetUtils.detentIndexFromSheetState(
-                            lastStableState,
-                            screen.sheetDetents.count(),
-                        ),
-                        false,
-                    )
-                }
-
-                if (newState == BottomSheetBehavior.STATE_HIDDEN) {
-                    dismissSelf()
-                }
-            }
-
-            override fun onSlide(
-                bottomSheet: View,
-                slideOffset: Float,
-            ) = Unit
-        }
-
     /**
      * Currently this method dispatches event to JS where state is recomputed and fragment
      * gets removed in the result of incoming state update.
@@ -241,7 +184,7 @@ class ScreenStackFragment :
                 ).apply {
                     behavior =
                         if (screen.usesFormSheetPresentation()) {
-                            createAndConfigureBottomSheetBehaviour()
+                            createBottomSheetBehaviour()
                         } else if (isToolbarTranslucent) {
                             null
                         } else {
@@ -249,13 +192,8 @@ class ScreenStackFragment :
                         }
                 }
 
-        if (screen.usesFormSheetPresentation()) {
-            screen.clipToOutline = true
-            // TODO(@kkafar): without this line there is no drawable / outline & nothing shows...? Determine what's going on here
-            attachShapeToScreen(screen)
-            screen.elevation = screen.sheetElevation
-        }
-
+        // This must be called before further sheet configuration.
+        // Otherwise there is no enter animation -> dunno why, just observed it.
         coordinatorLayout.addView(screen.recycle())
 
         if (!screen.usesFormSheetPresentation()) {
@@ -279,7 +217,28 @@ class ScreenStackFragment :
             }
             toolbar?.let { appBarLayout?.addView(it.recycle()) }
             setHasOptionsMenu(true)
+        } else {
+            screen.clipToOutline = true
+            // TODO(@kkafar): without this line there is no drawable / outline & nothing shows...? Determine what's going on here
+            attachShapeToScreen(screen)
+            screen.elevation = screen.sheetElevation
+
+            // Lifecycle of sheet delegate is tied to fragment.
+            val sheetDelegate = requireSheetDelegate()
+            sheetDelegate.configureBottomSheetBehaviour(screen.sheetBehavior!!)
+
+            val dimmingDelegate = requireDimmingDelegate(forceCreation = true)
+            dimmingDelegate.onViewHierarchyCreated(screen, coordinatorLayout)
+            dimmingDelegate.onBehaviourAttached(screen, screen.sheetBehavior!!)
+
+            val container = screen.container!!
+            coordinatorLayout.measure(
+                View.MeasureSpec.makeMeasureSpec(container.width, View.MeasureSpec.EXACTLY),
+                View.MeasureSpec.makeMeasureSpec(container.height, View.MeasureSpec.EXACTLY),
+            )
+            coordinatorLayout.layout(0, 0, container.width, container.height)
         }
+
         return coordinatorLayout
     }
 
@@ -288,24 +247,6 @@ class ScreenStackFragment :
         savedInstanceState: Bundle?,
     ) {
         super.onViewCreated(view, savedInstanceState)
-
-        if (!screen.usesFormSheetPresentation()) {
-            return
-        }
-
-        sheetDelegate = SheetDelegate(screen)
-
-        assert(view == coordinatorLayout)
-        val dimmingDelegate = requireDimmingDelegate(forceCreation = true)
-        dimmingDelegate.onViewHierarchyCreated(screen, coordinatorLayout)
-        dimmingDelegate.onBehaviourAttached(screen, screen.sheetBehavior!!)
-
-        val container = screen.container!!
-        coordinatorLayout.measure(
-            View.MeasureSpec.makeMeasureSpec(container.width, View.MeasureSpec.EXACTLY),
-            View.MeasureSpec.makeMeasureSpec(container.height, View.MeasureSpec.EXACTLY),
-        )
-        coordinatorLayout.layout(0, 0, container.width, container.height)
     }
 
     override fun onCreateAnimation(
@@ -387,210 +328,8 @@ class ScreenStackFragment :
         return animatorSet
     }
 
-    /**
-     * This method might return slightly different values depending on code path,
-     * but during testing I've found this effect negligible. For practical purposes
-     * this is acceptable.
-     */
-    private fun tryResolveContainerHeight(): Int? {
-        if (screen.container != null) {
-            return screenStack.height
-        }
-
-        context
-            ?.resources
-            ?.displayMetrics
-            ?.heightPixels
-            ?.let { return it }
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            (context?.getSystemService(Context.WINDOW_SERVICE) as? WindowManager)
-                ?.currentWindowMetrics
-                ?.bounds
-                ?.height()
-                ?.let { return it }
-        }
-        return null
-    }
-
-    private val keyboardSheetCallback =
-        object : BottomSheetCallback() {
-            @RequiresApi(Build.VERSION_CODES.M)
-            override fun onStateChanged(
-                bottomSheet: View,
-                newState: Int,
-            ) {
-                if (newState == BottomSheetBehavior.STATE_COLLAPSED) {
-                    val isImeVisible =
-                        WindowInsetsCompat
-                            .toWindowInsetsCompat(bottomSheet.rootWindowInsets)
-                            .isVisible(WindowInsetsCompat.Type.ime())
-                    if (isImeVisible) {
-                        // Does it not interfere with React Native focus mechanism? In any case I'm not aware
-                        // of different way of hiding the keyboard.
-                        // https://stackoverflow.com/questions/1109022/how-can-i-close-hide-the-android-soft-keyboard-programmatically
-                        // https://developer.android.com/develop/ui/views/touch-and-input/keyboard-input/visibility
-
-                        // I want to be polite here and request focus before dismissing the keyboard,
-                        // however even if it fails I want to try to hide the keyboard. This sometimes works...
-                        bottomSheet.requestFocus()
-                        val imm = requireContext().getSystemService(InputMethodManager::class.java)
-                        imm.hideSoftInputFromWindow(bottomSheet.windowToken, 0)
-                    }
-                }
-            }
-
-            override fun onSlide(
-                bottomSheet: View,
-                slideOffset: Float,
-            ) = Unit
-        }
-
-    internal fun configureBottomSheetBehaviour(
-        behavior: BottomSheetBehavior<Screen>,
-        keyboardState: KeyboardState = KeyboardNotVisible,
-    ): BottomSheetBehavior<Screen> {
-        val containerHeight = tryResolveContainerHeight()
-        check(containerHeight != null) {
-            "[RNScreens] Failed to find window height during bottom sheet behaviour configuration"
-        }
-
-        behavior.apply {
-            isHideable = true
-            isDraggable = true
-
-            // It seems that there is a guard in material implementation that will prevent
-            // this callback from being registered multiple times.
-            addBottomSheetCallback(bottomSheetStateCallback)
-        }
-
-        screen.footer?.registerWithSheetBehavior(behavior)
-
-        return when (keyboardState) {
-            is KeyboardNotVisible -> {
-                when (screen.sheetDetents.count()) {
-                    1 ->
-                        behavior.apply {
-                            val height =
-                                if (screen.isSheetFitToContents()) {
-                                    screen.contentWrapper
-                                        .get()
-                                        ?.height
-                                        .takeIf { screen.contentWrapper.get()?.isLaidOut == true }
-                                } else {
-                                    (screen.sheetDetents.first() * containerHeight).toInt()
-                                }
-                            useSingleDetent(height = height)
-                        }
-
-                    2 ->
-                        behavior.useTwoDetents(
-                            state =
-                                SheetUtils.sheetStateFromDetentIndex(
-                                    screen.sheetInitialDetentIndex,
-                                    screen.sheetDetents.count(),
-                                ),
-                            firstHeight = (screen.sheetDetents[0] * containerHeight).toInt(),
-                            secondHeight = (screen.sheetDetents[1] * containerHeight).toInt(),
-                        )
-
-                    3 ->
-                        behavior.useThreeDetents(
-                            state =
-                                SheetUtils.sheetStateFromDetentIndex(
-                                    screen.sheetInitialDetentIndex,
-                                    screen.sheetDetents.count(),
-                                ),
-                            firstHeight = (screen.sheetDetents[0] * containerHeight).toInt(),
-                            halfExpandedRatio = (screen.sheetDetents[1] / screen.sheetDetents[2]).toFloat(),
-                            expandedOffsetFromTop = ((1 - screen.sheetDetents[2]) * containerHeight).toInt(),
-                        )
-
-                    else -> throw IllegalStateException(
-                        "[RNScreens] Invalid detent count ${screen.sheetDetents.count()}. Expected at most 3.",
-                    )
-                }
-            }
-
-            is KeyboardVisible -> {
-                val newMaxHeight =
-                    if (behavior.maxHeight - keyboardState.height > 1) {
-                        behavior.maxHeight - keyboardState.height
-                    } else {
-                        behavior.maxHeight
-                    }
-                when (screen.sheetDetents.count()) {
-                    1 ->
-                        behavior.apply {
-                            useSingleDetent(height = newMaxHeight)
-                            addBottomSheetCallback(keyboardSheetCallback)
-                        }
-
-                    2 ->
-                        behavior.apply {
-                            useTwoDetents(
-                                state = BottomSheetBehavior.STATE_EXPANDED,
-                                secondHeight = newMaxHeight,
-                            )
-                            addBottomSheetCallback(keyboardSheetCallback)
-                        }
-
-                    3 ->
-                        behavior.apply {
-                            useThreeDetents(
-                                state = BottomSheetBehavior.STATE_EXPANDED,
-                            )
-                            maxHeight = newMaxHeight
-                            addBottomSheetCallback(keyboardSheetCallback)
-                        }
-
-                    else -> throw IllegalStateException(
-                        "[RNScreens] Invalid detent count ${screen.sheetDetents.count()}. Expected at most 3.",
-                    )
-                }
-            }
-
-            is KeyboardDidHide -> {
-                // Here we assume that the keyboard was either closed explicitly by user,
-                // or the user dragged the sheet down. In any case the state should
-                // stay unchanged.
-
-                behavior.removeBottomSheetCallback(keyboardSheetCallback)
-                when (screen.sheetDetents.count()) {
-                    1 ->
-                        behavior.useSingleDetent(
-                            height = (screen.sheetDetents.first() * containerHeight).toInt(),
-                            forceExpandedState = false,
-                        )
-
-                    2 ->
-                        behavior.useTwoDetents(
-                            firstHeight = (screen.sheetDetents[0] * containerHeight).toInt(),
-                            secondHeight = (screen.sheetDetents[1] * containerHeight).toInt(),
-                        )
-
-                    3 ->
-                        behavior.useThreeDetents(
-                            firstHeight = (screen.sheetDetents[0] * containerHeight).toInt(),
-                            halfExpandedRatio = (screen.sheetDetents[1] / screen.sheetDetents[2]).toFloat(),
-                            expandedOffsetFromTop = ((1 - screen.sheetDetents[2]) * containerHeight).toInt(),
-                        )
-
-                    else -> throw IllegalStateException(
-                        "[RNScreens] Invalid detent count ${screen.sheetDetents.count()}. Expected at most 3.",
-                    )
-                }
-            }
-        }
-    }
-
     private fun createBottomSheetBehaviour(): BottomSheetBehavior<Screen> = BottomSheetBehavior<Screen>()
 
-    // In general it would be great to create BottomSheetBehaviour only via this method as it runs some
-    // side effects.
-    private fun createAndConfigureBottomSheetBehaviour(): BottomSheetBehavior<Screen> =
-        configureBottomSheetBehaviour(createBottomSheetBehaviour())
-
     private fun resolveBackgroundColor(screen: Screen): Int? {
         val screenColor =
             (screen.background as? ColorDrawable?)?.color
@@ -724,6 +463,13 @@ class ScreenStackFragment :
         return dimmingDelegate!!
     }
 
+    private fun requireSheetDelegate(): SheetDelegate {
+        if (sheetDelegate == null) {
+            sheetDelegate = SheetDelegate(screen)
+        }
+        return sheetDelegate!!
+    }
+
     private class ScreensCoordinatorLayout(
         context: Context,
         private val fragment: ScreenStackFragment,
@@ -734,7 +480,7 @@ class ScreenStackFragment :
         constructor(context: Context, fragment: ScreenStackFragment) : this(
             context,
             fragment,
-            ScreensCoordinatorLayoutPointerEventsImpl(),
+            PointerEventsBoxNoneImpl(),
         )
 
         override fun onApplyWindowInsets(insets: WindowInsets?): WindowInsets = super.onApplyWindowInsets(insets)
@@ -797,6 +543,20 @@ class ScreenStackFragment :
             }
         }
 
+        override fun onLayout(
+            changed: Boolean,
+            l: Int,
+            t: Int,
+            r: Int,
+            b: Int,
+        ) {
+            super.onLayout(changed, l, t, r, b)
+
+            if (fragment.screen.usesFormSheetPresentation()) {
+                fragment.screen.onBottomSheetBehaviorDidLayout(changed)
+            }
+        }
+
 //        override fun reactTagForTouch(touchX: Float, touchY: Float): Int {
 //            throw IllegalStateException("Screen wrapper should never be asked for the view tag")
 //        }

package/android/src/main/java/com/swmansion/rnscreens/ScreenStackHeaderConfig.kt

@@ -3,12 +3,10 @@ package com.swmansion.rnscreens
 import android.content.Context
 import android.graphics.PorterDuff
 import android.graphics.PorterDuffColorFilter
-import android.os.Build
 import android.text.TextUtils
 import android.util.TypedValue
 import android.view.Gravity
 import android.view.View.OnClickListener
-import android.view.WindowInsets
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
@@ -17,19 +15,25 @@ import androidx.fragment.app.Fragment
 import com.facebook.react.ReactApplication
 import com.facebook.react.bridge.JSApplicationIllegalArgumentException
 import com.facebook.react.bridge.ReactContext
+import com.facebook.react.uimanager.ReactPointerEventsView
 import com.facebook.react.uimanager.UIManagerHelper
 import com.facebook.react.views.text.ReactTypefaceUtils
 import com.swmansion.rnscreens.events.HeaderAttachedEvent
 import com.swmansion.rnscreens.events.HeaderDetachedEvent
+import kotlin.math.max
 
 class ScreenStackHeaderConfig(
     context: Context,
-) : FabricEnabledHeaderConfigViewGroup(context) {
+    private val pointerEventsImpl: ReactPointerEventsView
+) : FabricEnabledHeaderConfigViewGroup(context), ReactPointerEventsView by pointerEventsImpl {
+
+    constructor(context: Context): this(context, pointerEventsImpl = PointerEventsBoxNoneImpl())
+
     private val configSubviews = ArrayList<ScreenStackHeaderSubview>(3)
     val toolbar: CustomToolbar
     var isHeaderHidden = false // named this way to avoid conflict with platform's isHidden
-    var isHeaderTranslucent = false // named this way to avoid conflict with platform's isTranslucent
-    private var headerTopInset: Int? = null
+    var isHeaderTranslucent =
+        false // named this way to avoid conflict with platform's isTranslucent
     private var title: String? = null
     private var titleColor = 0
     private var titleFontFamily: String? = null
@@ -41,7 +45,9 @@ class ScreenStackHeaderConfig(
     private var isShadowHidden = false
     private var isDestroyed = false
     private var backButtonInCustomView = false
-    private var isTopInsetEnabled = true
+    var isTopInsetEnabled = true
+        private set
+
     private var tintColor = 0
     private var isAttachedToWindow = false
     private val defaultStartInset: Int
@@ -69,19 +75,76 @@ class ScreenStackHeaderConfig(
             }
         }
 
+    var isTitleEmpty: Boolean = false
+
+    val preferredContentInsetStart
+        get() = defaultStartInset
+
+    val preferredContentInsetEnd
+        get() = defaultStartInset
+
+    val preferredContentInsetStartWithNavigation
+        get() =
+            // Reset toolbar insets. By default we set symmetric inset for start and end to match iOS
+            // implementation where both right and left icons are offset from the edge by default. We also
+            // reset startWithNavigation inset which corresponds to the distance between navigation icon and
+            // title. If title isn't set we clear that value few lines below to give more space to custom
+            // center-mounted views.
+            if (isTitleEmpty) {
+                0
+            } else {
+                defaultStartInsetWithNavigation
+            }
+
+    fun destroy() {
+        isDestroyed = true
+    }
+
+    /**
+     * Native toolbar should notify the header config component that it has completed its layout.
+     */
+    fun onNativeToolbarLayout(
+        toolbar: Toolbar,
+        shouldUpdateShadowStateHint: Boolean,
+    ) {
+        if (!shouldUpdateShadowStateHint) {
+            return
+        }
+
+        val isBackButtonDisplayed = toolbar.navigationIcon != null
+
+        val contentInsetStartEstimation =
+            if (isBackButtonDisplayed) {
+                toolbar.currentContentInsetStart + toolbar.paddingStart
+            } else {
+                max(toolbar.currentContentInsetStart, toolbar.paddingStart)
+            }
+
+        // Assuming that there is nothing to the left of back button here, the content
+        // offset we're interested in in ShadowTree is the `left` of the subview left.
+        // In case it is not available we fallback to approximation.
+        val contentInsetStart =
+            configSubviews.firstOrNull { it.type === ScreenStackHeaderSubview.Type.LEFT }?.left
+                ?: contentInsetStartEstimation
+
+        val contentInsetEnd = toolbar.currentContentInsetEnd + toolbar.paddingEnd
+
+        // Note that implementation of the callee differs between architectures.
+        updateHeaderConfigState(
+            toolbar.width,
+            toolbar.height,
+            contentInsetStart,
+            contentInsetEnd,
+        )
+    }
+
     override fun onLayout(
         changed: Boolean,
         l: Int,
         t: Int,
         r: Int,
         b: Int,
-    ) {
-        // no-op
-    }
-
-    fun destroy() {
-        isDestroyed = true
-    }
+    ) = Unit
 
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
@@ -90,19 +153,6 @@ class ScreenStackHeaderConfig(
         UIManagerHelper
             .getEventDispatcherForReactTag(context as ReactContext, id)
             ?.dispatchEvent(HeaderAttachedEvent(surfaceId, id))
-        // we want to save the top inset before the status bar can be hidden, which would resolve in
-        // inset being 0
-        if (headerTopInset == null) {
-            headerTopInset =
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                    rootWindowInsets.getInsets(WindowInsets.Type.systemBars()).top
-                } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                    rootWindowInsets.systemWindowInsetTop
-                } else {
-                    // Hacky fallback for old android. Before Marshmallow, the status bar height was always 25
-                    (25 * resources.displayMetrics.density).toInt()
-                }
-        }
         onUpdate()
     }
 
@@ -176,32 +226,27 @@ class ScreenStackHeaderConfig(
             screenFragment?.setToolbar(toolbar)
         }
 
-        if (isTopInsetEnabled) {
-            headerTopInset.let {
-                toolbar.setPadding(0, it ?: 0, 0, 0)
-            }
-        } else {
-            if (toolbar.paddingTop > 0) {
-                toolbar.setPadding(0, 0, 0, 0)
-            }
-        }
-
         activity.setSupportActionBar(toolbar)
         // non-null toolbar is set in the line above and it is used here
         val actionBar = requireNotNull(activity.supportActionBar)
 
+        // hide back button
+        actionBar.setDisplayHomeAsUpEnabled(
+            screenFragment?.canNavigateBack() == true && !isBackButtonHidden,
+        )
+
+        // title
+        actionBar.title = title
+        if (TextUtils.isEmpty(title)) {
+            isTitleEmpty = true
+        }
+
         // Reset toolbar insets. By default we set symmetric inset for start and end to match iOS
         // implementation where both right and left icons are offset from the edge by default. We also
         // reset startWithNavigation inset which corresponds to the distance between navigation icon and
         // title. If title isn't set we clear that value few lines below to give more space to custom
         // center-mounted views.
-        toolbar.contentInsetStartWithNavigation = defaultStartInsetWithNavigation
-        toolbar.setContentInsetsRelative(defaultStartInset, defaultStartInset)
-
-        // hide back button
-        actionBar.setDisplayHomeAsUpEnabled(
-            screenFragment?.canNavigateBack() == true && !isBackButtonHidden,
-        )
+        toolbar.updateContentInsets()
 
         // when setSupportActionBar is called a toolbar wrapper gets initialized that overwrites
         // navigation click listener. The default behavior set in the wrapper is to call into
@@ -214,15 +259,6 @@ class ScreenStackHeaderConfig(
         // translucent
         screenFragment?.setToolbarTranslucent(isHeaderTranslucent)
 
-        // title
-        actionBar.title = title
-        if (TextUtils.isEmpty(title)) {
-            // if title is empty we set start  navigation inset to 0 to give more space to custom rendered
-            // views. When it is set to default it'd take up additional distance from the back button
-            // which would impact the position of custom header views rendered at the center.
-            toolbar.contentInsetStartWithNavigation = 0
-        }
-
         val titleTextView = findTitleTextViewInToolbar(toolbar)
         if (titleColor != 0) {
             toolbar.setTitleTextColor(titleColor)
@@ -250,7 +286,8 @@ class ScreenStackHeaderConfig(
 
         // color
         if (tintColor != 0) {
-            toolbar.navigationIcon?.colorFilter = PorterDuffColorFilter(tintColor, PorterDuff.Mode.SRC_ATOP)
+            toolbar.navigationIcon?.colorFilter =
+                PorterDuffColorFilter(tintColor, PorterDuff.Mode.SRC_ATOP)
         }
 
         // subviews
@@ -288,12 +325,14 @@ class ScreenStackHeaderConfig(
                     toolbar.title = null
                     params.gravity = Gravity.START
                 }
+
                 ScreenStackHeaderSubview.Type.RIGHT -> params.gravity = Gravity.END
                 ScreenStackHeaderSubview.Type.CENTER -> {
                     params.width = LayoutParams.MATCH_PARENT
                     params.gravity = Gravity.CENTER_HORIZONTAL
                     toolbar.title = null
                 }
+
                 else -> {}
             }
             view.layoutParams = params
@@ -402,7 +441,8 @@ class ScreenStackHeaderConfig(
 
     init {
         visibility = GONE
-        toolbar = if (BuildConfig.DEBUG) DebugMenuToolbar(context, this) else CustomToolbar(context, this)
+        toolbar =
+            if (BuildConfig.DEBUG) DebugMenuToolbar(context, this) else CustomToolbar(context, this)
         defaultStartInset = toolbar.contentInsetStart
         defaultStartInsetWithNavigation = toolbar.contentInsetStartWithNavigation