@amazon-devices/react-native-screens 2.0.9000000000 → 3.0.9000000000-rn-83

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

@@ -2,12 +2,13 @@ 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.ViewGroup
+import android.view.WindowInsets
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
@@ -21,88 +22,105 @@ import com.facebook.react.views.text.ReactTypefaceUtils
 import com.swmansion.rnscreens.events.HeaderAttachedEvent
 import com.swmansion.rnscreens.events.HeaderDetachedEvent
 
-class ScreenStackHeaderConfig(context: Context) : ViewGroup(context) {
-    private val mConfigSubviews = ArrayList<ScreenStackHeaderSubview>(3)
+class ScreenStackHeaderConfig(
+    context: Context,
+) : FabricEnabledHeaderConfigViewGroup(context) {
+    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
-    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 mIsHidden = false
-    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 {
-        screenFragment?.let {
-            val stack = screenStack
-            if (stack != null && stack.rootScreen == it.screen) {
-                val parentFragment = it.parentFragment
-                if (parentFragment is ScreenStackFragment) {
-                    if (parentFragment.screen.nativeBackButtonDismissalEnabled) {
-                        parentFragment.dismiss()
-                    } else {
-                        parentFragment.dispatchHeaderBackButtonClickedEvent()
+    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) {
+                    val parentFragment = it.parentFragment
+                    if (parentFragment is ScreenStackFragment) {
+                        if (parentFragment.screen.nativeBackButtonDismissalEnabled) {
+                            parentFragment.dismissFromContainer()
+                        } else {
+                            parentFragment.dispatchHeaderBackButtonClickedEvent()
+                        }
                     }
-                }
-            } else {
-                if (it.screen.nativeBackButtonDismissalEnabled) {
-                    it.dismiss()
                 } else {
-                    it.dispatchHeaderBackButtonClickedEvent()
+                    if (it.screen.nativeBackButtonDismissalEnabled) {
+                        it.dismissFromContainer()
+                    } else {
+                        it.dispatchHeaderBackButtonClickedEvent()
+                    }
                 }
             }
         }
-    }
 
-    override fun onLayout(changed: Boolean, l: Int, t: Int, r: Int, b: Int) {
+    override fun onLayout(
+        changed: Boolean,
+        l: Int,
+        t: Int,
+        r: Int,
+        b: Int,
+    ) {
         // no-op
     }
 
     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)
+        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.M)
-                rootWindowInsets.systemWindowInsetTop
-            else
-            // Hacky fallback for old android. Before Marshmallow, the status bar height was always 25
-                (25 * resources.displayMetrics.density).toInt()
+            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()
     }
 
     override fun onDetachedFromWindow() {
         super.onDetachedFromWindow()
-        mIsAttachedToWindow = false
+        isAttachedToWindow = false
         val surfaceId = UIManagerHelper.getSurfaceId(this)
-        UIManagerHelper.getEventDispatcherForReactTag(context as ReactContext, id)
+        UIManagerHelper
+            .getEventDispatcherForReactTag(context as ReactContext, id)
             ?.dispatchEvent(HeaderDetachedEvent(surfaceId, id))
     }
 
     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 +137,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
             }
         }
@@ -138,15 +156,16 @@ class ScreenStackHeaderConfig(context: Context) : ViewGroup(context) {
             // because sometimes we don't have the Fragment and Activity available then yet, e.g. on the
             // first setting of props. Similar thing is done for Screens of ScreenContainers, but in
             // `onContainerUpdate` of their Fragment
-            val reactContext = if (context is ReactContext) {
-                context as ReactContext
-            } else {
-                it.fragmentWrapper?.tryGetContext()
-            }
+            val reactContext =
+                if (context is ReactContext) {
+                    context as ReactContext
+                } else {
+                    it.fragmentWrapper?.tryGetContext()
+                }
             ScreenWindowTraits.trySetWindowTraits(it, activity, reactContext)
         }
 
-        if (mIsHidden) {
+        if (isHeaderHidden) {
             if (toolbar.parent != null) {
                 screenFragment?.removeToolbar()
             }
@@ -157,7 +176,7 @@ class ScreenStackHeaderConfig(context: Context) : ViewGroup(context) {
             screenFragment?.setToolbar(toolbar)
         }
 
-        if (mIsTopInsetEnabled) {
+        if (isTopInsetEnabled) {
             headerTopInset.let {
                 toolbar.setPadding(0, it ?: 0, 0, 0)
             }
@@ -176,57 +195,62 @@ 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.
             toolbar.contentInsetStartWithNavigation = 0
         }
 
-        val titleTextView = titleTextView
-        if (mTitleColor != 0) {
-            toolbar.setTitleTextColor(mTitleColor)
+        val titleTextView = findTitleTextViewInToolbar(toolbar)
+        if (titleColor != 0) {
+            toolbar.setTitleTextColor(titleColor)
         }
 
         if (titleTextView != null) {
-            if (mTitleFontFamily != null || mTitleFontWeight > 0) {
-                val titleTypeface = ReactTypefaceUtils.applyStyles(
-                    null, 0, mTitleFontWeight, mTitleFontFamily, context.assets
-                )
+            if (titleFontFamily != null || titleFontWeight > 0) {
+                val titleTypeface =
+                    ReactTypefaceUtils.applyStyles(
+                        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?.colorFilter = PorterDuffColorFilter(tintColor, PorterDuff.Mode.SRC_ATOP)
         }
 
         // subviews
@@ -237,17 +261,18 @@ 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
                 // but instead just copy the drawable from imageview that's added as a first child to it.
-                val firstChild = view.getChildAt(0) as? ImageView
-                    ?: throw JSApplicationIllegalArgumentException(
-                        "Back button header config view should have Image as first child"
-                    )
+                val firstChild =
+                    view.getChildAt(0) as? ImageView
+                        ?: throw JSApplicationIllegalArgumentException(
+                            "Back button header config view should have Image as first child",
+                        )
                 actionBar.setHomeAsUpIndicator(firstChild.drawable)
                 i++
                 continue
@@ -257,7 +282,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,101 +303,94 @@ class ScreenStackHeaderConfig(context: Context) : ViewGroup(context) {
     }
 
     private fun maybeUpdate() {
-        if (parent != null && !mDestroyed) {
+        if (parent != null && !isDestroyed && screen?.isBeingRemoved == false) {
             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)
+    fun addConfigSubview(
+        child: ScreenStackHeaderSubview,
+        index: Int,
+    ) {
+        configSubviews.add(index, child)
         maybeUpdate()
     }
 
-    private val titleTextView: TextView?
-        get() {
-            for (i in 0 until toolbar.childCount) {
-                val view = toolbar.getChildAt(i)
-                if (view is TextView) {
-                    if (view.text == toolbar.title) {
-                        return view
-                    }
-                }
-            }
-            return null
-        }
-
     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) {
+    private class DebugMenuToolbar(
+        context: Context,
+        config: ScreenStackHeaderConfig,
+    ) : CustomToolbar(context, config) {
         override fun showOverflowMenu(): Boolean {
             (context.applicationContext as ReactApplication)
                 .reactNativeHost
@@ -385,14 +403,28 @@ 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()
-        if (context.theme.resolveAttribute(R.attr.colorPrimary, tv, true)) {
+        if (context.theme.resolveAttribute(android.R.attr.colorPrimary, tv, true)) {
             toolbar.setBackgroundColor(tv.data)
         }
         toolbar.clipChildren = false
     }
+
+    companion object {
+        fun findTitleTextViewInToolbar(toolbar: Toolbar): TextView? {
+            for (i in 0 until toolbar.childCount) {
+                val view = toolbar.getChildAt(i)
+                if (view is TextView) {
+                    if (view.text == toolbar.title) {
+                        return view
+                    }
+                }
+            }
+            return null
+        }
+    }
 }

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

@@ -0,0 +1,25 @@
+package com.swmansion.rnscreens
+
+import com.facebook.react.bridge.ReactContext
+import com.facebook.react.uimanager.LayoutShadowNode
+import com.facebook.react.uimanager.Spacing
+import com.swmansion.rnscreens.utils.PaddingBundle
+
+internal class ScreenStackHeaderConfigShadowNode(
+    private var context: ReactContext,
+) : LayoutShadowNode() {
+    var paddingStart: Float = 0f
+    var paddingEnd: Float = 0f
+
+    override fun setLocalData(data: Any?) {
+        if (data is PaddingBundle) {
+            paddingStart = data.paddingStart
+            paddingEnd = data.paddingEnd
+
+            setPadding(Spacing.START, paddingStart)
+            setPadding(Spacing.END, paddingEnd)
+        } else {
+            super.setLocalData(data)
+        }
+    }
+}