react-native-screens 3.32.0 → 3.33.0

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

@@ -25,9 +25,14 @@ import com.swmansion.rnscreens.events.ScreenWillDisappearEvent
 import kotlin.math.max
 import kotlin.math.min
 
-open class ScreenFragment : Fragment, ScreenFragmentWrapper {
+open class ScreenFragment :
+    Fragment,
+    ScreenFragmentWrapper {
     enum class ScreenLifecycleEvent {
-        DID_APPEAR, WILL_APPEAR, DID_DISAPPEAR, WILL_DISAPPEAR
+        DID_APPEAR,
+        WILL_APPEAR,
+        DID_DISAPPEAR,
+        WILL_DISAPPEAR,
     }
 
     override val fragment: Fragment
@@ -40,6 +45,7 @@ open class ScreenFragment : Fragment, ScreenFragmentWrapper {
     override val childScreenContainers: MutableList<ScreenContainer> = ArrayList()
 
     private var shouldUpdateOnResume = false
+
     // if we don't set it, it will be 0.0f at the beginning so the progress will not be sent
     // due to progress value being already 0.0f
     private var transitionProgress = -1f
@@ -57,7 +63,7 @@ open class ScreenFragment : Fragment, ScreenFragmentWrapper {
 
     constructor() {
         throw IllegalStateException(
-            "Screen 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."
+            "Screen 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.",
         )
     }
 
@@ -77,14 +83,17 @@ open class ScreenFragment : Fragment, ScreenFragmentWrapper {
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?
+        savedInstanceState: Bundle?,
     ): View? {
-        screen.layoutParams = FrameLayout.LayoutParams(
-            ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT
-        )
-        val wrapper = context?.let { ScreensFrameLayout(it) }?.apply {
-            addView(recycleView(screen))
-        }
+        screen.layoutParams =
+            FrameLayout.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT,
+                ViewGroup.LayoutParams.MATCH_PARENT,
+            )
+        val wrapper =
+            context?.let { ScreensFrameLayout(it) }?.apply {
+                addView(recycleView(screen))
+            }
         return wrapper
     }
 
@@ -154,12 +163,13 @@ open class ScreenFragment : Fragment, ScreenFragmentWrapper {
         return null
     }
 
-    override fun canDispatchLifecycleEvent(event: ScreenLifecycleEvent): Boolean = when (event) {
-        ScreenLifecycleEvent.WILL_APPEAR -> canDispatchWillAppear
-        ScreenLifecycleEvent.DID_APPEAR -> canDispatchAppear
-        ScreenLifecycleEvent.WILL_DISAPPEAR -> !canDispatchWillAppear
-        ScreenLifecycleEvent.DID_DISAPPEAR -> !canDispatchAppear
-    }
+    override fun canDispatchLifecycleEvent(event: ScreenLifecycleEvent): Boolean =
+        when (event) {
+            ScreenLifecycleEvent.WILL_APPEAR -> canDispatchWillAppear
+            ScreenLifecycleEvent.DID_APPEAR -> canDispatchAppear
+            ScreenLifecycleEvent.WILL_DISAPPEAR -> !canDispatchWillAppear
+            ScreenLifecycleEvent.DID_DISAPPEAR -> !canDispatchAppear
+        }
 
     override fun updateLastEventDispatched(event: ScreenLifecycleEvent) {
         when (event) {
@@ -190,18 +200,22 @@ open class ScreenFragment : Fragment, ScreenFragmentWrapper {
         dispatchTransitionProgressEvent(1.0f, true)
     }
 
-    override fun dispatchLifecycleEvent(event: ScreenLifecycleEvent, fragmentWrapper: ScreenFragmentWrapper) {
+    override fun dispatchLifecycleEvent(
+        event: ScreenLifecycleEvent,
+        fragmentWrapper: ScreenFragmentWrapper,
+    ) {
         val fragment = fragmentWrapper.fragment
         if (fragment is ScreenStackFragment && fragment.canDispatchLifecycleEvent(event)) {
             fragment.screen.let {
                 fragmentWrapper.updateLastEventDispatched(event)
                 val surfaceId = UIManagerHelper.getSurfaceId(it)
-                val lifecycleEvent: Event<*> = when (event) {
-                    ScreenLifecycleEvent.WILL_APPEAR -> ScreenWillAppearEvent(surfaceId, it.id)
-                    ScreenLifecycleEvent.DID_APPEAR -> ScreenAppearEvent(surfaceId, it.id)
-                    ScreenLifecycleEvent.WILL_DISAPPEAR -> ScreenWillDisappearEvent(surfaceId, it.id)
-                    ScreenLifecycleEvent.DID_DISAPPEAR -> ScreenDisappearEvent(surfaceId, it.id)
-                }
+                val lifecycleEvent: Event<*> =
+                    when (event) {
+                        ScreenLifecycleEvent.WILL_APPEAR -> ScreenWillAppearEvent(surfaceId, it.id)
+                        ScreenLifecycleEvent.DID_APPEAR -> ScreenAppearEvent(surfaceId, it.id)
+                        ScreenLifecycleEvent.WILL_DISAPPEAR -> ScreenWillDisappearEvent(surfaceId, it.id)
+                        ScreenLifecycleEvent.DID_DISAPPEAR -> ScreenDisappearEvent(surfaceId, it.id)
+                    }
                 val screenContext = screen.context as ReactContext
                 val eventDispatcher: EventDispatcher? =
                     UIManagerHelper.getEventDispatcherForReactTag(screenContext, screen.id)
@@ -225,7 +239,10 @@ open class ScreenFragment : Fragment, ScreenFragmentWrapper {
             ?.dispatchEvent(HeaderBackButtonClickedEvent(surfaceId, screen.id))
     }
 
-    override fun dispatchTransitionProgressEvent(alpha: Float, closing: Boolean) {
+    override fun dispatchTransitionProgressEvent(
+        alpha: Float,
+        closing: Boolean,
+    ) {
         if (this is ScreenStackFragment) {
             if (transitionProgress != alpha) {
                 transitionProgress = max(0.0f, min(1.0f, alpha))
@@ -238,8 +255,12 @@ open class ScreenFragment : Fragment, ScreenFragmentWrapper {
                     ?.dispatchEvent(
                         ScreenTransitionProgressEvent(
                             UIManagerHelper.getSurfaceId(screenContext),
-                            screen.id, transitionProgress, closing, goingForward, coalescingKey
-                        )
+                            screen.id,
+                            transitionProgress,
+                            closing,
+                            goingForward,
+                            coalescingKey,
+                        ),
                     )
             }
         }
@@ -328,7 +349,15 @@ open class ScreenFragment : Fragment, ScreenFragmentWrapper {
                  - progress is 1 -> key 2
                  - progress is between 0 and 1 -> key 3
              */
-            return (if (progress == 0.0f) 1 else if (progress == 1.0f) 2 else 3).toShort()
+            return (
+                if (progress == 0.0f) {
+                    1
+                } else if (progress == 1.0f) {
+                    2
+                } else {
+                    3
+                }
+            ).toShort()
         }
     }
 }

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

@@ -3,20 +3,27 @@ package com.swmansion.rnscreens
 import android.app.Activity
 import com.facebook.react.bridge.ReactContext
 
-interface ScreenFragmentWrapper : FragmentHolder, ScreenEventDispatcher {
+interface ScreenFragmentWrapper :
+    FragmentHolder,
+    ScreenEventDispatcher {
     var screen: Screen
 
     // Communication with container
     val childScreenContainers: List<ScreenContainer>
+
     fun addChildScreenContainer(container: ScreenContainer)
+
     fun removeChildScreenContainer(container: ScreenContainer)
+
     fun onContainerUpdate()
 
     // Animation phase callbacks
     fun onViewAnimationStart()
+
     fun onViewAnimationEnd()
 
     // Helpers
     fun tryGetActivity(): Activity?
+
     fun tryGetContext(): ReactContext?
 }

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

@@ -12,7 +12,9 @@ import java.util.Collections
 import kotlin.collections.ArrayList
 import kotlin.collections.HashSet
 
-class ScreenStack(context: Context?) : ScreenContainer(context) {
+class ScreenStack(
+    context: Context?,
+) : ScreenContainer(context) {
     private val stack = ArrayList<ScreenStackFragmentWrapper>()
     private val dismissedWrappers: MutableSet<ScreenStackFragmentWrapper> = HashSet()
     private val drawingOpPool: MutableList<DrawingOp> = ArrayList()
@@ -142,11 +144,21 @@ class ScreenStack(context: Context?) : ScreenContainer(context) {
                         StackAnimation.DEFAULT -> it.setCustomAnimations(R.anim.rns_default_enter_in, R.anim.rns_default_enter_out)
                         StackAnimation.NONE -> it.setCustomAnimations(R.anim.rns_no_animation_20, R.anim.rns_no_animation_20)
                         StackAnimation.FADE -> it.setCustomAnimations(R.anim.rns_fade_in, R.anim.rns_fade_out)
-                        StackAnimation.SLIDE_FROM_RIGHT -> it.setCustomAnimations(R.anim.rns_slide_in_from_right, R.anim.rns_slide_out_to_left)
-                        StackAnimation.SLIDE_FROM_LEFT -> it.setCustomAnimations(R.anim.rns_slide_in_from_left, R.anim.rns_slide_out_to_right)
-                        StackAnimation.SLIDE_FROM_BOTTOM -> it.setCustomAnimations(
-                            R.anim.rns_slide_in_from_bottom, R.anim.rns_no_animation_medium
-                        )
+                        StackAnimation.SLIDE_FROM_RIGHT ->
+                            it.setCustomAnimations(
+                                R.anim.rns_slide_in_from_right,
+                                R.anim.rns_slide_out_to_left,
+                            )
+                        StackAnimation.SLIDE_FROM_LEFT ->
+                            it.setCustomAnimations(
+                                R.anim.rns_slide_in_from_left,
+                                R.anim.rns_slide_out_to_right,
+                            )
+                        StackAnimation.SLIDE_FROM_BOTTOM ->
+                            it.setCustomAnimations(
+                                R.anim.rns_slide_in_from_bottom,
+                                R.anim.rns_no_animation_medium,
+                            )
                         StackAnimation.FADE_FROM_BOTTOM -> it.setCustomAnimations(R.anim.rns_fade_from_bottom, R.anim.rns_no_animation_350)
                         StackAnimation.IOS -> it.setCustomAnimations(R.anim.rns_slide_in_from_right_ios, R.anim.rns_slide_out_to_left_ios)
                     }
@@ -155,11 +167,21 @@ class ScreenStack(context: Context?) : ScreenContainer(context) {
                         StackAnimation.DEFAULT -> it.setCustomAnimations(R.anim.rns_default_exit_in, R.anim.rns_default_exit_out)
                         StackAnimation.NONE -> it.setCustomAnimations(R.anim.rns_no_animation_20, R.anim.rns_no_animation_20)
                         StackAnimation.FADE -> it.setCustomAnimations(R.anim.rns_fade_in, R.anim.rns_fade_out)
-                        StackAnimation.SLIDE_FROM_RIGHT -> it.setCustomAnimations(R.anim.rns_slide_in_from_left, R.anim.rns_slide_out_to_right)
-                        StackAnimation.SLIDE_FROM_LEFT -> it.setCustomAnimations(R.anim.rns_slide_in_from_right, R.anim.rns_slide_out_to_left)
-                        StackAnimation.SLIDE_FROM_BOTTOM -> it.setCustomAnimations(
-                            R.anim.rns_no_animation_medium, R.anim.rns_slide_out_to_bottom
-                        )
+                        StackAnimation.SLIDE_FROM_RIGHT ->
+                            it.setCustomAnimations(
+                                R.anim.rns_slide_in_from_left,
+                                R.anim.rns_slide_out_to_right,
+                            )
+                        StackAnimation.SLIDE_FROM_LEFT ->
+                            it.setCustomAnimations(
+                                R.anim.rns_slide_in_from_right,
+                                R.anim.rns_slide_out_to_left,
+                            )
+                        StackAnimation.SLIDE_FROM_BOTTOM ->
+                            it.setCustomAnimations(
+                                R.anim.rns_no_animation_medium,
+                                R.anim.rns_slide_out_to_bottom,
+                            )
                         StackAnimation.FADE_FROM_BOTTOM -> it.setCustomAnimations(R.anim.rns_no_animation_250, R.anim.rns_fade_to_bottom)
                         StackAnimation.IOS -> it.setCustomAnimations(R.anim.rns_slide_in_from_left_ios, R.anim.rns_slide_out_to_right_ios)
                     }
@@ -170,7 +192,8 @@ class ScreenStack(context: Context?) : ScreenContainer(context) {
             goingForward = shouldUseOpenAnimation
 
             if (shouldUseOpenAnimation &&
-                newTop != null && needsDrawReordering(newTop) &&
+                newTop != null &&
+                needsDrawReordering(newTop) &&
                 visibleBottom == null
             ) {
                 // When using an open animation in which two screens overlap (eg. fade_from_bottom or
@@ -208,9 +231,12 @@ class ScreenStack(context: Context?) : ScreenContainer(context) {
                 for (fragmentWrapper in screenWrappers) {
                     // ignore all screens beneath the visible bottom
                     if (beneathVisibleBottom) {
-                        beneathVisibleBottom = if (fragmentWrapper === visibleBottom) {
-                            false
-                        } else continue
+                        beneathVisibleBottom =
+                            if (fragmentWrapper === visibleBottom) {
+                                false
+                            } else {
+                                continue
+                            }
                     }
                     // when first visible screen found, make all screens after that visible
                     it.add(id, fragmentWrapper.fragment).runOnCommit { top?.screen?.bringToFront() }
@@ -298,13 +324,17 @@ class ScreenStack(context: Context?) : ScreenContainer(context) {
         drawAndRelease()
     }
 
-    override fun drawChild(canvas: Canvas, child: View, drawingTime: Long): Boolean {
+    override fun drawChild(
+        canvas: Canvas,
+        child: View,
+        drawingTime: Long,
+    ): Boolean {
         drawingOps.add(
             obtainDrawingOp().apply {
                 this.canvas = canvas
                 this.child = child
                 this.drawingTime = drawingTime
-            }
+            },
         )
         return true
     }
@@ -315,8 +345,9 @@ class ScreenStack(context: Context?) : ScreenContainer(context) {
         super.drawChild(op.canvas!!, op.child, op.drawingTime)
     }
 
-    private fun obtainDrawingOp(): DrawingOp =
-        if (drawingOpPool.isEmpty()) DrawingOp() else drawingOpPool.removeLast()
+    // Can't use `drawingOpPool.removeLast` here due to issues with static name resolution in Android SDK 35+.
+    // See: https://developer.android.com/about/versions/15/behavior-changes-15?hl=en#openjdk-api-changes
+    private fun obtainDrawingOp(): DrawingOp = if (drawingOpPool.isEmpty()) DrawingOp() else drawingOpPool.removeAt(drawingOpPool.lastIndex)
 
     private inner class DrawingOp {
         var canvas: Canvas? = null

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,9 +56,12 @@ 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
     }
 
@@ -102,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?.elevation = 0f
+            appBarLayout?.stateListAnimator = null
         }
         toolbar?.let { appBarLayout?.addView(recycleView(it)) }
         setHasOptionsMenu(true)
@@ -134,8 +146,9 @@ class ScreenStackFragment : ScreenFragment, ScreenStackFragmentWrapper {
     }
 
     override fun onStop() {
-        if (DeviceUtils.isPlatformAndroidTV(context))
+        if (DeviceUtils.isPlatformAndroidTV(context)) {
             lastFocusedChild = findLastFocusedChild()
+        }
 
         super.onStop()
     }
@@ -145,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)
     }
@@ -215,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 {
@@ -243,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)
+                    }
             }
         }
 
@@ -274,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()
 }