react-native-screens 3.31.1 → 3.33.0

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

@@ -21,7 +21,9 @@ import com.google.android.material.appbar.AppBarLayout
 import com.google.android.material.appbar.AppBarLayout.ScrollingViewBehavior
 import com.swmansion.rnscreens.utils.DeviceUtils
 
-class ScreenStackFragment : ScreenFragment, ScreenStackFragmentWrapper {
+class ScreenStackFragment :
+    ScreenFragment,
+    ScreenStackFragmentWrapper {
     private var appBarLayout: AppBarLayout? = null
     private var toolbar: Toolbar? = null
     private var isToolbarShadowHidden = false
@@ -37,7 +39,7 @@ class ScreenStackFragment : ScreenFragment, ScreenStackFragmentWrapper {
 
     constructor() {
         throw IllegalStateException(
-            "ScreenStack fragments should never be restored. Follow instructions from https://github.com/software-mansion/react-native-screens/issues/17#issuecomment-424704067 to properly configure your main activity."
+            "ScreenStack fragments should never be restored. Follow instructions from https://github.com/software-mansion/react-native-screens/issues/17#issuecomment-424704067 to properly configure your main activity.",
         )
     }
 
@@ -54,15 +56,19 @@ class ScreenStackFragment : ScreenFragment, ScreenStackFragmentWrapper {
 
     override fun setToolbar(toolbar: Toolbar) {
         appBarLayout?.addView(toolbar)
-        toolbar.layoutParams = AppBarLayout.LayoutParams(
-            AppBarLayout.LayoutParams.MATCH_PARENT, AppBarLayout.LayoutParams.WRAP_CONTENT
-        ).apply { scrollFlags = 0 }
+        toolbar.layoutParams =
+            AppBarLayout
+                .LayoutParams(
+                    AppBarLayout.LayoutParams.MATCH_PARENT,
+                    AppBarLayout.LayoutParams.WRAP_CONTENT,
+                ).apply { scrollFlags = 0 }
         this.toolbar = toolbar
     }
 
     override fun setToolbarShadowHidden(hidden: Boolean) {
         if (isToolbarShadowHidden != hidden) {
-            appBarLayout?.targetElevation = if (hidden) 0f else PixelUtil.toPixelFromDIP(4f)
+            appBarLayout?.elevation = if (hidden) 0f else PixelUtil.toPixelFromDIP(4f)
+            appBarLayout?.stateListAnimator = null
             isToolbarShadowHidden = hidden
         }
     }
@@ -101,31 +107,38 @@ class ScreenStackFragment : ScreenFragment, ScreenStackFragmentWrapper {
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?
+        savedInstanceState: Bundle?,
     ): View? {
         val view: ScreensCoordinatorLayout? =
             context?.let { ScreensCoordinatorLayout(it, this) }
 
-        screen.layoutParams = CoordinatorLayout.LayoutParams(
-            LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT
-        ).apply { behavior = if (isToolbarTranslucent) null else ScrollingViewBehavior() }
+        screen.layoutParams =
+            CoordinatorLayout
+                .LayoutParams(
+                    LinearLayout.LayoutParams.MATCH_PARENT,
+                    LinearLayout.LayoutParams.MATCH_PARENT,
+                ).apply { behavior = if (isToolbarTranslucent) null else ScrollingViewBehavior() }
 
         view?.addView(recycleView(screen))
 
-        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
-            // (which is the default)
-            setBackgroundColor(Color.TRANSPARENT)
-            layoutParams = AppBarLayout.LayoutParams(
-                AppBarLayout.LayoutParams.MATCH_PARENT, AppBarLayout.LayoutParams.WRAP_CONTENT
-            )
-        }
+        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
+                // (which is the default)
+                setBackgroundColor(Color.TRANSPARENT)
+                layoutParams =
+                    AppBarLayout.LayoutParams(
+                        AppBarLayout.LayoutParams.MATCH_PARENT,
+                        AppBarLayout.LayoutParams.WRAP_CONTENT,
+                    )
+            }
 
         view?.addView(appBarLayout)
         if (isToolbarShadowHidden) {
-            appBarLayout?.targetElevation = 0f
+            appBarLayout?.elevation = 0f
+            appBarLayout?.stateListAnimator = null
         }
         toolbar?.let { appBarLayout?.addView(recycleView(it)) }
         setHasOptionsMenu(true)
@@ -133,8 +146,9 @@ class ScreenStackFragment : ScreenFragment, ScreenStackFragmentWrapper {
     }
 
     override fun onStop() {
-        if (DeviceUtils.isPlatformAndroidTV(context))
+        if (DeviceUtils.isPlatformAndroidTV(context)) {
             lastFocusedChild = findLastFocusedChild()
+        }
 
         super.onStop()
     }
@@ -144,7 +158,10 @@ class ScreenStackFragment : ScreenFragment, ScreenStackFragmentWrapper {
         return super.onPrepareOptionsMenu(menu)
     }
 
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+    override fun onCreateOptionsMenu(
+        menu: Menu,
+        inflater: MenuInflater,
+    ) {
         updateToolbarMenu(menu)
         return super.onCreateOptionsMenu(menu, inflater)
     }
@@ -214,7 +231,7 @@ class ScreenStackFragment : ScreenFragment, ScreenStackFragmentWrapper {
 
     private class ScreensCoordinatorLayout(
         context: Context,
-        private val mFragment: ScreenFragment
+        private val mFragment: ScreenFragment,
     ) : CoordinatorLayout(context) {
         private val mAnimationListener: Animation.AnimationListener =
             object : Animation.AnimationListener {
@@ -242,20 +259,22 @@ class ScreenStackFragment : ScreenFragment, ScreenStackFragmentWrapper {
             val fakeAnimation = ScreensAnimation(mFragment).apply { duration = animation.duration }
 
             if (animation is AnimationSet && !mFragment.isRemoving) {
-                animation.apply {
-                    addAnimation(fakeAnimation)
-                    setAnimationListener(mAnimationListener)
-                }.also {
-                    super.startAnimation(it)
-                }
+                animation
+                    .apply {
+                        addAnimation(fakeAnimation)
+                        setAnimationListener(mAnimationListener)
+                    }.also {
+                        super.startAnimation(it)
+                    }
             } else {
-                AnimationSet(true).apply {
-                    addAnimation(animation)
-                    addAnimation(fakeAnimation)
-                    setAnimationListener(mAnimationListener)
-                }.also {
-                    super.startAnimation(it)
-                }
+                AnimationSet(true)
+                    .apply {
+                        addAnimation(animation)
+                        addAnimation(fakeAnimation)
+                        setAnimationListener(mAnimationListener)
+                    }.also {
+                        super.startAnimation(it)
+                    }
             }
         }
 
@@ -273,8 +292,13 @@ class ScreenStackFragment : ScreenFragment, ScreenStackFragmentWrapper {
         }
     }
 
-    private class ScreensAnimation(private val mFragment: ScreenFragment) : Animation() {
-        override fun applyTransformation(interpolatedTime: Float, t: Transformation) {
+    private class ScreensAnimation(
+        private val mFragment: ScreenFragment,
+    ) : Animation() {
+        override fun applyTransformation(
+            interpolatedTime: Float,
+            t: Transformation,
+        ) {
             super.applyTransformation(interpolatedTime, t)
             // interpolated time should be the progress of the current transition
             mFragment.dispatchTransitionProgressEvent(interpolatedTime, !mFragment.isResumed)

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

@@ -5,11 +5,15 @@ import androidx.appcompat.widget.Toolbar
 interface ScreenStackFragmentWrapper : ScreenFragmentWrapper {
     // Toolbar management
     fun removeToolbar()
+
     fun setToolbar(toolbar: Toolbar)
+
     fun setToolbarShadowHidden(hidden: Boolean)
+
     fun setToolbarTranslucent(translucent: Boolean)
 
     // Navigation
     fun canNavigateBack(): Boolean
+
     fun dismiss()
 }

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

@@ -2,12 +2,14 @@ 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,10 +23,12 @@ 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) {
+class ScreenStackHeaderConfig(
+    context: Context,
+) : ViewGroup(context) {
     private val configSubviews = ArrayList<ScreenStackHeaderSubview>(3)
     val toolbar: CustomToolbar
-    var isHeaderHidden = false  // named this way to avoid conflict with platform's isHidden
+    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 title: String? = null
@@ -43,29 +47,36 @@ class ScreenStackHeaderConfig(context: Context) : ViewGroup(context) {
     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.dismiss()
-                    } else {
-                        parentFragment.dispatchHeaderBackButtonClickedEvent()
+    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.dismiss()
+                        } else {
+                            parentFragment.dispatchHeaderBackButtonClickedEvent()
+                        }
                     }
-                }
-            } else {
-                if (it.screen.nativeBackButtonDismissalEnabled) {
-                    it.dismiss()
                 } else {
-                    it.dispatchHeaderBackButtonClickedEvent()
+                    if (it.screen.nativeBackButtonDismissalEnabled) {
+                        it.dismiss()
+                    } 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
     }
 
@@ -77,16 +88,21 @@ class ScreenStackHeaderConfig(context: Context) : ViewGroup(context) {
         super.onAttachedToWindow()
         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()
     }
@@ -95,7 +111,8 @@ class ScreenStackHeaderConfig(context: Context) : ViewGroup(context) {
         super.onDetachedFromWindow()
         isAttachedToWindow = false
         val surfaceId = UIManagerHelper.getSurfaceId(this)
-        UIManagerHelper.getEventDispatcherForReactTag(context as ReactContext, id)
+        UIManagerHelper
+            .getEventDispatcherForReactTag(context as ReactContext, id)
             ?.dispatchEvent(HeaderDetachedEvent(surfaceId, id))
     }
 
@@ -140,11 +157,12 @@ 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)
         }
 
@@ -183,7 +201,7 @@ class ScreenStackHeaderConfig(context: Context) : ViewGroup(context) {
 
         // hide back button
         actionBar.setDisplayHomeAsUpEnabled(
-            screenFragment?.canNavigateBack() == true && !isBackButtonHidden
+            screenFragment?.canNavigateBack() == true && !isBackButtonHidden,
         )
 
         // when setSupportActionBar is called a toolbar wrapper gets initialized that overwrites
@@ -206,16 +224,21 @@ class ScreenStackHeaderConfig(context: Context) : ViewGroup(context) {
             toolbar.contentInsetStartWithNavigation = 0
         }
 
-        val titleTextView = titleTextView
+        val titleTextView = findTitleTextViewInToolbar(toolbar)
         if (titleColor != 0) {
             toolbar.setTitleTextColor(titleColor)
         }
 
         if (titleTextView != null) {
             if (titleFontFamily != null || titleFontWeight > 0) {
-                val titleTypeface = ReactTypefaceUtils.applyStyles(
-                    null, 0, titleFontWeight, titleFontFamily, context.assets
-                )
+                val titleTypeface =
+                    ReactTypefaceUtils.applyStyles(
+                        null,
+                        0,
+                        titleFontWeight,
+                        titleFontFamily,
+                        context.assets,
+                    )
                 titleTextView.typeface = titleTypeface
             }
             if (titleFontSize > 0) {
@@ -228,7 +251,7 @@ class ScreenStackHeaderConfig(context: Context) : ViewGroup(context) {
 
         // color
         if (tintColor != 0) {
-            toolbar.navigationIcon?.setColorFilter(tintColor, PorterDuff.Mode.SRC_ATOP)
+            toolbar.navigationIcon?.colorFilter = PorterDuffColorFilter(tintColor, PorterDuff.Mode.SRC_ATOP)
         }
 
         // subviews
@@ -246,10 +269,11 @@ class ScreenStackHeaderConfig(context: Context) : ViewGroup(context) {
             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
@@ -280,7 +304,7 @@ class ScreenStackHeaderConfig(context: Context) : ViewGroup(context) {
     }
 
     private fun maybeUpdate() {
-        if (parent != null && !isDestroyed) {
+        if (parent != null && !isDestroyed && screen?.isBeingRemoved == false) {
             onUpdate()
         }
     }
@@ -300,24 +324,14 @@ class ScreenStackHeaderConfig(context: Context) : ViewGroup(context) {
         maybeUpdate()
     }
 
-    fun addConfigSubview(child: ScreenStackHeaderSubview, index: Int) {
+    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?) {
         this.title = title
     }
@@ -374,7 +388,10 @@ class ScreenStackHeaderConfig(context: Context) : ViewGroup(context) {
         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
@@ -397,4 +414,18 @@ class ScreenStackHeaderConfig(context: Context) : ViewGroup(context) {
         }
         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
+        }
+    }
 }