react-native-screens 3.31.1 → 3.33.0

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

@@ -19,27 +19,37 @@ import com.facebook.react.uimanager.UIManagerHelper
 import com.swmansion.rnscreens.Screen.ActivityState
 import com.swmansion.rnscreens.events.ScreenDismissedEvent
 
-open class ScreenContainer(context: Context?) : ViewGroup(context) {
+open class ScreenContainer(
+    context: Context?,
+) : ViewGroup(context) {
     @JvmField
     protected val screenWrappers = ArrayList<ScreenFragmentWrapper>()
+
     @JvmField
     protected var fragmentManager: FragmentManager? = null
     private var isAttached = false
     private var needsUpdate = false
     private var isLayoutEnqueued = false
-    private val layoutCallback: ChoreographerCompat.FrameCallback = object : ChoreographerCompat.FrameCallback() {
-        override fun doFrame(frameTimeNanos: Long) {
-            isLayoutEnqueued = false
-            measure(
-                MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
-                MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY)
-            )
-            layout(left, top, right, bottom)
+    private val layoutCallback: ChoreographerCompat.FrameCallback =
+        object : ChoreographerCompat.FrameCallback() {
+            override fun doFrame(frameTimeNanos: Long) {
+                isLayoutEnqueued = false
+                measure(
+                    MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
+                    MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY),
+                )
+                layout(left, top, right, bottom)
+            }
         }
-    }
     private var parentScreenWrapper: ScreenFragmentWrapper? = null
 
-    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,
+    ) {
         var i = 0
         val size = childCount
         while (i < size) {
@@ -69,9 +79,11 @@ open class ScreenContainer(context: Context?) : ViewGroup(context) {
             isLayoutEnqueued = true
             // we use NATIVE_ANIMATED_MODULE choreographer queue because it allows us to catch the current
             // looper loop instead of enqueueing the update in the next loop causing a one frame delay.
-            ReactChoreographer.getInstance()
+            ReactChoreographer
+                .getInstance()
                 .postFrameCallback(
-                    ReactChoreographer.CallbackType.NATIVE_ANIMATED_MODULE, layoutCallback
+                    ReactChoreographer.CallbackType.NATIVE_ANIMATED_MODULE,
+                    layoutCallback,
                 )
         }
     }
@@ -85,7 +97,10 @@ open class ScreenContainer(context: Context?) : ViewGroup(context) {
 
     protected open fun adapt(screen: Screen): ScreenFragmentWrapper = ScreenFragment(screen)
 
-    fun addScreen(screen: Screen, index: Int) {
+    fun addScreen(
+        screen: Screen,
+        index: Int,
+    ) {
         val fragment = adapt(screen)
         screen.fragmentWrapper = fragment
         screenWrappers.add(index, fragment)
@@ -173,7 +188,7 @@ open class ScreenContainer(context: Context?) : ViewGroup(context) {
                     parentScreenWrapper = fragmentWrapper
                     fragmentWrapper.addChildScreenContainer(this)
                     setFragmentManager(fragmentWrapper.fragment.childFragmentManager)
-                }
+                },
             ) { "Parent Screen does not have its Fragment attached" }
         } else {
             // we expect top level view to be of type ReactRootView, this isn't really necessary but in
@@ -186,13 +201,15 @@ open class ScreenContainer(context: Context?) : ViewGroup(context) {
         }
     }
 
-    protected fun createTransaction(): FragmentTransaction {
-        return requireNotNull(fragmentManager) { "fragment manager is null when creating transaction" }
+    protected fun createTransaction(): FragmentTransaction =
+        requireNotNull(fragmentManager) { "fragment manager is null when creating transaction" }
             .beginTransaction()
             .setReorderingAllowed(true)
-    }
 
-    private fun attachScreen(transaction: FragmentTransaction, fragment: Fragment) {
+    private fun attachScreen(
+        transaction: FragmentTransaction,
+        fragment: Fragment,
+    ) {
         transaction.add(id, fragment)
     }
 
@@ -228,15 +245,16 @@ open class ScreenContainer(context: Context?) : ViewGroup(context) {
         }
     }
 
-    private fun detachScreen(transaction: FragmentTransaction, fragment: Fragment) {
+    private fun detachScreen(
+        transaction: FragmentTransaction,
+        fragment: Fragment,
+    ) {
         transaction.remove(fragment)
     }
 
-    private fun getActivityState(screenFragmentWrapper: ScreenFragmentWrapper): ActivityState? =
-        screenFragmentWrapper.screen.activityState
+    private fun getActivityState(screenFragmentWrapper: ScreenFragmentWrapper): ActivityState? = screenFragmentWrapper.screen.activityState
 
-    open fun hasScreen(screenFragmentWrapper: ScreenFragmentWrapper?): Boolean =
-        screenWrappers.contains(screenFragmentWrapper)
+    open fun hasScreen(screenFragmentWrapper: ScreenFragmentWrapper?): Boolean = screenWrappers.contains(screenFragmentWrapper)
 
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
@@ -295,7 +313,10 @@ open class ScreenContainer(context: Context?) : ViewGroup(context) {
         }
     }
 
-    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+    override fun onMeasure(
+        widthMeasureSpec: Int,
+        heightMeasureSpec: Int,
+    ) {
         super.onMeasure(widthMeasureSpec, heightMeasureSpec)
         for (i in 0 until childCount) {
             getChildAt(i).measure(widthMeasureSpec, heightMeasureSpec)
@@ -342,11 +363,12 @@ open class ScreenContainer(context: Context?) : ViewGroup(context) {
     open fun onUpdate() {
         createTransaction().let {
             // detach screens that are no longer active
-            val orphaned: MutableSet<Fragment> = HashSet(
-                requireNotNull(fragmentManager) {
-                    "fragment manager is null when performing update in ScreenContainer"
-                }.fragments
-            )
+            val orphaned: MutableSet<Fragment> =
+                HashSet(
+                    requireNotNull(fragmentManager) {
+                        "fragment manager is null when performing update in ScreenContainer"
+                    }.fragments,
+                )
             for (fragmentWrapper in screenWrappers) {
                 if (getActivityState(fragmentWrapper) === ActivityState.INACTIVE &&
                     fragmentWrapper.fragment.isAdded

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

@@ -6,19 +6,39 @@ import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.uimanager.LayoutShadowNode
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
+import com.facebook.react.uimanager.ViewManagerDelegate
+import com.facebook.react.viewmanagers.RNSScreenContainerManagerDelegate
+import com.facebook.react.viewmanagers.RNSScreenContainerManagerInterface
 
 @ReactModule(name = ScreenContainerViewManager.REACT_CLASS)
-class ScreenContainerViewManager : ViewGroupManager<ScreenContainer>() {
+class ScreenContainerViewManager :
+    ViewGroupManager<ScreenContainer>(),
+    RNSScreenContainerManagerInterface<ScreenContainer> {
+    private val delegate: ViewManagerDelegate<ScreenContainer>
+
+    init {
+        delegate = RNSScreenContainerManagerDelegate<ScreenContainer, ScreenContainerViewManager>(this)
+    }
+
+    protected override fun getDelegate(): ViewManagerDelegate<ScreenContainer> = delegate
+
     override fun getName(): String = REACT_CLASS
 
     override fun createViewInstance(reactContext: ThemedReactContext): ScreenContainer = ScreenContainer(reactContext)
 
-    override fun addView(parent: ScreenContainer, child: View, index: Int) {
+    override fun addView(
+        parent: ScreenContainer,
+        child: View,
+        index: Int,
+    ) {
         require(child is Screen) { "Attempt attach child that is not of type RNScreens" }
         parent.addScreen(child, index)
     }
 
-    override fun removeViewAt(parent: ScreenContainer, index: Int) {
+    override fun removeViewAt(
+        parent: ScreenContainer,
+        index: Int,
+    ) {
         parent.removeScreenAt(index)
     }
 
@@ -28,7 +48,10 @@ class ScreenContainerViewManager : ViewGroupManager<ScreenContainer>() {
 
     override fun getChildCount(parent: ScreenContainer): Int = parent.screenCount
 
-    override fun getChildAt(parent: ScreenContainer, index: Int): View = parent.getScreenAt(index)
+    override fun getChildAt(
+        parent: ScreenContainer,
+        index: Int,
+    ): View = parent.getScreenAt(index)
 
     override fun createShadowNodeInstance(context: ReactApplicationContext): LayoutShadowNode = ScreensShadowNode(context)
 

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

@@ -2,12 +2,16 @@ package com.swmansion.rnscreens
 
 interface ScreenEventDispatcher {
     fun canDispatchLifecycleEvent(event: ScreenFragment.ScreenLifecycleEvent): Boolean
+
     fun updateLastEventDispatched(event: ScreenFragment.ScreenLifecycleEvent)
 
     /**
      * Dispatches given screen lifecycle event to JS using screen from given fragment `fragmentWrapper`
      */
-    fun dispatchLifecycleEvent(event: ScreenFragment.ScreenLifecycleEvent, fragmentWrapper: ScreenFragmentWrapper)
+    fun dispatchLifecycleEvent(
+        event: ScreenFragment.ScreenLifecycleEvent,
+        fragmentWrapper: ScreenFragmentWrapper,
+    )
 
     /**
      * Dispatches given screen lifecycle event from all non-empty child containers to JS
@@ -15,7 +19,11 @@ interface ScreenEventDispatcher {
     fun dispatchLifecycleEventInChildContainers(event: ScreenFragment.ScreenLifecycleEvent)
 
     fun dispatchHeaderBackButtonClickedEvent()
-    fun dispatchTransitionProgressEvent(alpha: Float, closing: Boolean)
+
+    fun dispatchTransitionProgressEvent(
+        alpha: Float,
+        closing: Boolean,
+    )
 
     // Concrete dispatchers
 }

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