react-native-screens 3.28.0 → 3.30.0

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

@@ -2,6 +2,7 @@ package com.swmansion.rnscreens
 
 import android.content.Context
 import android.graphics.Canvas
+import android.os.Build
 import android.view.View
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.uimanager.UIManagerHelper
@@ -12,30 +13,33 @@ import kotlin.collections.ArrayList
 import kotlin.collections.HashSet
 
 class ScreenStack(context: Context?) : ScreenContainer(context) {
-    private val mStack = ArrayList<ScreenStackFragmentWrapper>()
-    private val mDismissed: MutableSet<ScreenStackFragmentWrapper> = HashSet()
+    private val stack = ArrayList<ScreenStackFragmentWrapper>()
+    private val dismissedWrappers: MutableSet<ScreenStackFragmentWrapper> = HashSet()
     private val drawingOpPool: MutableList<DrawingOp> = ArrayList()
     private var drawingOps: MutableList<DrawingOp> = ArrayList()
-    private var mTopScreen: ScreenStackFragmentWrapper? = null
-    private var mRemovalTransitionStarted = false
+    private var topScreenWrapper: ScreenStackFragmentWrapper? = null
+    private var removalTransitionStarted = false
     private var isDetachingCurrentScreen = false
     private var reverseLastTwoChildren = false
     private var previousChildrenCount = 0
     var goingForward = false
 
     fun dismiss(screenFragment: ScreenStackFragmentWrapper) {
-        mDismissed.add(screenFragment)
+        dismissedWrappers.add(screenFragment)
         performUpdatesNow()
     }
 
     override val topScreen: Screen?
-        get() = mTopScreen?.screen
+        get() = topScreenWrapper?.screen
+
+    val fragments: ArrayList<ScreenStackFragmentWrapper>
+        get() = stack
 
     val rootScreen: Screen
         get() {
             for (i in 0 until screenCount) {
                 val screenWrapper = getScreenFragmentWrapperAt(i)
-                if (!mDismissed.contains(screenWrapper)) {
+                if (!dismissedWrappers.contains(screenWrapper)) {
                     return screenWrapper.screen
                 }
             }
@@ -46,19 +50,19 @@ class ScreenStack(context: Context?) : ScreenContainer(context) {
 
     override fun startViewTransition(view: View) {
         super.startViewTransition(view)
-        mRemovalTransitionStarted = true
+        removalTransitionStarted = true
     }
 
     override fun endViewTransition(view: View) {
         super.endViewTransition(view)
-        if (mRemovalTransitionStarted) {
-            mRemovalTransitionStarted = false
+        if (removalTransitionStarted) {
+            removalTransitionStarted = false
             dispatchOnFinishTransitioning()
         }
     }
 
     fun onViewAppearTransitionEnd() {
-        if (!mRemovalTransitionStarted) {
+        if (!removalTransitionStarted) {
             dispatchOnFinishTransitioning()
         }
     }
@@ -71,17 +75,17 @@ class ScreenStack(context: Context?) : ScreenContainer(context) {
     }
 
     override fun removeScreenAt(index: Int) {
-        mDismissed.remove(getScreenFragmentWrapperAt(index))
+        dismissedWrappers.remove(getScreenFragmentWrapperAt(index))
         super.removeScreenAt(index)
     }
 
     override fun removeAllScreens() {
-        mDismissed.clear()
+        dismissedWrappers.clear()
         super.removeAllScreens()
     }
 
     override fun hasScreen(screenFragmentWrapper: ScreenFragmentWrapper?): Boolean =
-        super.hasScreen(screenFragmentWrapper) && !mDismissed.contains(screenFragmentWrapper)
+        super.hasScreen(screenFragmentWrapper) && !dismissedWrappers.contains(screenFragmentWrapper)
 
     override fun onUpdate() {
         // When going back from a nested stack with a single screen on it, we may hit an edge case
@@ -90,9 +94,9 @@ class ScreenStack(context: Context?) : ScreenContainer(context) {
         var newTop: ScreenFragmentWrapper? = null // newTop is nullable, see the above comment ^
         var visibleBottom: ScreenFragmentWrapper? = null // this is only set if newTop has TRANSPARENT_MODAL presentation mode
         isDetachingCurrentScreen = false // we reset it so the previous value is not used by mistake
-        for (i in mScreenFragments.indices.reversed()) {
+        for (i in screenWrappers.indices.reversed()) {
             val screen = getScreenFragmentWrapperAt(i)
-            if (!mDismissed.contains(screen)) {
+            if (!dismissedWrappers.contains(screen)) {
                 if (newTop == null) {
                     newTop = screen
                 } else {
@@ -105,29 +109,29 @@ class ScreenStack(context: Context?) : ScreenContainer(context) {
         }
         var shouldUseOpenAnimation = true
         var stackAnimation: StackAnimation? = null
-        if (!mStack.contains(newTop)) {
+        if (!stack.contains(newTop)) {
             // if new top screen wasn't on stack we do "open animation" so long it is not the very first
             // screen on stack
-            if (mTopScreen != null && newTop != null) {
+            if (topScreenWrapper != null && newTop != null) {
                 // there was some other screen attached before
                 // if the previous top screen does not exist anymore and the new top was not on the stack
                 // before, probably replace or reset was called, so we play the "close animation".
                 // Otherwise it's open animation
-                val containsTopScreen = mTopScreen?.let { mScreenFragments.contains(it) } == true
+                val containsTopScreen = topScreenWrapper?.let { screenWrappers.contains(it) } == true
                 val isPushReplace = newTop.screen.replaceAnimation === Screen.ReplaceAnimation.PUSH
                 shouldUseOpenAnimation = containsTopScreen || isPushReplace
                 // if the replace animation is `push`, the new top screen provides the animation, otherwise the previous one
-                stackAnimation = if (shouldUseOpenAnimation) newTop.screen.stackAnimation else mTopScreen?.screen?.stackAnimation
-            } else if (mTopScreen == null && newTop != null) {
+                stackAnimation = if (shouldUseOpenAnimation) newTop.screen.stackAnimation else topScreenWrapper?.screen?.stackAnimation
+            } else if (topScreenWrapper == null && newTop != null) {
                 // mTopScreen was not present before so newTop is the first screen added to a stack
                 // and we don't want the animation when it is entering
                 stackAnimation = StackAnimation.NONE
                 goingForward = true
             }
-        } else if (mTopScreen != null && mTopScreen != newTop) {
+        } else if (topScreenWrapper != null && topScreenWrapper != newTop) {
             // otherwise if we are performing top screen change we do "close animation"
             shouldUseOpenAnimation = false
-            stackAnimation = mTopScreen?.screen?.stackAnimation
+            stackAnimation = topScreenWrapper?.screen?.stackAnimation
         }
 
         createTransaction().let {
@@ -180,19 +184,19 @@ class ScreenStack(context: Context?) : ScreenContainer(context) {
             }
 
             // remove all screens previously on stack
-            for (fragmentWrapper in mStack) {
-                if (!mScreenFragments.contains(fragmentWrapper) || mDismissed.contains(fragmentWrapper)) {
+            for (fragmentWrapper in stack) {
+                if (!screenWrappers.contains(fragmentWrapper) || dismissedWrappers.contains(fragmentWrapper)) {
                     it.remove(fragmentWrapper.fragment)
                 }
             }
-            for (fragmentWrapper in mScreenFragments) {
+            for (fragmentWrapper in screenWrappers) {
                 // Stop detaching screens when reaching visible bottom. All screens above bottom should be
                 // visible.
                 if (fragmentWrapper === visibleBottom) {
                     break
                 }
                 // detach all screens that should not be visible
-                if (fragmentWrapper !== newTop && !mDismissed.contains(fragmentWrapper)) {
+                if (fragmentWrapper !== newTop && !dismissedWrappers.contains(fragmentWrapper)) {
                     it.remove(fragmentWrapper.fragment)
                 }
             }
@@ -201,7 +205,7 @@ class ScreenStack(context: Context?) : ScreenContainer(context) {
             if (visibleBottom != null && !visibleBottom.fragment.isAdded) {
                 val top = newTop
                 var beneathVisibleBottom = true
-                for (fragmentWrapper in mScreenFragments) {
+                for (fragmentWrapper in screenWrappers) {
                     // ignore all screens beneath the visible bottom
                     if (beneathVisibleBottom) {
                         beneathVisibleBottom = if (fragmentWrapper === visibleBottom) {
@@ -214,9 +218,9 @@ class ScreenStack(context: Context?) : ScreenContainer(context) {
             } else if (newTop != null && !newTop.fragment.isAdded) {
                 it.add(id, newTop.fragment)
             }
-            mTopScreen = newTop as? ScreenStackFragmentWrapper
-            mStack.clear()
-            mStack.addAll(mScreenFragments.map { it as ScreenStackFragmentWrapper })
+            topScreenWrapper = newTop as? ScreenStackFragmentWrapper
+            stack.clear()
+            stack.addAll(screenWrappers.map { it as ScreenStackFragmentWrapper })
 
             turnOffA11yUnderTransparentScreen(visibleBottom)
 
@@ -226,10 +230,10 @@ class ScreenStack(context: Context?) : ScreenContainer(context) {
 
     // only top visible screen should be accessible
     private fun turnOffA11yUnderTransparentScreen(visibleBottom: ScreenFragmentWrapper?) {
-        if (mScreenFragments.size > 1 && visibleBottom != null) {
-            mTopScreen?.let {
+        if (screenWrappers.size > 1 && visibleBottom != null) {
+            topScreenWrapper?.let {
                 if (isTransparent(it)) {
-                    val screenFragmentsBeneathTop = mScreenFragments.slice(0 until mScreenFragments.size - 1).asReversed()
+                    val screenFragmentsBeneathTop = screenWrappers.slice(0 until screenWrappers.size - 1).asReversed()
                     // go from the top of the stack excluding the top screen
                     for (fragmentWrapper in screenFragmentsBeneathTop) {
                         fragmentWrapper.screen.changeAccessibilityMode(IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS)
@@ -247,7 +251,7 @@ class ScreenStack(context: Context?) : ScreenContainer(context) {
     }
 
     override fun notifyContainerUpdate() {
-        mStack.forEach { it.onContainerUpdate() }
+        stack.forEach { it.onContainerUpdate() }
     }
 
     // below methods are taken from
@@ -332,8 +336,10 @@ class ScreenStack(context: Context?) : ScreenContainer(context) {
             fragmentWrapper.screen.stackPresentation === Screen.StackPresentation.TRANSPARENT_MODAL
 
         private fun needsDrawReordering(fragmentWrapper: ScreenFragmentWrapper): Boolean =
-            fragmentWrapper.screen.stackAnimation === StackAnimation.SLIDE_FROM_BOTTOM ||
+            // On Android sdk 33 and above the animation is different and requires draw reordering.
+            Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU ||
+                fragmentWrapper.screen.stackAnimation === StackAnimation.SLIDE_FROM_BOTTOM ||
                 fragmentWrapper.screen.stackAnimation === StackAnimation.FADE_FROM_BOTTOM ||
-                  fragmentWrapper.screen.stackAnimation === StackAnimation.IOS
+                fragmentWrapper.screen.stackAnimation === StackAnimation.IOS
     }
 }

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

@@ -22,12 +22,12 @@ import com.google.android.material.appbar.AppBarLayout.ScrollingViewBehavior
 import com.swmansion.rnscreens.utils.DeviceUtils
 
 class ScreenStackFragment : ScreenFragment, ScreenStackFragmentWrapper {
-    private var mAppBarLayout: AppBarLayout? = null
-    private var mToolbar: Toolbar? = null
-    private var mShadowHidden = false
-    private var mIsTranslucent = false
+    private var appBarLayout: AppBarLayout? = null
+    private var toolbar: Toolbar? = null
+    private var isToolbarShadowHidden = false
+    private var isToolbarTranslucent = false
 
-    private var mLastFocusedChild: View? = null
+    private var lastFocusedChild: View? = null
 
     var searchView: CustomSearchView? = null
     var onSearchViewCreate: ((searchView: CustomSearchView) -> Unit)? = null
@@ -42,37 +42,37 @@ class ScreenStackFragment : ScreenFragment, ScreenStackFragmentWrapper {
     }
 
     override fun removeToolbar() {
-        mAppBarLayout?.let {
-            mToolbar?.let { toolbar ->
+        appBarLayout?.let {
+            toolbar?.let { toolbar ->
                 if (toolbar.parent === it) {
                     it.removeView(toolbar)
                 }
             }
         }
-        mToolbar = null
+        toolbar = null
     }
 
     override fun setToolbar(toolbar: Toolbar) {
-        mAppBarLayout?.addView(toolbar)
+        appBarLayout?.addView(toolbar)
         toolbar.layoutParams = AppBarLayout.LayoutParams(
             AppBarLayout.LayoutParams.MATCH_PARENT, AppBarLayout.LayoutParams.WRAP_CONTENT
         ).apply { scrollFlags = 0 }
-        mToolbar = toolbar
+        this.toolbar = toolbar
     }
 
     override fun setToolbarShadowHidden(hidden: Boolean) {
-        if (mShadowHidden != hidden) {
-            mAppBarLayout?.targetElevation = if (hidden) 0f else PixelUtil.toPixelFromDIP(4f)
-            mShadowHidden = hidden
+        if (isToolbarShadowHidden != hidden) {
+            appBarLayout?.targetElevation = if (hidden) 0f else PixelUtil.toPixelFromDIP(4f)
+            isToolbarShadowHidden = hidden
         }
     }
 
     override fun setToolbarTranslucent(translucent: Boolean) {
-        if (mIsTranslucent != translucent) {
+        if (isToolbarTranslucent != translucent) {
             val params = screen.layoutParams
             (params as CoordinatorLayout.LayoutParams).behavior =
                 if (translucent) null else ScrollingViewBehavior()
-            mIsTranslucent = translucent
+            isToolbarTranslucent = translucent
         }
     }
 
@@ -94,7 +94,7 @@ class ScreenStackFragment : ScreenFragment, ScreenStackFragmentWrapper {
     }
 
     override fun onStart() {
-        mLastFocusedChild?.requestFocus()
+        lastFocusedChild?.requestFocus()
         super.onStart()
     }
 
@@ -108,11 +108,11 @@ class ScreenStackFragment : ScreenFragment, ScreenStackFragmentWrapper {
 
         screen.layoutParams = CoordinatorLayout.LayoutParams(
             LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT
-        ).apply { behavior = if (mIsTranslucent) null else ScrollingViewBehavior() }
+        ).apply { behavior = if (isToolbarTranslucent) null else ScrollingViewBehavior() }
 
         view?.addView(recycleView(screen))
 
-        mAppBarLayout = context?.let { AppBarLayout(it) }?.apply {
+        appBarLayout = context?.let { AppBarLayout(it) }?.apply {
             // By default AppBarLayout will have a background color set but since we cover the whole layout
             // with toolbar (that can be semi-transparent) the bar layout background color does not pay a
             // role. On top of that it breaks screens animations when alfa offscreen compositing is off
@@ -123,18 +123,18 @@ class ScreenStackFragment : ScreenFragment, ScreenStackFragmentWrapper {
             )
         }
 
-        view?.addView(mAppBarLayout)
-        if (mShadowHidden) {
-            mAppBarLayout?.targetElevation = 0f
+        view?.addView(appBarLayout)
+        if (isToolbarShadowHidden) {
+            appBarLayout?.targetElevation = 0f
         }
-        mToolbar?.let { mAppBarLayout?.addView(recycleView(it)) }
+        toolbar?.let { appBarLayout?.addView(recycleView(it)) }
         setHasOptionsMenu(true)
         return view
     }
 
     override fun onStop() {
         if (DeviceUtils.isPlatformAndroidTV(context))
-            mLastFocusedChild = findLastFocusedChild()
+            lastFocusedChild = findLastFocusedChild()
 
         super.onStop()
     }

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

@@ -22,28 +22,28 @@ import com.swmansion.rnscreens.events.HeaderAttachedEvent
 import com.swmansion.rnscreens.events.HeaderDetachedEvent
 
 class ScreenStackHeaderConfig(context: Context) : ViewGroup(context) {
-    private val mConfigSubviews = ArrayList<ScreenStackHeaderSubview>(3)
+    private val configSubviews = ArrayList<ScreenStackHeaderSubview>(3)
     val toolbar: CustomToolbar
-    var mIsHidden = false
+    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
-    private var mTitle: String? = null
-    private var mTitleColor = 0
-    private var mTitleFontFamily: String? = null
-    private var mDirection: String? = null
-    private var mTitleFontSize = 0f
-    private var mTitleFontWeight = 0
-    private var mBackgroundColor: Int? = null
-    private var mIsBackButtonHidden = false
-    private var mIsShadowHidden = false
-    private var mDestroyed = false
-    private var mBackButtonInCustomView = false
-    private var mIsTopInsetEnabled = true
-    private var mIsTranslucent = false
-    private var mTintColor = 0
-    private var mIsAttachedToWindow = false
-    private val mDefaultStartInset: Int
-    private val mDefaultStartInsetWithNavigation: Int
-    private val mBackClickListener = OnClickListener {
+    private var title: String? = null
+    private var titleColor = 0
+    private var titleFontFamily: String? = null
+    private var direction: String? = null
+    private var titleFontSize = 0f
+    private var titleFontWeight = 0
+    private var backgroundColor: Int? = null
+    private var isBackButtonHidden = false
+    private var isShadowHidden = false
+    private var isDestroyed = false
+    private var backButtonInCustomView = false
+    private var isTopInsetEnabled = true
+    private var tintColor = 0
+    private var isAttachedToWindow = false
+    private val defaultStartInset: Int
+    private val defaultStartInsetWithNavigation: Int
+    private val backClickListener = OnClickListener {
         screenFragment?.let {
             val stack = screenStack
             if (stack != null && stack.rootScreen == it.screen) {
@@ -70,12 +70,12 @@ class ScreenStackHeaderConfig(context: Context) : ViewGroup(context) {
     }
 
     fun destroy() {
-        mDestroyed = true
+        isDestroyed = true
     }
 
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
-        mIsAttachedToWindow = true
+        isAttachedToWindow = true
         val surfaceId = UIManagerHelper.getSurfaceId(this)
         UIManagerHelper.getEventDispatcherForReactTag(context as ReactContext, id)
             ?.dispatchEvent(HeaderAttachedEvent(surfaceId, id))
@@ -93,7 +93,7 @@ class ScreenStackHeaderConfig(context: Context) : ViewGroup(context) {
 
     override fun onDetachedFromWindow() {
         super.onDetachedFromWindow()
-        mIsAttachedToWindow = false
+        isAttachedToWindow = false
         val surfaceId = UIManagerHelper.getSurfaceId(this)
         UIManagerHelper.getEventDispatcherForReactTag(context as ReactContext, id)
             ?.dispatchEvent(HeaderDetachedEvent(surfaceId, id))
@@ -101,8 +101,10 @@ class ScreenStackHeaderConfig(context: Context) : ViewGroup(context) {
 
     private val screen: Screen?
         get() = parent as? Screen
+
     private val screenStack: ScreenStack?
         get() = screen?.container as? ScreenStack
+
     val screenFragment: ScreenStackFragment?
         get() {
             val screen = parent
@@ -119,15 +121,15 @@ class ScreenStackHeaderConfig(context: Context) : ViewGroup(context) {
         val stack = screenStack
         val isTop = stack == null || stack.topScreen == parent
 
-        if (!mIsAttachedToWindow || !isTop || mDestroyed) {
+        if (!isAttachedToWindow || !isTop || isDestroyed) {
             return
         }
 
         val activity = screenFragment?.activity as AppCompatActivity? ?: return
-        if (mDirection != null) {
-            if (mDirection == "rtl") {
+        if (direction != null) {
+            if (direction == "rtl") {
                 toolbar.layoutDirection = LAYOUT_DIRECTION_RTL
-            } else if (mDirection == "ltr") {
+            } else if (direction == "ltr") {
                 toolbar.layoutDirection = LAYOUT_DIRECTION_LTR
             }
         }
@@ -146,7 +148,7 @@ class ScreenStackHeaderConfig(context: Context) : ViewGroup(context) {
             ScreenWindowTraits.trySetWindowTraits(it, activity, reactContext)
         }
 
-        if (mIsHidden) {
+        if (isHeaderHidden) {
             if (toolbar.parent != null) {
                 screenFragment?.removeToolbar()
             }
@@ -157,7 +159,7 @@ class ScreenStackHeaderConfig(context: Context) : ViewGroup(context) {
             screenFragment?.setToolbar(toolbar)
         }
 
-        if (mIsTopInsetEnabled) {
+        if (isTopInsetEnabled) {
             headerTopInset.let {
                 toolbar.setPadding(0, it ?: 0, 0, 0)
             }
@@ -176,28 +178,28 @@ class ScreenStackHeaderConfig(context: Context) : ViewGroup(context) {
         // 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 = mDefaultStartInsetWithNavigation
-        toolbar.setContentInsetsRelative(mDefaultStartInset, mDefaultStartInset)
+        toolbar.contentInsetStartWithNavigation = defaultStartInsetWithNavigation
+        toolbar.setContentInsetsRelative(defaultStartInset, defaultStartInset)
 
         // hide back button
         actionBar.setDisplayHomeAsUpEnabled(
-            screenFragment?.canNavigateBack() == true && !mIsBackButtonHidden
+            screenFragment?.canNavigateBack() == true && !isBackButtonHidden
         )
 
         // 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
         // menu options handlers, but we prefer the back handling logic to stay here instead.
-        toolbar.setNavigationOnClickListener(mBackClickListener)
+        toolbar.setNavigationOnClickListener(backClickListener)
 
         // shadow
-        screenFragment?.setToolbarShadowHidden(mIsShadowHidden)
+        screenFragment?.setToolbarShadowHidden(isShadowHidden)
 
         // translucent
-        screenFragment?.setToolbarTranslucent(mIsTranslucent)
+        screenFragment?.setToolbarTranslucent(isHeaderTranslucent)
 
         // title
-        actionBar.title = mTitle
-        if (TextUtils.isEmpty(mTitle)) {
+        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.
@@ -205,28 +207,28 @@ class ScreenStackHeaderConfig(context: Context) : ViewGroup(context) {
         }
 
         val titleTextView = titleTextView
-        if (mTitleColor != 0) {
-            toolbar.setTitleTextColor(mTitleColor)
+        if (titleColor != 0) {
+            toolbar.setTitleTextColor(titleColor)
         }
 
         if (titleTextView != null) {
-            if (mTitleFontFamily != null || mTitleFontWeight > 0) {
+            if (titleFontFamily != null || titleFontWeight > 0) {
                 val titleTypeface = ReactTypefaceUtils.applyStyles(
-                    null, 0, mTitleFontWeight, mTitleFontFamily, context.assets
+                    null, 0, titleFontWeight, titleFontFamily, context.assets
                 )
                 titleTextView.typeface = titleTypeface
             }
-            if (mTitleFontSize > 0) {
-                titleTextView.textSize = mTitleFontSize
+            if (titleFontSize > 0) {
+                titleTextView.textSize = titleFontSize
             }
         }
 
         // background
-        mBackgroundColor?.let { toolbar.setBackgroundColor(it) }
+        backgroundColor?.let { toolbar.setBackgroundColor(it) }
 
         // color
-        if (mTintColor != 0) {
-            toolbar.navigationIcon?.setColorFilter(mTintColor, PorterDuff.Mode.SRC_ATOP)
+        if (tintColor != 0) {
+            toolbar.navigationIcon?.setColorFilter(tintColor, PorterDuff.Mode.SRC_ATOP)
         }
 
         // subviews
@@ -237,9 +239,9 @@ class ScreenStackHeaderConfig(context: Context) : ViewGroup(context) {
         }
 
         var i = 0
-        val size = mConfigSubviews.size
+        val size = configSubviews.size
         while (i < size) {
-            val view = mConfigSubviews[i]
+            val view = configSubviews[i]
             val type = view.type
             if (type === ScreenStackHeaderSubview.Type.BACK) {
                 // we special case BACK button header config type as we don't add it as a view into toolbar
@@ -257,7 +259,7 @@ class ScreenStackHeaderConfig(context: Context) : ViewGroup(context) {
                 ScreenStackHeaderSubview.Type.LEFT -> {
                     // when there is a left item we need to disable navigation icon by default
                     // we also hide title as there is no other way to display left side items
-                    if (!mBackButtonInCustomView) {
+                    if (!backButtonInCustomView) {
                         toolbar.navigationIcon = null
                     }
                     toolbar.title = null
@@ -278,28 +280,28 @@ class ScreenStackHeaderConfig(context: Context) : ViewGroup(context) {
     }
 
     private fun maybeUpdate() {
-        if (parent != null && !mDestroyed) {
+        if (parent != null && !isDestroyed) {
             onUpdate()
         }
     }
 
-    fun getConfigSubview(index: Int): ScreenStackHeaderSubview = mConfigSubviews[index]
+    fun getConfigSubview(index: Int): ScreenStackHeaderSubview = configSubviews[index]
 
     val configSubviewsCount: Int
-        get() = mConfigSubviews.size
+        get() = configSubviews.size
 
     fun removeConfigSubview(index: Int) {
-        mConfigSubviews.removeAt(index)
+        configSubviews.removeAt(index)
         maybeUpdate()
     }
 
     fun removeAllConfigSubviews() {
-        mConfigSubviews.clear()
+        configSubviews.clear()
         maybeUpdate()
     }
 
     fun addConfigSubview(child: ScreenStackHeaderSubview, index: Int) {
-        mConfigSubviews.add(index, child)
+        configSubviews.add(index, child)
         maybeUpdate()
     }
 
@@ -317,59 +319,59 @@ class ScreenStackHeaderConfig(context: Context) : ViewGroup(context) {
         }
 
     fun setTitle(title: String?) {
-        mTitle = title
+        this.title = title
     }
 
     fun setTitleFontFamily(titleFontFamily: String?) {
-        mTitleFontFamily = titleFontFamily
+        this.titleFontFamily = titleFontFamily
     }
 
     fun setTitleFontWeight(fontWeightString: String?) {
-        mTitleFontWeight = ReactTypefaceUtils.parseFontWeight(fontWeightString)
+        titleFontWeight = ReactTypefaceUtils.parseFontWeight(fontWeightString)
     }
 
     fun setTitleFontSize(titleFontSize: Float) {
-        mTitleFontSize = titleFontSize
+        this.titleFontSize = titleFontSize
     }
 
     fun setTitleColor(color: Int) {
-        mTitleColor = color
+        titleColor = color
     }
 
     fun setTintColor(color: Int) {
-        mTintColor = color
+        tintColor = color
     }
 
     fun setTopInsetEnabled(topInsetEnabled: Boolean) {
-        mIsTopInsetEnabled = topInsetEnabled
+        isTopInsetEnabled = topInsetEnabled
     }
 
     fun setBackgroundColor(color: Int?) {
-        mBackgroundColor = color
+        backgroundColor = color
     }
 
     fun setHideShadow(hideShadow: Boolean) {
-        mIsShadowHidden = hideShadow
+        isShadowHidden = hideShadow
     }
 
     fun setHideBackButton(hideBackButton: Boolean) {
-        mIsBackButtonHidden = hideBackButton
+        isBackButtonHidden = hideBackButton
     }
 
     fun setHidden(hidden: Boolean) {
-        mIsHidden = hidden
+        isHeaderHidden = hidden
     }
 
     fun setTranslucent(translucent: Boolean) {
-        mIsTranslucent = translucent
+        isHeaderTranslucent = translucent
     }
 
     fun setBackButtonInCustomView(backButtonInCustomView: Boolean) {
-        mBackButtonInCustomView = backButtonInCustomView
+        this.backButtonInCustomView = backButtonInCustomView
     }
 
     fun setDirection(direction: String?) {
-        mDirection = direction
+        this.direction = direction
     }
 
     private class DebugMenuToolbar(context: Context, config: ScreenStackHeaderConfig) : CustomToolbar(context, config) {
@@ -385,8 +387,8 @@ class ScreenStackHeaderConfig(context: Context) : ViewGroup(context) {
     init {
         visibility = GONE
         toolbar = if (BuildConfig.DEBUG) DebugMenuToolbar(context, this) else CustomToolbar(context, this)
-        mDefaultStartInset = toolbar.contentInsetStart
-        mDefaultStartInsetWithNavigation = toolbar.contentInsetStartWithNavigation
+        defaultStartInset = toolbar.contentInsetStart
+        defaultStartInsetWithNavigation = toolbar.contentInsetStartWithNavigation
 
         // set primary color as background by default
         val tv = TypedValue()