react-native-screens 4.24.0 → 4.25.0-beta.1

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

@@ -1,6 +1,5 @@
 package com.swmansion.rnscreens
 
-import android.util.Log
 import android.view.View
 import com.facebook.react.bridge.JSApplicationIllegalArgumentException
 import com.facebook.react.bridge.ReadableArray
@@ -11,7 +10,6 @@ import com.facebook.react.uimanager.StateWrapper
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.ViewManagerDelegate
-import com.facebook.react.uimanager.annotations.ReactProp
 import com.facebook.react.viewmanagers.RNSScreenManagerDelegate
 import com.facebook.react.viewmanagers.RNSScreenManagerInterface
 import com.swmansion.rnscreens.bottomsheet.SheetDetents
@@ -87,9 +85,7 @@ open class ScreenViewManager :
         props: ReactStylesDiffMap?,
         stateWrapper: StateWrapper?,
     ): Any? {
-        if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-            view.setStateWrapper(stateWrapper)
-        }
+        view.setStateWrapper(stateWrapper)
         return super.updateState(view, props, stateWrapper)
     }
 
@@ -99,11 +95,6 @@ open class ScreenViewManager :
         view.onFinalizePropsUpdate()
     }
 
-    private fun logNotAvailable(propName: String) {
-        Log.w("[RNScreens]", "$propName prop is not available on Android")
-    }
-
-    @ReactProp(name = "activityState")
     fun setActivityState(
         view: Screen,
         activityState: Int,
@@ -122,7 +113,6 @@ open class ScreenViewManager :
         }
     }
 
-    @ReactProp(name = "stackPresentation")
     override fun setStackPresentation(
         view: Screen,
         presentation: String?,
@@ -139,7 +129,6 @@ open class ScreenViewManager :
             }
     }
 
-    @ReactProp(name = "stackAnimation")
     override fun setStackAnimation(
         view: Screen,
         animation: String?,
@@ -159,7 +148,6 @@ open class ScreenViewManager :
             }
     }
 
-    @ReactProp(name = "gestureEnabled", defaultBoolean = true)
     override fun setGestureEnabled(
         view: Screen,
         gestureEnabled: Boolean,
@@ -167,7 +155,6 @@ open class ScreenViewManager :
         view.isGestureEnabled = gestureEnabled
     }
 
-    @ReactProp(name = "replaceAnimation")
     override fun setReplaceAnimation(
         view: Screen,
         animation: String?,
@@ -180,7 +167,6 @@ open class ScreenViewManager :
             }
     }
 
-    @ReactProp(name = "screenOrientation")
     override fun setScreenOrientation(
         view: Screen,
         screenOrientation: String?,
@@ -188,7 +174,6 @@ open class ScreenViewManager :
         view.setScreenOrientation(screenOrientation)
     }
 
-    @ReactProp(name = "statusBarAnimation")
     override fun setStatusBarAnimation(
         view: Screen,
         statusBarAnimation: String?,
@@ -197,15 +182,6 @@ open class ScreenViewManager :
         view.isStatusBarAnimated = animated
     }
 
-    @ReactProp(name = "statusBarColor", customType = "Color")
-    override fun setStatusBarColor(
-        view: Screen,
-        statusBarColor: Int?,
-    ) {
-        logNotAvailable("statusBarColor")
-    }
-
-    @ReactProp(name = "statusBarStyle")
     override fun setStatusBarStyle(
         view: Screen,
         statusBarStyle: String?,
@@ -213,15 +189,6 @@ open class ScreenViewManager :
         view.statusBarStyle = statusBarStyle
     }
 
-    @ReactProp(name = "statusBarTranslucent")
-    override fun setStatusBarTranslucent(
-        view: Screen,
-        statusBarTranslucent: Boolean,
-    ) {
-        logNotAvailable("statusBarTranslucent")
-    }
-
-    @ReactProp(name = "statusBarHidden")
     override fun setStatusBarHidden(
         view: Screen,
         statusBarHidden: Boolean,
@@ -229,23 +196,6 @@ open class ScreenViewManager :
         view.isStatusBarHidden = statusBarHidden
     }
 
-    @ReactProp(name = "navigationBarColor", customType = "Color")
-    override fun setNavigationBarColor(
-        view: Screen,
-        navigationBarColor: Int?,
-    ) {
-        logNotAvailable("navigationBarColor")
-    }
-
-    @ReactProp(name = "navigationBarTranslucent")
-    override fun setNavigationBarTranslucent(
-        view: Screen,
-        navigationBarTranslucent: Boolean,
-    ) {
-        logNotAvailable("navigationBarTranslucent")
-    }
-
-    @ReactProp(name = "navigationBarHidden")
     override fun setNavigationBarHidden(
         view: Screen,
         navigationBarHidden: Boolean,
@@ -253,7 +203,6 @@ open class ScreenViewManager :
         view.isNavigationBarHidden = navigationBarHidden
     }
 
-    @ReactProp(name = "nativeBackButtonDismissalEnabled")
     override fun setNativeBackButtonDismissalEnabled(
         view: Screen,
         nativeBackButtonDismissalEnabled: Boolean,
@@ -261,7 +210,6 @@ open class ScreenViewManager :
         view.nativeBackButtonDismissalEnabled = nativeBackButtonDismissalEnabled
     }
 
-    @ReactProp(name = "sheetElevation")
     override fun setSheetElevation(
         view: Screen?,
         value: Int,
@@ -269,7 +217,6 @@ open class ScreenViewManager :
         view?.sheetElevation = value.toFloat()
     }
 
-    @ReactProp(name = "sheetShouldOverflowTopInset")
     override fun setSheetShouldOverflowTopInset(
         view: Screen?,
         sheetShouldOverflowTopInset: Boolean,
@@ -277,7 +224,6 @@ open class ScreenViewManager :
         view?.sheetShouldOverflowTopInset = sheetShouldOverflowTopInset
     }
 
-    @ReactProp(name = "sheetDefaultResizeAnimationEnabled")
     override fun setSheetDefaultResizeAnimationEnabled(
         view: Screen?,
         sheetDefaultResizeAnimationEnabled: Boolean,
@@ -287,6 +233,26 @@ open class ScreenViewManager :
 
     // mark: iOS-only
     // these props are not available on Android, however we must override their setters
+    override fun setStatusBarColor(
+        view: Screen,
+        value: Int?,
+    ) = Unit
+
+    override fun setStatusBarTranslucent(
+        view: Screen,
+        value: Boolean,
+    ) = Unit
+
+    override fun setNavigationBarColor(
+        view: Screen,
+        value: Int?,
+    ) = Unit
+
+    override fun setNavigationBarTranslucent(
+        view: Screen,
+        value: Boolean,
+    ) = Unit
+
     override fun setFullScreenSwipeEnabled(
         view: Screen?,
         value: String?,
@@ -369,7 +335,6 @@ open class ScreenViewManager :
         value: Boolean,
     ) = Unit // represents a feature flag and is checked via getProps() in RNSScreenComponentDescriptor.h
 
-    @ReactProp(name = "sheetAllowedDetents")
     override fun setSheetAllowedDetents(
         view: Screen,
         value: ReadableArray?,
@@ -384,7 +349,6 @@ open class ScreenViewManager :
         view.sheetDetents = SheetDetents(parsedDetents)
     }
 
-    @ReactProp(name = "sheetLargestUndimmedDetent")
     override fun setSheetLargestUndimmedDetent(
         view: Screen,
         value: Int,
@@ -393,7 +357,6 @@ open class ScreenViewManager :
         view.sheetLargestUndimmedDetentIndex = value
     }
 
-    @ReactProp(name = "sheetGrabberVisible")
     override fun setSheetGrabberVisible(
         view: Screen,
         value: Boolean,
@@ -401,7 +364,6 @@ open class ScreenViewManager :
         view.isSheetGrabberVisible = value
     }
 
-    @ReactProp(name = "sheetCornerRadius")
     override fun setSheetCornerRadius(
         view: Screen,
         value: Float,
@@ -409,7 +371,6 @@ open class ScreenViewManager :
         view.sheetCornerRadius = value
     }
 
-    @ReactProp(name = "sheetExpandsWhenScrolledToEdge")
     override fun setSheetExpandsWhenScrolledToEdge(
         view: Screen,
         value: Boolean,
@@ -417,7 +378,6 @@ open class ScreenViewManager :
         view.sheetExpandsWhenScrolledToEdge = value
     }
 
-    @ReactProp(name = "sheetInitialDetent")
     override fun setSheetInitialDetent(
         view: Screen,
         value: Int,

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

@@ -41,33 +41,24 @@ class ScreensModule(
 
     override fun invalidate() {
         super.invalidate()
-        if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-            proxy?.invalidateNative()
-            proxy = null
-
-            reactContext.removeLifecycleEventListener(this)
-        }
+        proxy?.invalidateNative()
+        proxy = null
+        reactContext.removeLifecycleEventListener(this)
         nativeUninstall()
     }
 
     override fun initialize() {
         super.initialize()
-        if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-            proxy = NativeProxy()
-
-            reactContext.addLifecycleEventListener(this)
-
-            setupFabric()
-        }
+        proxy = NativeProxy()
+        reactContext.addLifecycleEventListener(this)
+        setupFabric()
     }
 
     private fun setupFabric() {
-        if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-            val fabricUIManager =
-                UIManagerHelper.getUIManager(reactContext, UIManagerType.FABRIC) as FabricUIManager
-            proxy?.apply {
-                nativeAddMutationsListener(fabricUIManager)
-            }
+        val fabricUIManager =
+            UIManagerHelper.getUIManager(reactContext, UIManagerType.FABRIC) as FabricUIManager
+        proxy?.apply {
+            nativeAddMutationsListener(fabricUIManager)
         }
     }
 
@@ -148,18 +139,14 @@ class ScreensModule(
     // LifecycleEventListener
 
     override fun onHostResume() {
-        if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-            setupFabric()
-        }
+        setupFabric()
     }
 
     override fun onHostPause() = Unit
 
     override fun onHostDestroy() {
-        if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-            proxy?.apply {
-                cleanupExpiredMountingCoordinators()
-            }
+        proxy?.apply {
+            cleanupExpiredMountingCoordinators()
         }
     }
 

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

@@ -1,12 +1,10 @@
 package com.swmansion.rnscreens
 
-import android.util.Log
 import com.facebook.react.bridge.JSApplicationIllegalArgumentException
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.ViewManagerDelegate
-import com.facebook.react.uimanager.annotations.ReactProp
 import com.facebook.react.viewmanagers.RNSSearchBarManagerDelegate
 import com.facebook.react.viewmanagers.RNSSearchBarManagerInterface
 import com.swmansion.rnscreens.events.SearchBarBlurEvent
@@ -37,7 +35,6 @@ class SearchBarManager :
         view.onUpdate()
     }
 
-    @ReactProp(name = "autoCapitalize")
     override fun setAutoCapitalize(
         view: SearchBarView,
         autoCapitalize: String?,
@@ -54,7 +51,6 @@ class SearchBarManager :
             }
     }
 
-    @ReactProp(name = "autoFocus")
     override fun setAutoFocus(
         view: SearchBarView,
         autoFocus: Boolean,
@@ -62,7 +58,6 @@ class SearchBarManager :
         view.autoFocus = autoFocus
     }
 
-    @ReactProp(name = "barTintColor", customType = "Color")
     override fun setBarTintColor(
         view: SearchBarView,
         color: Int?,
@@ -70,7 +65,6 @@ class SearchBarManager :
         view.tintColor = color
     }
 
-    @ReactProp(name = "disableBackButtonOverride")
     override fun setDisableBackButtonOverride(
         view: SearchBarView,
         disableBackButtonOverride: Boolean,
@@ -78,7 +72,6 @@ class SearchBarManager :
         view.shouldOverrideBackButton = disableBackButtonOverride != true
     }
 
-    @ReactProp(name = "inputType")
     override fun setInputType(
         view: SearchBarView,
         inputType: String?,
@@ -95,7 +88,6 @@ class SearchBarManager :
             }
     }
 
-    @ReactProp(name = "placeholder")
     override fun setPlaceholder(
         view: SearchBarView,
         placeholder: String?,
@@ -105,7 +97,6 @@ class SearchBarManager :
         }
     }
 
-    @ReactProp(name = "textColor", customType = "Color")
     override fun setTextColor(
         view: SearchBarView,
         color: Int?,
@@ -113,7 +104,6 @@ class SearchBarManager :
         view.textColor = color
     }
 
-    @ReactProp(name = "headerIconColor", customType = "Color")
     override fun setHeaderIconColor(
         view: SearchBarView,
         color: Int?,
@@ -121,7 +111,6 @@ class SearchBarManager :
         view.headerIconColor = color
     }
 
-    @ReactProp(name = "hintTextColor", customType = "Color")
     override fun setHintTextColor(
         view: SearchBarView,
         color: Int?,
@@ -129,7 +118,6 @@ class SearchBarManager :
         view.hintTextColor = color
     }
 
-    @ReactProp(name = "shouldShowHintSearchIcon")
     override fun setShouldShowHintSearchIcon(
         view: SearchBarView,
         shouldShowHintSearchIcon: Boolean,
@@ -151,10 +139,6 @@ class SearchBarManager :
         const val REACT_CLASS = "RNSSearchBar"
     }
 
-    private fun logNotAvailable(propName: String) {
-        Log.w("[RNScreens]", "$propName prop is not available on Android")
-    }
-
     // NativeCommands
 
     override fun blur(view: SearchBarView?) {
@@ -192,49 +176,35 @@ class SearchBarManager :
     override fun setPlacement(
         view: SearchBarView,
         placeholder: String?,
-    ) {
-        logNotAvailable("setPlacement")
-    }
+    ) = Unit
 
     override fun setAllowToolbarIntegration(
         view: SearchBarView,
         value: Boolean,
-    ) {
-        logNotAvailable("allowToolbarIntegration")
-    }
+    ) = Unit
 
     override fun setHideWhenScrolling(
         view: SearchBarView?,
         value: Boolean,
-    ) {
-        logNotAvailable("hideWhenScrolling")
-    }
+    ) = Unit
 
     override fun setObscureBackground(
         view: SearchBarView?,
         value: String?,
-    ) {
-        logNotAvailable("obscureBackground")
-    }
+    ) = Unit
 
     override fun setHideNavigationBar(
         view: SearchBarView?,
         value: String?,
-    ) {
-        logNotAvailable("hideNavigationBar")
-    }
+    ) = Unit
 
     override fun setCancelButtonText(
         view: SearchBarView?,
         value: String?,
-    ) {
-        logNotAvailable("cancelButtonText")
-    }
+    ) = Unit
 
     override fun setTintColor(
         view: SearchBarView?,
         value: Int?,
-    ) {
-        logNotAvailable("tintColor")
-    }
+    ) = Unit
 }

package/android/src/main/java/com/swmansion/rnscreens/bottomsheet/SheetUtils.kt

@@ -6,7 +6,6 @@ import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_COLLAPS
 import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_EXPANDED
 import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_HALF_EXPANDED
 import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_HIDDEN
-import com.swmansion.rnscreens.BuildConfig
 import com.swmansion.rnscreens.Screen
 import com.swmansion.rnscreens.ext.asScreenStackFragment
 
@@ -138,28 +137,13 @@ fun Screen.isSheetFitToContents(): Boolean =
 fun Screen.usesFormSheetPresentation(): Boolean = stackPresentation === Screen.StackPresentation.FORM_SHEET
 
 fun Screen.requiresEnterTransitionPostponing(): Boolean {
-    // On old architecture the content wrapper might not have received its frame yet,
-    // which is required to determine height of the sheet after animation. Therefore
-    // we delay the transition and trigger it after views receive the layout.
-    // This is used only for formSheet presentation, because we use value animators
-    // there. Tween animations have some magic way to make this work (maybe they
-    // postpone the transition internally, dunno).
-    //
     // On Fabric, system insets are applied after the initial layout pass. However,
     // the BottomSheet height might be measured earlier due to internal BottomSheet logic
     // or layout callbacks, before those insets are applied.
     // To ensure the BottomSheet height respects the top inset we delay starting the enter
     // transition until both layout and insets are fully applied.
 
-    if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED && !this.sheetShouldOverflowTopInset && this.usesFormSheetPresentation()) {
-        return true
-    }
-
-    if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED || !this.usesFormSheetPresentation()) {
-        return false
-    }
-    // Assumes that formSheet uses content wrapper
-    return !this.isLaidOutOrHasCachedLayout() || this.contentWrapper?.isLaidOutOrHasCachedLayout() != true
+    return !this.sheetShouldOverflowTopInset && this.usesFormSheetPresentation()
 }
 
 fun Screen.sheetShouldUseDimmingView(): Boolean {

package/android/src/main/java/com/swmansion/rnscreens/ext/ViewExt.kt

@@ -52,3 +52,7 @@ internal fun View.findFragmentOrNull(): Fragment? =
  * before being attached to window.
  */
 internal fun View.isMeasured(): Boolean = this.measuredWidth != 0 || this.measuredHeight != 0 || this.isLaidOut
+
+internal fun View.detachFromCurrentParent() {
+    (parent as? ViewGroup)?.removeView(this)
+}

package/android/src/main/java/com/swmansion/rnscreens/gamma/common/ShadowStateProxy.kt

@@ -0,0 +1,58 @@
+package com.swmansion.rnscreens.gamma.common
+
+import com.facebook.react.bridge.WritableNativeMap
+import com.facebook.react.uimanager.PixelUtil
+import com.facebook.react.uimanager.StateWrapper
+import kotlin.math.abs
+
+internal class ShadowStateProxy(
+    private val includesFrameSize: Boolean = true,
+) {
+    internal var stateWrapper: StateWrapper? = null
+
+    private var lastFrameWidthInDp: Float = 0f
+    private var lastFrameHeightInDp: Float = 0f
+    private var lastContentOffsetXInDp: Float = 0f
+    private var lastContentOffsetYInDp: Float = 0f
+
+    fun updateStateIfNeeded(
+        frameWidth: Int? = null,
+        frameHeight: Int? = null,
+        contentOffsetX: Int? = null,
+        contentOffsetY: Int? = null,
+    ) {
+        val widthInDp = frameWidth?.let { PixelUtil.toDIPFromPixel(it.toFloat()) } ?: lastFrameWidthInDp
+        val heightInDp = frameHeight?.let { PixelUtil.toDIPFromPixel(it.toFloat()) } ?: lastFrameHeightInDp
+        val offsetXInDp = contentOffsetX?.let { PixelUtil.toDIPFromPixel(it.toFloat()) } ?: lastContentOffsetXInDp
+        val offsetYInDp = contentOffsetY?.let { PixelUtil.toDIPFromPixel(it.toFloat()) } ?: lastContentOffsetYInDp
+
+        if (
+            abs(lastFrameWidthInDp - widthInDp) < DELTA &&
+            abs(lastFrameHeightInDp - heightInDp) < DELTA &&
+            abs(lastContentOffsetXInDp - offsetXInDp) < DELTA &&
+            abs(lastContentOffsetYInDp - offsetYInDp) < DELTA
+        ) {
+            return
+        }
+
+        lastFrameWidthInDp = widthInDp
+        lastFrameHeightInDp = heightInDp
+        lastContentOffsetXInDp = offsetXInDp
+        lastContentOffsetYInDp = offsetYInDp
+
+        val map =
+            WritableNativeMap().apply {
+                if (includesFrameSize) {
+                    putDouble("frameWidth", widthInDp.toDouble())
+                    putDouble("frameHeight", heightInDp.toDouble())
+                }
+                putDouble("contentOffsetX", offsetXInDp.toDouble())
+                putDouble("contentOffsetY", offsetYInDp.toDouble())
+            }
+        stateWrapper?.updateState(map)
+    }
+
+    companion object {
+        private const val DELTA = 0.1f
+    }
+}

package/android/src/main/java/com/swmansion/rnscreens/gamma/common/colorscheme/ColorScheme.kt

@@ -0,0 +1,7 @@
+package com.swmansion.rnscreens.gamma.common.colorscheme
+
+internal enum class ColorScheme {
+    INHERIT,
+    LIGHT,
+    DARK,
+}

package/android/src/main/java/com/swmansion/rnscreens/gamma/common/colorscheme/ColorSchemeCoordinator.kt

@@ -0,0 +1,120 @@
+package com.swmansion.rnscreens.gamma.common.colorscheme
+
+import android.content.res.Configuration
+import android.view.View
+import android.view.ViewParent
+import kotlin.properties.Delegates
+
+internal typealias OnUiNightModeResolvedCallback = (nightMode: Int) -> Unit
+
+internal class ColorSchemeCoordinator :
+    ColorSchemeProviding,
+    ColorSchemeListener {
+    internal var colorScheme: ColorScheme by Delegates.observable(ColorScheme.INHERIT) { _, oldValue, newValue ->
+        if (oldValue != newValue) {
+            applyResolvedColorScheme()
+        }
+    }
+    private var parentProvider: ColorSchemeProviding? = null
+    private var systemUiNightMode: Int = Configuration.UI_MODE_NIGHT_NO
+    private var lastAppliedUiNightMode: Int? = null
+    private val childListeners = mutableListOf<ColorSchemeListener>()
+    private var isSetUp = false
+
+    /**
+     * Callback invoked when color scheme changes. It should be used to adapt
+     * view's appearance to the current mode.
+     *
+     * The [Int] parameter represents the resolved night mode value. It can be
+     * one of [Configuration.UI_MODE_NIGHT_UNDEFINED], [Configuration.UI_MODE_NIGHT_NO]
+     * or [Configuration.UI_MODE_NIGHT_YES].
+     *
+     * This callback is invoked only if the value has changed. The change is propagated
+     * in top-down order.
+     */
+    internal var onUiNightModeResolved: OnUiNightModeResolvedCallback? = null
+
+    override fun getResolvedUiNightMode(): Int =
+        when (colorScheme) {
+            ColorScheme.LIGHT -> Configuration.UI_MODE_NIGHT_NO
+            ColorScheme.DARK -> Configuration.UI_MODE_NIGHT_YES
+            ColorScheme.INHERIT ->
+                parentProvider?.getResolvedUiNightMode()
+                    ?: systemUiNightMode
+        }
+
+    /**
+     * Initializes the color scheme resolution for the given [hostView]
+     * with [onUiNightModeResolvedCallback].
+     *
+     * Must be called after the view is attached to the window.
+     * Must not be called again without calling [teardown] first.
+     */
+    internal fun setup(
+        hostView: View,
+        onUiNightModeResolvedCallback: OnUiNightModeResolvedCallback?,
+    ) {
+        check(!isSetUp) {
+            "[RNScreens] ColorSchemeCoordinator's setup method must not be called again without calling teardown() first."
+        }
+
+        systemUiNightMode =
+            hostView.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK
+        parentProvider = findParentColorSchemeProvider(hostView)
+        parentProvider?.addColorSchemeListener(this)
+        onUiNightModeResolved = onUiNightModeResolvedCallback
+        isSetUp = true
+
+        // Reset last applied value so the initial callback is always invoked after setup.
+        // This is necessary because `colorScheme` could've been set before `setup` method
+        // is called.
+        lastAppliedUiNightMode = null
+
+        applyResolvedColorScheme()
+    }
+
+    internal fun teardown() {
+        parentProvider?.removeColorSchemeListener(this)
+        onUiNightModeResolved = null
+        parentProvider = null
+        lastAppliedUiNightMode = null
+        isSetUp = false
+    }
+
+    internal fun onConfigurationChanged(configuration: Configuration?) {
+        systemUiNightMode = configuration?.uiMode?.and(Configuration.UI_MODE_NIGHT_MASK) ?: Configuration.UI_MODE_NIGHT_UNDEFINED
+        applyResolvedColorScheme()
+    }
+
+    override fun onParentUiNightModeChanged() {
+        if (colorScheme == ColorScheme.INHERIT) {
+            applyResolvedColorScheme()
+        }
+    }
+
+    override fun addColorSchemeListener(listener: ColorSchemeListener) {
+        childListeners.add(listener)
+    }
+
+    override fun removeColorSchemeListener(listener: ColorSchemeListener) {
+        childListeners.remove(listener)
+    }
+
+    private fun applyResolvedColorScheme() {
+        val resolved = getResolvedUiNightMode()
+        if (resolved == lastAppliedUiNightMode) return
+        lastAppliedUiNightMode = resolved
+
+        onUiNightModeResolved?.invoke(resolved)
+        childListeners.forEach { it.onParentUiNightModeChanged() }
+    }
+
+    private fun findParentColorSchemeProvider(hostView: View): ColorSchemeProviding? {
+        var current: ViewParent? = hostView.parent
+        while (current != null) {
+            if (current is ColorSchemeProviding) return current
+            current = current.parent
+        }
+        return null
+    }
+}