react-native-screens 3.32.0 → 3.33.0

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

@@ -1,7 +1,6 @@
 package com.swmansion.rnscreens
 
 import android.view.View
-import android.view.ViewGroup
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.uimanager.LayoutShadowNode
@@ -13,7 +12,9 @@ import com.facebook.react.viewmanagers.RNSScreenStackManagerInterface
 import com.swmansion.rnscreens.events.StackFinishTransitioningEvent
 
 @ReactModule(name = ScreenStackViewManager.REACT_CLASS)
-class ScreenStackViewManager : ViewGroupManager<ScreenStack>(), RNSScreenStackManagerInterface<ScreenStack> {
+class ScreenStackViewManager :
+    ViewGroupManager<ScreenStack>(),
+    RNSScreenStackManagerInterface<ScreenStack> {
     private val delegate: ViewManagerDelegate<ScreenStack>
 
     init {
@@ -24,40 +25,41 @@ class ScreenStackViewManager : ViewGroupManager<ScreenStack>(), RNSScreenStackMa
 
     override fun createViewInstance(reactContext: ThemedReactContext) = ScreenStack(reactContext)
 
-    override fun addView(parent: ScreenStack, child: View, index: Int) {
+    override fun addView(
+        parent: ScreenStack,
+        child: View,
+        index: Int,
+    ) {
         require(child is Screen) { "Attempt attach child that is not of type RNScreen" }
+        NativeProxy.addScreenToMap(child.id, child)
         parent.addScreen(child, index)
     }
 
-    override fun removeViewAt(parent: ScreenStack, index: Int) {
-        prepareOutTransition(parent.getScreenAt(index))
+    override fun removeViewAt(
+        parent: ScreenStack,
+        index: Int,
+    ) {
+        val screen = parent.getScreenAt(index)
+        prepareOutTransition(screen)
         parent.removeScreenAt(index)
+        NativeProxy.removeScreenFromMap(screen.id)
     }
 
     private fun prepareOutTransition(screen: Screen?) {
-        startTransitionRecursive(screen)
+        screen?.startRemovalTransition()
     }
 
-    private fun startTransitionRecursive(parent: ViewGroup?) {
-        parent?.let {
-            for (i in 0 until it.childCount) {
-                val child = it.getChildAt(i)
-                child?.let { view -> it.startViewTransition(view) }
-                if (child is ScreenStackHeaderConfig) {
-                    // we want to start transition on children of the toolbar too,
-                    // which is not a child of ScreenStackHeaderConfig
-                    startTransitionRecursive(child.toolbar)
-                }
-                if (child is ViewGroup) {
-                    startTransitionRecursive(child)
-                }
-            }
-        }
+    override fun invalidate() {
+        super.invalidate()
+        NativeProxy.clearMapOnInvalidate()
     }
 
     override fun getChildCount(parent: ScreenStack) = parent.screenCount
 
-    override fun getChildAt(parent: ScreenStack, index: Int): View = parent.getScreenAt(index)
+    override fun getChildAt(
+        parent: ScreenStack,
+        index: Int,
+    ): View = parent.getScreenAt(index)
 
     override fun createShadowNodeInstance(context: ReactApplicationContext): LayoutShadowNode = ScreensShadowNode(context)
 
@@ -65,9 +67,10 @@ class ScreenStackViewManager : ViewGroupManager<ScreenStack>(), RNSScreenStackMa
 
     protected override fun getDelegate(): ViewManagerDelegate<ScreenStack> = delegate
 
-    override fun getExportedCustomDirectEventTypeConstants(): MutableMap<String, Any> = mutableMapOf(
-        StackFinishTransitioningEvent.EVENT_NAME to mutableMapOf("registrationName" to "onFinishTransitioning")
-    )
+    override fun getExportedCustomDirectEventTypeConstants(): MutableMap<String, Any> =
+        mutableMapOf(
+            StackFinishTransitioningEvent.EVENT_NAME to mutableMapOf("registrationName" to "onFinishTransitioning"),
+        )
 
     companion object {
         const val REACT_CLASS = "RNSScreenStack"

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

@@ -22,7 +22,9 @@ import com.swmansion.rnscreens.events.ScreenWillAppearEvent
 import com.swmansion.rnscreens.events.ScreenWillDisappearEvent
 
 @ReactModule(name = ScreenViewManager.REACT_CLASS)
-open class ScreenViewManager : ViewGroupManager<Screen>(), RNSScreenManagerInterface<Screen> {
+open class ScreenViewManager :
+    ViewGroupManager<Screen>(),
+    RNSScreenManagerInterface<Screen> {
     private val delegate: ViewManagerDelegate<Screen>
 
     init {
@@ -33,24 +35,30 @@ open class ScreenViewManager : ViewGroupManager<Screen>(), RNSScreenManagerInter
 
     override fun createViewInstance(reactContext: ThemedReactContext) = Screen(reactContext)
 
-    override fun setActivityState(view: Screen, activityState: Float) {
+    override fun setActivityState(
+        view: Screen,
+        activityState: Float,
+    ) {
         setActivityState(view, activityState.toInt())
     }
 
     override fun updateState(
         view: Screen,
         props: ReactStylesDiffMap?,
-        stateWrapper: StateWrapper?
+        stateWrapper: StateWrapper?,
     ): Any? {
         if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
             // fabricViewStateManager should never be null in Fabric. The null check is only for Paper's empty impl.
-            view.fabricViewStateManager?.setStateWrapper(stateWrapper)
+            view.setStateWrapper(stateWrapper)
         }
         return super.updateState(view, props, stateWrapper)
     }
 
     @ReactProp(name = "activityState")
-    fun setActivityState(view: Screen, activityState: Int) {
+    fun setActivityState(
+        view: Screen,
+        activityState: Int,
+    ) {
         if (activityState == -1) {
             // Null will be provided when activityState is set as an animated value and we change
             // it from JS to be a plain value (non animated).
@@ -66,137 +74,224 @@ open class ScreenViewManager : ViewGroupManager<Screen>(), RNSScreenManagerInter
     }
 
     @ReactProp(name = "stackPresentation")
-    override fun setStackPresentation(view: Screen, presentation: String?) {
-        view.stackPresentation = when (presentation) {
-            "push" -> Screen.StackPresentation.PUSH
-            "modal", "containedModal", "fullScreenModal", "formSheet" ->
-                Screen.StackPresentation.MODAL
-            "transparentModal", "containedTransparentModal" ->
-                Screen.StackPresentation.TRANSPARENT_MODAL
-            else -> throw JSApplicationIllegalArgumentException("Unknown presentation type $presentation")
-        }
+    override fun setStackPresentation(
+        view: Screen,
+        presentation: String?,
+    ) {
+        view.stackPresentation =
+            when (presentation) {
+                "push" -> Screen.StackPresentation.PUSH
+                "modal", "containedModal", "fullScreenModal", "formSheet" ->
+                    Screen.StackPresentation.MODAL
+                "transparentModal", "containedTransparentModal" ->
+                    Screen.StackPresentation.TRANSPARENT_MODAL
+                else -> throw JSApplicationIllegalArgumentException("Unknown presentation type $presentation")
+            }
     }
 
     @ReactProp(name = "stackAnimation")
-    override fun setStackAnimation(view: Screen, animation: String?) {
-        view.stackAnimation = when (animation) {
-            null, "default", "flip", "simple_push" -> Screen.StackAnimation.DEFAULT
-            "none" -> Screen.StackAnimation.NONE
-            "fade" -> Screen.StackAnimation.FADE
-            "slide_from_right" -> Screen.StackAnimation.SLIDE_FROM_RIGHT
-            "slide_from_left" -> Screen.StackAnimation.SLIDE_FROM_LEFT
-            "slide_from_bottom" -> Screen.StackAnimation.SLIDE_FROM_BOTTOM
-            "fade_from_bottom" -> Screen.StackAnimation.FADE_FROM_BOTTOM
-            "ios" -> Screen.StackAnimation.IOS
-            else -> throw JSApplicationIllegalArgumentException("Unknown animation type $animation")
-        }
+    override fun setStackAnimation(
+        view: Screen,
+        animation: String?,
+    ) {
+        view.stackAnimation =
+            when (animation) {
+                null, "default", "flip", "simple_push" -> Screen.StackAnimation.DEFAULT
+                "none" -> Screen.StackAnimation.NONE
+                "fade" -> Screen.StackAnimation.FADE
+                "slide_from_right" -> Screen.StackAnimation.SLIDE_FROM_RIGHT
+                "slide_from_left" -> Screen.StackAnimation.SLIDE_FROM_LEFT
+                "slide_from_bottom" -> Screen.StackAnimation.SLIDE_FROM_BOTTOM
+                "fade_from_bottom" -> Screen.StackAnimation.FADE_FROM_BOTTOM
+                "ios" -> Screen.StackAnimation.IOS
+                else -> throw JSApplicationIllegalArgumentException("Unknown animation type $animation")
+            }
     }
 
     @ReactProp(name = "gestureEnabled", defaultBoolean = true)
-    override fun setGestureEnabled(view: Screen, gestureEnabled: Boolean) {
+    override fun setGestureEnabled(
+        view: Screen,
+        gestureEnabled: Boolean,
+    ) {
         view.isGestureEnabled = gestureEnabled
     }
 
     @ReactProp(name = "replaceAnimation")
-    override fun setReplaceAnimation(view: Screen, animation: String?) {
-        view.replaceAnimation = when (animation) {
-            null, "pop" -> Screen.ReplaceAnimation.POP
-            "push" -> Screen.ReplaceAnimation.PUSH
-            else -> throw JSApplicationIllegalArgumentException("Unknown replace animation type $animation")
-        }
+    override fun setReplaceAnimation(
+        view: Screen,
+        animation: String?,
+    ) {
+        view.replaceAnimation =
+            when (animation) {
+                null, "pop" -> Screen.ReplaceAnimation.POP
+                "push" -> Screen.ReplaceAnimation.PUSH
+                else -> throw JSApplicationIllegalArgumentException("Unknown replace animation type $animation")
+            }
     }
 
     @ReactProp(name = "screenOrientation")
-    override fun setScreenOrientation(view: Screen, screenOrientation: String?) {
+    override fun setScreenOrientation(
+        view: Screen,
+        screenOrientation: String?,
+    ) {
         view.setScreenOrientation(screenOrientation)
     }
 
     @ReactProp(name = "statusBarAnimation")
-    override fun setStatusBarAnimation(view: Screen, statusBarAnimation: String?) {
+    override fun setStatusBarAnimation(
+        view: Screen,
+        statusBarAnimation: String?,
+    ) {
         val animated = statusBarAnimation != null && "none" != statusBarAnimation
         view.isStatusBarAnimated = animated
     }
 
     @ReactProp(name = "statusBarColor", customType = "Color")
-    override fun setStatusBarColor(view: Screen, statusBarColor: Int?) {
+    override fun setStatusBarColor(
+        view: Screen,
+        statusBarColor: Int?,
+    ) {
         view.statusBarColor = statusBarColor
     }
 
     @ReactProp(name = "statusBarStyle")
-    override fun setStatusBarStyle(view: Screen, statusBarStyle: String?) {
+    override fun setStatusBarStyle(
+        view: Screen,
+        statusBarStyle: String?,
+    ) {
         view.statusBarStyle = statusBarStyle
     }
 
     @ReactProp(name = "statusBarTranslucent")
-    override fun setStatusBarTranslucent(view: Screen, statusBarTranslucent: Boolean) {
+    override fun setStatusBarTranslucent(
+        view: Screen,
+        statusBarTranslucent: Boolean,
+    ) {
         view.isStatusBarTranslucent = statusBarTranslucent
     }
 
     @ReactProp(name = "statusBarHidden")
-    override fun setStatusBarHidden(view: Screen, statusBarHidden: Boolean) {
+    override fun setStatusBarHidden(
+        view: Screen,
+        statusBarHidden: Boolean,
+    ) {
         view.isStatusBarHidden = statusBarHidden
     }
 
     @ReactProp(name = "navigationBarColor", customType = "Color")
-    override fun setNavigationBarColor(view: Screen, navigationBarColor: Int?) {
+    override fun setNavigationBarColor(
+        view: Screen,
+        navigationBarColor: Int?,
+    ) {
         view.navigationBarColor = navigationBarColor
     }
 
     @ReactProp(name = "navigationBarTranslucent")
-    override fun setNavigationBarTranslucent(view: Screen, navigationBarTranslucent: Boolean) {
+    override fun setNavigationBarTranslucent(
+        view: Screen,
+        navigationBarTranslucent: Boolean,
+    ) {
         view.isNavigationBarTranslucent = navigationBarTranslucent
     }
 
     @ReactProp(name = "navigationBarHidden")
-    override fun setNavigationBarHidden(view: Screen, navigationBarHidden: Boolean) {
+    override fun setNavigationBarHidden(
+        view: Screen,
+        navigationBarHidden: Boolean,
+    ) {
         view.isNavigationBarHidden = navigationBarHidden
     }
 
     @ReactProp(name = "nativeBackButtonDismissalEnabled")
     override fun setNativeBackButtonDismissalEnabled(
         view: Screen,
-        nativeBackButtonDismissalEnabled: Boolean
+        nativeBackButtonDismissalEnabled: Boolean,
     ) {
         view.nativeBackButtonDismissalEnabled = nativeBackButtonDismissalEnabled
     }
 
     // these props are not available on Android, however we must override their setters
-    override fun setFullScreenSwipeEnabled(view: Screen?, value: Boolean) = Unit
-
-    override fun setTransitionDuration(view: Screen?, value: Int) = Unit
-
-    override fun setHideKeyboardOnSwipe(view: Screen?, value: Boolean) = Unit
-
-    override fun setCustomAnimationOnSwipe(view: Screen?, value: Boolean) = Unit
-
-    override fun setGestureResponseDistance(view: Screen?, value: ReadableMap?) = Unit
-
-    override fun setHomeIndicatorHidden(view: Screen?, value: Boolean) = Unit
-
-    override fun setPreventNativeDismiss(view: Screen?, value: Boolean) = Unit
-
-    override fun setSwipeDirection(view: Screen?, value: String?) = Unit
-
-    override fun setSheetAllowedDetents(view: Screen, value: String?) = Unit
-
-    override fun setSheetLargestUndimmedDetent(view: Screen, value: String?) = Unit
-
-    override fun setSheetGrabberVisible(view: Screen?, value: Boolean) = Unit
-
-    override fun setSheetCornerRadius(view: Screen?, value: Float) = Unit
-
-    override fun setSheetExpandsWhenScrolledToEdge(view: Screen?, value: Boolean) = Unit
+    override fun setFullScreenSwipeEnabled(
+        view: Screen?,
+        value: Boolean,
+    ) = Unit
+
+    override fun setFullScreenSwipeShadowEnabled(
+        view: Screen?,
+        value: Boolean,
+    ) = Unit
+
+    override fun setTransitionDuration(
+        view: Screen?,
+        value: Int,
+    ) = Unit
+
+    override fun setHideKeyboardOnSwipe(
+        view: Screen?,
+        value: Boolean,
+    ) = Unit
+
+    override fun setCustomAnimationOnSwipe(
+        view: Screen?,
+        value: Boolean,
+    ) = Unit
+
+    override fun setGestureResponseDistance(
+        view: Screen?,
+        value: ReadableMap?,
+    ) = Unit
+
+    override fun setHomeIndicatorHidden(
+        view: Screen?,
+        value: Boolean,
+    ) = Unit
+
+    override fun setPreventNativeDismiss(
+        view: Screen?,
+        value: Boolean,
+    ) = Unit
+
+    override fun setSwipeDirection(
+        view: Screen?,
+        value: String?,
+    ) = Unit
+
+    override fun setSheetAllowedDetents(
+        view: Screen,
+        value: String?,
+    ) = Unit
 
-    override fun getExportedCustomDirectEventTypeConstants(): MutableMap<String, Any> = mutableMapOf(
-        ScreenDismissedEvent.EVENT_NAME to MapBuilder.of("registrationName", "onDismissed"),
-        ScreenWillAppearEvent.EVENT_NAME to MapBuilder.of("registrationName", "onWillAppear"),
-        ScreenAppearEvent.EVENT_NAME to MapBuilder.of("registrationName", "onAppear"),
-        ScreenWillDisappearEvent.EVENT_NAME to MapBuilder.of("registrationName", "onWillDisappear"),
-        ScreenDisappearEvent.EVENT_NAME to MapBuilder.of("registrationName", "onDisappear"),
-        HeaderHeightChangeEvent.EVENT_NAME to MapBuilder.of("registrationName", "onHeaderHeightChange"),
-        HeaderBackButtonClickedEvent.EVENT_NAME to MapBuilder.of("registrationName", "onHeaderBackButtonClicked"),
-        ScreenTransitionProgressEvent.EVENT_NAME to MapBuilder.of("registrationName", "onTransitionProgress")
-    )
+    override fun setSheetLargestUndimmedDetent(
+        view: Screen,
+        value: String?,
+    ) = Unit
+
+    override fun setSheetGrabberVisible(
+        view: Screen?,
+        value: Boolean,
+    ) = Unit
+
+    override fun setSheetCornerRadius(
+        view: Screen?,
+        value: Float,
+    ) = Unit
+
+    override fun setSheetExpandsWhenScrolledToEdge(
+        view: Screen?,
+        value: Boolean,
+    ) = Unit
+
+    override fun getExportedCustomDirectEventTypeConstants(): MutableMap<String, Any> =
+        mutableMapOf(
+            ScreenDismissedEvent.EVENT_NAME to MapBuilder.of("registrationName", "onDismissed"),
+            ScreenWillAppearEvent.EVENT_NAME to MapBuilder.of("registrationName", "onWillAppear"),
+            ScreenAppearEvent.EVENT_NAME to MapBuilder.of("registrationName", "onAppear"),
+            ScreenWillDisappearEvent.EVENT_NAME to MapBuilder.of("registrationName", "onWillDisappear"),
+            ScreenDisappearEvent.EVENT_NAME to MapBuilder.of("registrationName", "onDisappear"),
+            HeaderHeightChangeEvent.EVENT_NAME to MapBuilder.of("registrationName", "onHeaderHeightChange"),
+            HeaderBackButtonClickedEvent.EVENT_NAME to MapBuilder.of("registrationName", "onHeaderBackButtonClicked"),
+            ScreenTransitionProgressEvent.EVENT_NAME to MapBuilder.of("registrationName", "onTransitionProgress"),
+        )
 
     protected override fun getDelegate(): ViewManagerDelegate<Screen> = delegate
 

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

@@ -2,7 +2,6 @@ package com.swmansion.rnscreens
 
 import android.animation.ArgbEvaluator
 import android.animation.ValueAnimator
-import android.annotation.SuppressLint
 import android.annotation.TargetApi
 import android.app.Activity
 import android.content.pm.ActivityInfo
@@ -39,7 +38,10 @@ object ScreenWindowTraits {
         didSetNavigationBarAppearance = true
     }
 
-    internal fun setOrientation(screen: Screen, activity: Activity?) {
+    internal fun setOrientation(
+        screen: Screen,
+        activity: Activity?,
+    ) {
         if (activity == null) {
             return
         }
@@ -48,7 +50,11 @@ object ScreenWindowTraits {
         activity.requestedOrientation = orientation
     }
 
-    internal fun setColor(screen: Screen, activity: Activity?, context: ReactContext?) {
+    internal fun setColor(
+        screen: Screen,
+        activity: Activity?,
+        context: ReactContext?,
+    ) {
         if (activity == null || context == null) {
             return
         }
@@ -76,10 +82,15 @@ object ScreenWindowTraits {
                     }
                     colorAnimation.start()
                 }
-            })
+            },
+        )
     }
 
-    internal fun setStyle(screen: Screen, activity: Activity?, context: ReactContext?) {
+    internal fun setStyle(
+        screen: Screen,
+        activity: Activity?,
+        context: ReactContext?,
+    ) {
         if (activity == null || context == null || Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
             return
         }
@@ -98,7 +109,7 @@ object ScreenWindowTraits {
     internal fun setTranslucent(
         screen: Screen,
         activity: Activity?,
-        context: ReactContext?
+        context: ReactContext?,
     ) {
         if (activity == null || context == null) {
             return
@@ -128,16 +139,15 @@ object ScreenWindowTraits {
                                             windowInsets.left,
                                             0,
                                             windowInsets.right,
-                                            windowInsets.bottom
-                                        )
-                                    )
-                                    .build()
+                                            windowInsets.bottom,
+                                        ),
+                                    ).build()
                             } else {
                                 defaultInsets.replaceSystemWindowInsets(
                                     defaultInsets.systemWindowInsetLeft,
                                     0,
                                     defaultInsets.systemWindowInsetRight,
-                                    defaultInsets.systemWindowInsetBottom
+                                    defaultInsets.systemWindowInsetBottom,
                                 )
                             }
                         }
@@ -146,10 +156,14 @@ object ScreenWindowTraits {
                     }
                     ViewCompat.requestApplyInsets(decorView)
                 }
-            })
+            },
+        )
     }
 
-    internal fun setHidden(screen: Screen, activity: Activity?) {
+    internal fun setHidden(
+        screen: Screen,
+        activity: Activity?,
+    ) {
         if (activity == null) {
             return
         }
@@ -169,7 +183,10 @@ object ScreenWindowTraits {
 
     // Methods concerning navigationBar management were taken from `react-native-navigation`'s repo:
     // https://github.com/wix/react-native-navigation/blob/9bb70d81700692141a2c505c081c2d86c7f9c66e/lib/android/app/src/main/java/com/reactnativenavigation/utils/SystemUiUtils.kt
-    internal fun setNavigationBarColor(screen: Screen, activity: Activity?) {
+    internal fun setNavigationBarColor(
+        screen: Screen,
+        activity: Activity?,
+    ) {
         if (activity == null) {
             return
         }
@@ -186,7 +203,10 @@ object ScreenWindowTraits {
         window.navigationBarColor = color
     }
 
-    internal fun setNavigationBarTranslucent(screen: Screen, activity: Activity?) {
+    internal fun setNavigationBarTranslucent(
+        screen: Screen,
+        activity: Activity?,
+    ) {
         if (activity == null) {
             return
         }
@@ -200,7 +220,10 @@ object ScreenWindowTraits {
         WindowCompat.setDecorFitsSystemWindows(window, !translucent)
     }
 
-    internal fun setNavigationBarHidden(screen: Screen, activity: Activity?) {
+    internal fun setNavigationBarHidden(
+        screen: Screen,
+        activity: Activity?,
+    ) {
         if (activity == null) {
             return
         }
@@ -219,12 +242,16 @@ object ScreenWindowTraits {
         } else {
             WindowInsetsControllerCompat(
                 window,
-                window.decorView
+                window.decorView,
             ).show(WindowInsetsCompat.Type.navigationBars())
         }
     }
 
-    internal fun trySetWindowTraits(screen: Screen, activity: Activity?, context: ReactContext?) {
+    internal fun trySetWindowTraits(
+        screen: Screen,
+        activity: Activity?,
+        context: ReactContext?,
+    ) {
         if (didSetOrientation) {
             setOrientation(screen, activity)
         }
@@ -241,7 +268,10 @@ object ScreenWindowTraits {
         }
     }
 
-    private fun findScreenForTrait(screen: Screen, trait: WindowTraits): Screen? {
+    private fun findScreenForTrait(
+        screen: Screen,
+        trait: WindowTraits,
+    ): Screen? {
         val childWithTrait = childScreenWithTraitSet(screen, trait)
         if (childWithTrait != null) {
             return childWithTrait
@@ -255,7 +285,10 @@ object ScreenWindowTraits {
         }
     }
 
-    private fun findParentWithTraitSet(screen: Screen, trait: WindowTraits): Screen? {
+    private fun findParentWithTraitSet(
+        screen: Screen,
+        trait: WindowTraits,
+    ): Screen? {
         var parent: ViewParent? = screen.container
         while (parent != null) {
             if (parent is Screen) {
@@ -270,7 +303,7 @@ object ScreenWindowTraits {
 
     private fun childScreenWithTraitSet(
         screen: Screen?,
-        trait: WindowTraits
+        trait: WindowTraits,
     ): Screen? {
         screen?.fragmentWrapper?.let {
             for (sc in it.childScreenContainers) {
@@ -288,8 +321,11 @@ object ScreenWindowTraits {
         return null
     }
 
-    private fun checkTraitForScreen(screen: Screen, trait: WindowTraits): Boolean {
-        return when (trait) {
+    private fun checkTraitForScreen(
+        screen: Screen,
+        trait: WindowTraits,
+    ): Boolean =
+        when (trait) {
             WindowTraits.ORIENTATION -> screen.screenOrientation != null
             WindowTraits.COLOR -> screen.statusBarColor != null
             WindowTraits.STYLE -> screen.statusBarStyle != null
@@ -300,7 +336,6 @@ object ScreenWindowTraits {
             WindowTraits.NAVIGATION_BAR_TRANSLUCENT -> screen.isNavigationBarTranslucent != null
             WindowTraits.NAVIGATION_BAR_HIDDEN -> screen.isNavigationBarHidden != null
         }
-    }
 
     private fun isColorLight(color: Int): Boolean {
         val darkness: Double =