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

package/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/host/event/TabsHostTabSelectedEvent.kt

@@ -0,0 +1,49 @@
+package com.swmansion.rnscreens.gamma.tabs.host.event
+
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.uimanager.events.Event
+import com.swmansion.rnscreens.gamma.common.event.NamingAwareEventType
+import com.swmansion.rnscreens.gamma.tabs.container.TabsActionOrigin
+
+class TabsHostTabSelectedEvent(
+    surfaceId: Int,
+    viewId: Int,
+    val selectedScreenKey: String,
+    val provenance: Int,
+    val isRepeated: Boolean,
+    val hasTriggeredSpecialEffect: Boolean,
+    val actionOrigin: TabsActionOrigin,
+) : Event<TabsHostTabSelectedEvent>(surfaceId, viewId),
+    NamingAwareEventType {
+    override fun getEventName() = EVENT_NAME
+
+    override fun getEventRegistrationName() = EVENT_REGISTRATION_NAME
+
+    // This event should never be coalesced. It informs JS side of all navigation events that happen.
+    override fun canCoalesce(): Boolean = false
+
+    override fun getEventData(): WritableMap? =
+        Arguments.createMap().apply {
+            putString(EK_SELECTED_KEY, selectedScreenKey)
+            putInt(EK_PROVENANCE, provenance)
+            putBoolean(EK_IS_REPEATED, isRepeated)
+            putBoolean(EK_HAS_TRIGGERED_SPECIAL_EFFECT, hasTriggeredSpecialEffect)
+            putString(EK_ACTION_ORIGIN, actionOrigin.toString())
+        }
+
+    companion object : NamingAwareEventType {
+        const val EVENT_NAME = "topTabSelected"
+        const val EVENT_REGISTRATION_NAME = "onTabSelected"
+
+        private const val EK_SELECTED_KEY = "selectedScreenKey"
+        private const val EK_PROVENANCE = "provenance"
+        private const val EK_IS_REPEATED = "isRepeated"
+        private const val EK_HAS_TRIGGERED_SPECIAL_EFFECT = "hasTriggeredSpecialEffect"
+        private const val EK_ACTION_ORIGIN = "actionOrigin"
+
+        override fun getEventName() = EVENT_NAME
+
+        override fun getEventRegistrationName() = EVENT_REGISTRATION_NAME
+    }
+}

package/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/host/event/TabsHostTabSelectionPreventedEvent.kt

@@ -0,0 +1,47 @@
+package com.swmansion.rnscreens.gamma.tabs.host.event
+
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.uimanager.events.Event
+import com.swmansion.rnscreens.gamma.common.event.NamingAwareEventType
+import com.swmansion.rnscreens.gamma.tabs.container.TabsNavigationState
+
+/**
+ * React Native event dispatched to JS when a tab selection is prevented because the target
+ * screen has `preventNativeSelection` enabled.
+ *
+ * This event is never coalesced — every prevention is delivered individually.
+ */
+class TabsHostTabSelectionPreventedEvent(
+    surfaceId: Int,
+    viewId: Int,
+    val currentNavState: TabsNavigationState,
+    val preventedScreenKey: String,
+) : Event<TabsHostTabSelectionPreventedEvent>(surfaceId, viewId),
+    NamingAwareEventType {
+    override fun getEventName() = EVENT_NAME
+
+    override fun getEventRegistrationName() = EVENT_REGISTRATION_NAME
+
+    override fun canCoalesce(): Boolean = false
+
+    override fun getEventData(): WritableMap? =
+        Arguments.createMap().apply {
+            putString(EK_SELECTED_KEY, currentNavState.selectedScreenKey)
+            putInt(EK_PROVENANCE, currentNavState.provenance)
+            putString(EK_PREVENTED_KEY, preventedScreenKey)
+        }
+
+    companion object : NamingAwareEventType {
+        const val EVENT_NAME = "topTabSelectionPrevented"
+        const val EVENT_REGISTRATION_NAME = "onTabSelectionPrevented"
+
+        private const val EK_SELECTED_KEY = "selectedScreenKey"
+        private const val EK_PROVENANCE = "provenance"
+        private const val EK_PREVENTED_KEY = "preventedScreenKey"
+
+        override fun getEventName() = EVENT_NAME
+
+        override fun getEventRegistrationName() = EVENT_REGISTRATION_NAME
+    }
+}

package/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/host/event/TabsHostTabSelectionRejectedEvent.kt

@@ -0,0 +1,56 @@
+package com.swmansion.rnscreens.gamma.tabs.host.event
+
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.uimanager.events.Event
+import com.swmansion.rnscreens.gamma.common.event.NamingAwareEventType
+import com.swmansion.rnscreens.gamma.tabs.container.TabsNavigationState
+import com.swmansion.rnscreens.gamma.tabs.container.TabsNavigationStateRejectionReason
+import com.swmansion.rnscreens.gamma.tabs.container.TabsNavigationStateUpdateRequest
+
+/**
+ * React Native event dispatched to JS when a tab selection request is rejected by the container.
+ *
+ * Carries the currently active navigation state ([currentNavState]), the rejected request
+ * ([rejectedRequest]), and the [rejectionReason]. This event is never coalesced — every
+ * rejection is delivered individually so the JS side has a complete picture of state transitions.
+ */
+class TabsHostTabSelectionRejectedEvent(
+    surfaceId: Int,
+    viewId: Int,
+    val currentNavState: TabsNavigationState,
+    val rejectedRequest: TabsNavigationStateUpdateRequest,
+    val rejectionReason: TabsNavigationStateRejectionReason,
+) : Event<TabsHostTabSelectionRejectedEvent>(surfaceId, viewId),
+    NamingAwareEventType {
+    override fun getEventName() = EVENT_NAME
+
+    override fun getEventRegistrationName() = EVENT_REGISTRATION_NAME
+
+    // This event should never be coalesced. It informs JS side of all navigation events that happen.
+    override fun canCoalesce(): Boolean = false
+
+    override fun getEventData(): WritableMap? =
+        Arguments.createMap().apply {
+            putString(EK_SELECTED_KEY, currentNavState.selectedScreenKey)
+            putInt(EK_PROVENANCE, currentNavState.provenance)
+            putString(EK_REJECTED_KEY, rejectedRequest.selectedScreenKey)
+            putInt(EK_REJECTED_PROVENANCE, rejectedRequest.baseProvenance)
+            putString(EK_REJECTION_REASON, rejectionReason.toString())
+        }
+
+    companion object : NamingAwareEventType {
+        const val EVENT_NAME = "topTabSelectionRejected"
+        const val EVENT_REGISTRATION_NAME = "onTabSelectionRejected"
+
+        private const val EK_SELECTED_KEY = "selectedScreenKey"
+        private const val EK_PROVENANCE = "provenance"
+        private const val EK_REJECTED_KEY = "rejectedScreenKey"
+        private const val EK_REJECTED_PROVENANCE = "rejectedProvenance"
+        private const val EK_REJECTION_REASON = "rejectionReason"
+
+        override fun getEventName() = EVENT_NAME
+
+        override fun getEventRegistrationName() = EVENT_REGISTRATION_NAME
+    }
+}

package/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/{TabsScreen.kt → screen/TabsScreen.kt}

@@ -1,4 +1,4 @@
-package com.swmansion.rnscreens.gamma.tabs
+package com.swmansion.rnscreens.gamma.tabs.screen
 
 import android.content.res.Configuration
 import android.graphics.drawable.Drawable
@@ -7,6 +7,7 @@ import androidx.fragment.app.Fragment
 import com.facebook.react.uimanager.ThemedReactContext
 import com.swmansion.rnscreens.gamma.common.FragmentProviding
 import com.swmansion.rnscreens.gamma.helpers.getSystemDrawableResource
+import com.swmansion.rnscreens.gamma.tabs.appearance.TabsAppearance
 import com.swmansion.rnscreens.utils.RNSLog
 import java.lang.ref.WeakReference
 import kotlin.properties.Delegates
@@ -30,7 +31,7 @@ class TabsScreen(
 
     internal lateinit var eventEmitter: TabsScreenEventEmitter
 
-    var tabKey: String? = null
+    var screenKey: String? = null
         set(value) {
             field =
                 if (value?.isBlank() == true) {
@@ -40,20 +41,23 @@ class TabsScreen(
                 }
         }
 
+    internal val requireScreenKey: String
+        get() = checkNotNull(screenKey) { "[RNScreens] screenKey MUST NOT be null" }
+
     var tabTitle: String? by Delegates.observable(null) { _, oldValue, newValue ->
         updateMenuItemAttributesIfNeeded(oldValue, newValue)
     }
 
-    // Badge
-    var badgeValue: String? by Delegates.observable(null) { _, oldValue, newValue ->
-        updateMenuItemAttributesIfNeeded(oldValue, newValue)
-    }
+    // Appearance
 
-    var tabBarItemBadgeTextColor: Int? by Delegates.observable(null) { _, oldValue, newValue ->
-        updateMenuItemAttributesIfNeeded(oldValue, newValue)
+    internal var appearance: TabsAppearance? by Delegates.observable(null) { _, oldValue, newValue ->
+        if (oldValue != newValue) {
+            tabsScreenDelegate.get()?.onAppearanceChanged(this)
+        }
     }
 
-    var tabBarItemBadgeBackgroundColor: Int? by Delegates.observable(null) { _, oldValue, newValue ->
+    // Badge
+    var badgeValue: String? by Delegates.observable(null) { _, oldValue, newValue ->
         updateMenuItemAttributesIfNeeded(oldValue, newValue)
     }
 
@@ -73,13 +77,25 @@ class TabsScreen(
         }
     }
 
+    var selectedDrawableIconResourceName: String? by Delegates.observable(null) { _, oldValue, newValue ->
+        if (newValue != oldValue) {
+            selectedIcon = getSystemDrawableResource(reactContext, newValue)
+        }
+    }
+
     var icon: Drawable? by Delegates.observable(null) { _, oldValue, newValue ->
         updateMenuItemAttributesIfNeeded(oldValue, newValue)
     }
 
+    var selectedIcon: Drawable? by Delegates.observable(null) { _, oldValue, newValue ->
+        updateMenuItemAttributesIfNeeded(oldValue, newValue)
+    }
+
     var shouldUseRepeatedTabSelectionScrollToTopSpecialEffect: Boolean = true
     var shouldUseRepeatedTabSelectionPopToRootSpecialEffect: Boolean = true
 
+    var preventNativeSelection: Boolean = false
+
     private fun <T> updateMenuItemAttributesIfNeeded(
         oldValue: T,
         newValue: T,
@@ -94,24 +110,12 @@ class TabsScreen(
         super.onAttachedToWindow()
     }
 
-    var isFocusedTab: Boolean = false
-        set(value) {
-            if (field != value) {
-                field = value
-                onTabFocusChangedFromJS()
-            }
-        }
-
     internal fun setTabsScreenDelegate(delegate: TabsScreenDelegate?) {
         tabsScreenDelegate = WeakReference(delegate)
     }
 
     override fun getAssociatedFragment(): Fragment? = tabsScreenDelegate.get()?.getFragmentForTabsScreen(this)
 
-    private fun onTabFocusChangedFromJS() {
-        tabsScreenDelegate.get()?.onTabFocusChangedFromJS(this, isFocusedTab)
-    }
-
     private fun onMenuItemAttributesChange() {
         tabsScreenDelegate.get()?.onMenuItemAttributesChange(this)
     }

package/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/{TabsScreenDelegate.kt → screen/TabsScreenDelegate.kt}

@@ -1,13 +1,10 @@
-package com.swmansion.rnscreens.gamma.tabs
+package com.swmansion.rnscreens.gamma.tabs.screen
 
 import android.content.res.Configuration
 import androidx.fragment.app.Fragment
 
 internal interface TabsScreenDelegate {
-    fun onTabFocusChangedFromJS(
-        tabsScreen: TabsScreen,
-        isFocused: Boolean,
-    )
+    fun onAppearanceChanged(tabsScreen: TabsScreen)
 
     fun onMenuItemAttributesChange(tabsScreen: TabsScreen)
 

package/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/{TabsScreenEventEmitter.kt → screen/TabsScreenEventEmitter.kt}

@@ -1,12 +1,12 @@
-package com.swmansion.rnscreens.gamma.tabs
+package com.swmansion.rnscreens.gamma.tabs.screen
 
 import com.facebook.react.bridge.ReactContext
 import com.swmansion.rnscreens.gamma.common.event.BaseEventEmitter
-import com.swmansion.rnscreens.gamma.tabs.TabsScreenEventEmitter.Companion.TAG
-import com.swmansion.rnscreens.gamma.tabs.event.TabsScreenDidAppearEvent
-import com.swmansion.rnscreens.gamma.tabs.event.TabsScreenDidDisappearEvent
-import com.swmansion.rnscreens.gamma.tabs.event.TabsScreenWillAppearEvent
-import com.swmansion.rnscreens.gamma.tabs.event.TabsScreenWillDisappearEvent
+import com.swmansion.rnscreens.gamma.tabs.screen.TabsScreenEventEmitter.Companion.TAG
+import com.swmansion.rnscreens.gamma.tabs.screen.event.TabsScreenDidAppearEvent
+import com.swmansion.rnscreens.gamma.tabs.screen.event.TabsScreenDidDisappearEvent
+import com.swmansion.rnscreens.gamma.tabs.screen.event.TabsScreenWillAppearEvent
+import com.swmansion.rnscreens.gamma.tabs.screen.event.TabsScreenWillDisappearEvent
 import com.swmansion.rnscreens.utils.RNSLog
 
 internal class TabsScreenEventEmitter(

package/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/{TabsScreenFragment.kt → screen/TabsScreenFragment.kt}

@@ -1,4 +1,4 @@
-package com.swmansion.rnscreens.gamma.tabs
+package com.swmansion.rnscreens.gamma.tabs.screen
 
 import android.content.res.Configuration
 import android.os.Bundle
@@ -10,6 +10,9 @@ import androidx.fragment.app.Fragment
 class TabsScreenFragment(
     internal val tabsScreen: TabsScreen,
 ) : Fragment() {
+    internal val requireScreenKey: String by tabsScreen::requireScreenKey
+    internal val isPreventNativeSelectionEnabled: Boolean by tabsScreen::preventNativeSelection
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,

package/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/screen/TabsScreenViewManager.kt

@@ -0,0 +1,234 @@
+package com.swmansion.rnscreens.gamma.tabs.screen
+
+import android.util.Log
+import androidx.core.graphics.toColorInt
+import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.ReadableType
+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.viewmanagers.RNSTabsScreenAndroidManagerDelegate
+import com.facebook.react.viewmanagers.RNSTabsScreenAndroidManagerInterface
+import com.swmansion.rnscreens.gamma.helpers.loadImage
+import com.swmansion.rnscreens.gamma.helpers.makeEventRegistrationInfo
+import com.swmansion.rnscreens.gamma.tabs.appearance.ItemStateAppearance
+import com.swmansion.rnscreens.gamma.tabs.appearance.TabsAppearance
+import com.swmansion.rnscreens.gamma.tabs.screen.TabsScreenViewManager.Companion.TAG
+import com.swmansion.rnscreens.gamma.tabs.screen.event.TabsScreenDidAppearEvent
+import com.swmansion.rnscreens.gamma.tabs.screen.event.TabsScreenDidDisappearEvent
+import com.swmansion.rnscreens.gamma.tabs.screen.event.TabsScreenWillAppearEvent
+import com.swmansion.rnscreens.gamma.tabs.screen.event.TabsScreenWillDisappearEvent
+import com.swmansion.rnscreens.utils.RNSLog
+
+@ReactModule(name = TabsScreenViewManager.REACT_CLASS)
+class TabsScreenViewManager :
+    ViewGroupManager<TabsScreen>(),
+    RNSTabsScreenAndroidManagerInterface<TabsScreen> {
+    private val delegate: ViewManagerDelegate<TabsScreen> = RNSTabsScreenAndroidManagerDelegate<TabsScreen, TabsScreenViewManager>(this)
+
+    override fun getName() = REACT_CLASS
+
+    var context: ThemedReactContext? = null
+
+    override fun createViewInstance(reactContext: ThemedReactContext): TabsScreen {
+        RNSLog.d(REACT_CLASS, "createViewInstance")
+        return TabsScreen(reactContext)
+    }
+
+    override fun getDelegate() = delegate
+
+    override fun getExportedCustomDirectEventTypeConstants(): MutableMap<String, Any> =
+        mutableMapOf(
+            makeEventRegistrationInfo(TabsScreenWillAppearEvent),
+            makeEventRegistrationInfo(TabsScreenDidAppearEvent),
+            makeEventRegistrationInfo(TabsScreenWillDisappearEvent),
+            makeEventRegistrationInfo(TabsScreenDidDisappearEvent),
+        )
+
+    override fun addEventEmitters(
+        reactContext: ThemedReactContext,
+        view: TabsScreen,
+    ) {
+        super.addEventEmitters(reactContext, view)
+        view.onViewManagerAddEventEmitters()
+    }
+
+    override fun setScreenKey(
+        view: TabsScreen,
+        value: String?,
+    ) {
+        view.screenKey = value
+    }
+
+    override fun setBadgeValue(
+        view: TabsScreen,
+        value: String?,
+    ) {
+        view.badgeValue = value
+    }
+
+    override fun setTitle(
+        view: TabsScreen,
+        value: String?,
+    ) {
+        view.tabTitle = value
+    }
+
+    override fun setSpecialEffects(
+        view: TabsScreen,
+        value: ReadableMap?,
+    ) {
+        var scrollToTop = true
+        var popToRoot = true
+        if (value?.hasKey("repeatedTabSelection") ?: false) {
+            value.getMap("repeatedTabSelection")?.let { repeatedTabSelectionConfig ->
+                if (repeatedTabSelectionConfig.hasKey("scrollToTop")) {
+                    scrollToTop =
+                        repeatedTabSelectionConfig.getBoolean("scrollToTop")
+                }
+                if (repeatedTabSelectionConfig.hasKey("popToRoot")) {
+                    popToRoot =
+                        repeatedTabSelectionConfig.getBoolean("popToRoot")
+                }
+            }
+        }
+        view.shouldUseRepeatedTabSelectionPopToRootSpecialEffect = popToRoot
+        view.shouldUseRepeatedTabSelectionScrollToTopSpecialEffect = scrollToTop
+    }
+
+    override fun setPreventNativeSelection(
+        view: TabsScreen,
+        value: Boolean,
+    ) {
+        view.preventNativeSelection = value
+    }
+
+    override fun setTabBarItemTestID(
+        view: TabsScreen,
+        value: String?,
+    ) {
+        view.tabBarItemTestID = value
+    }
+
+    override fun setTabBarItemAccessibilityLabel(
+        view: TabsScreen,
+        value: String?,
+    ) {
+        view.tabBarItemAccessibilityLabel = value
+    }
+
+    // Android specific
+
+    override fun setDrawableIconResourceName(
+        view: TabsScreen,
+        value: String?,
+    ) {
+        view.drawableIconResourceName = value
+    }
+
+    override fun setSelectedDrawableIconResourceName(
+        view: TabsScreen,
+        value: String?,
+    ) {
+        view.selectedDrawableIconResourceName = value
+    }
+
+    override fun setImageIconResource(
+        view: TabsScreen,
+        value: ReadableMap?,
+    ) {
+        val uri = value?.getString("uri")
+        if (uri != null) {
+            loadImage(view.context, uri) { drawable ->
+                view.icon = drawable
+            }
+        }
+    }
+
+    override fun setSelectedImageIconResource(
+        view: TabsScreen,
+        value: ReadableMap?,
+    ) {
+        val uri = value?.getString("uri")
+        if (uri != null) {
+            loadImage(view.context, uri) { drawable ->
+                view.selectedIcon = drawable
+            }
+        }
+    }
+
+    override fun setStandardAppearance(
+        view: TabsScreen,
+        value: ReadableMap?,
+    ) {
+        if (value == null) {
+            view.appearance = null
+            return
+        }
+
+        view.appearance = parseAndroidTabsAppearance(value)
+    }
+
+    private fun parseAndroidTabsAppearance(appearance: ReadableMap): TabsAppearance =
+        TabsAppearance(
+            tabBarBackgroundColor = appearance.getOptionalColor("tabBarBackgroundColor"),
+            tabBarItemRippleColor = appearance.getOptionalColor("tabBarItemRippleColor"),
+            tabBarItemLabelVisibilityMode = appearance.getOptionalString("tabBarItemLabelVisibilityMode"),
+            normal = if (appearance.hasKey("normal")) parseItemStateAppearance(appearance.getMap("normal")) else null,
+            selected = if (appearance.hasKey("selected")) parseItemStateAppearance(appearance.getMap("selected")) else null,
+            focused = if (appearance.hasKey("focused")) parseItemStateAppearance(appearance.getMap("focused")) else null,
+            disabled = if (appearance.hasKey("disabled")) parseItemStateAppearance(appearance.getMap("disabled")) else null,
+            tabBarItemActiveIndicatorColor = appearance.getOptionalColor("tabBarItemActiveIndicatorColor"),
+            tabBarItemActiveIndicatorEnabled = appearance.getOptionalBoolean("tabBarItemActiveIndicatorEnabled"),
+            tabBarItemTitleFontFamily = appearance.getOptionalString("tabBarItemTitleFontFamily"),
+            tabBarItemTitleSmallLabelFontSize = appearance.getOptionalFloat("tabBarItemTitleSmallLabelFontSize"),
+            tabBarItemTitleLargeLabelFontSize = appearance.getOptionalFloat("tabBarItemTitleLargeLabelFontSize"),
+            tabBarItemTitleFontWeight = appearance.getOptionalString("tabBarItemTitleFontWeight"),
+            tabBarItemTitleFontStyle = appearance.getOptionalString("tabBarItemTitleFontStyle"),
+            tabBarItemBadgeBackgroundColor = appearance.getOptionalColor("tabBarItemBadgeBackgroundColor"),
+            tabBarItemBadgeTextColor = appearance.getOptionalColor("tabBarItemBadgeTextColor"),
+        )
+
+    private fun parseItemStateAppearance(itemStateAppearance: ReadableMap?): ItemStateAppearance? {
+        if (itemStateAppearance == null) return null
+        return ItemStateAppearance(
+            tabBarItemIconColor = itemStateAppearance.getOptionalColor("tabBarItemIconColor"),
+            tabBarItemTitleFontColor = itemStateAppearance.getOptionalColor("tabBarItemTitleFontColor"),
+        )
+    }
+
+    companion object {
+        const val REACT_CLASS = "RNSTabsScreenAndroid"
+        const val TAG = "TabsScreenViewManager"
+    }
+}
+
+private fun ReadableMap.getOptionalBoolean(key: String): Boolean? {
+    if (!hasKey(key) || isNull(key)) return null
+    return if (getType(key) == ReadableType.Boolean) getBoolean(key) else null
+}
+
+private fun ReadableMap.getOptionalString(key: String): String? {
+    if (!hasKey(key) || isNull(key)) return null
+    return if (getType(key) == ReadableType.String) getString(key) else null
+}
+
+private fun ReadableMap.getOptionalFloat(key: String): Float? {
+    if (!hasKey(key) || isNull(key)) return null
+    return if (getType(key) == ReadableType.Number) getDouble(key).toFloat() else null
+}
+
+private fun ReadableMap.getOptionalColor(key: String): Int? {
+    if (!hasKey(key) || isNull(key)) return null
+    return try {
+        when (getType(key)) {
+            ReadableType.Number -> getInt(key)
+            ReadableType.String -> getString(key)?.toColorInt()
+            else -> null
+        }
+    } catch (e: Exception) {
+        Log.w(TAG, "[RNScreens] Could not parse color for key '$key': ${e.message}")
+        null
+    }
+}

package/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/{event → screen/event}/TabsScreenDidAppearEvent.kt

@@ -1,4 +1,4 @@
-package com.swmansion.rnscreens.gamma.tabs.event
+package com.swmansion.rnscreens.gamma.tabs.screen.event
 
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap

package/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/{event → screen/event}/TabsScreenDidDisappearEvent.kt

@@ -1,4 +1,4 @@
-package com.swmansion.rnscreens.gamma.tabs.event
+package com.swmansion.rnscreens.gamma.tabs.screen.event
 
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap

package/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/{event → screen/event}/TabsScreenWillAppearEvent.kt

@@ -1,4 +1,4 @@
-package com.swmansion.rnscreens.gamma.tabs.event
+package com.swmansion.rnscreens.gamma.tabs.screen.event
 
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap

package/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/{event → screen/event}/TabsScreenWillDisappearEvent.kt

@@ -1,4 +1,4 @@
-package com.swmansion.rnscreens.gamma.tabs.event
+package com.swmansion.rnscreens.gamma.tabs.screen.event
 
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap

package/android/src/main/java/com/swmansion/rnscreens/safearea/SafeAreaView.kt

@@ -4,7 +4,6 @@ package com.swmansion.rnscreens.safearea
 
 import android.annotation.SuppressLint
 import android.os.Build
-import android.util.Log
 import android.view.View
 import android.view.ViewTreeObserver
 import androidx.core.graphics.Insets
@@ -15,17 +14,8 @@ import com.facebook.react.bridge.Arguments
 import com.facebook.react.uimanager.PixelUtil
 import com.facebook.react.uimanager.StateWrapper
 import com.facebook.react.uimanager.ThemedReactContext
-import com.facebook.react.uimanager.UIManagerHelper.getReactContext
-import com.facebook.react.uimanager.UIManagerModule
 import com.facebook.react.views.view.ReactViewGroup
-import com.swmansion.rnscreens.BuildConfig
-import com.swmansion.rnscreens.safearea.paper.SafeAreaViewEdges
-import com.swmansion.rnscreens.safearea.paper.SafeAreaViewLocalData
 import java.lang.ref.WeakReference
-import java.util.concurrent.locks.ReentrantLock
-import kotlin.concurrent.withLock
-
-private const val MAX_WAIT_TIME_NANO = 500000000L // 500ms
 
 @SuppressLint("ViewConstructor") // Should never be recreated
 class SafeAreaView(
@@ -173,7 +163,7 @@ class SafeAreaView(
             )
 
         val stateWrapper = getStateWrapper()
-        if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED && stateWrapper != null) {
+        if (stateWrapper != null) {
             val insets = Arguments.createMap()
             insets.putDouble("left", PixelUtil.toDIPFromPixel(safeAreaInsets.left).toDouble())
             insets.putDouble("top", PixelUtil.toDIPFromPixel(safeAreaInsets.top).toDouble())
@@ -184,60 +174,6 @@ class SafeAreaView(
             newState.putMap("insets", insets)
 
             stateWrapper.updateState(newState)
-        } else if (!BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-            val localData =
-                SafeAreaViewLocalData(
-                    insets = safeAreaInsets,
-                    edges = edges ?: SafeAreaViewEdges.ZERO,
-                )
-            val reactContext = getReactContext(this)
-            val uiManager = reactContext.getNativeModule(UIManagerModule::class.java)
-            if (uiManager != null) {
-                uiManager.setViewLocalData(id, localData)
-                // Sadly there doesn't seem to be a way to properly dirty a yoga node from java, so
-                // if we are in the middle of a layout, we need to recompute it. There is also no
-                // way to know whether we are in the middle of a layout so always do it.
-                reactContext.runOnNativeModulesQueueThread {
-                    uiManager.uiImplementation.dispatchViewUpdates(-1)
-                }
-                waitForReactLayout()
-            }
-        }
-    }
-
-    private fun waitForReactLayout() {
-        // Block the main thread until the native module thread is finished with
-        // its current tasks. To do this we use the done boolean as a lock and enqueue
-        // a task on the native modules thread. When the task runs we can unblock the
-        // main thread. This should be safe as long as the native modules thread
-        // does not block waiting on the main thread.
-        var done = false
-        val lock = ReentrantLock()
-        val condition = lock.newCondition()
-        val startTime = System.nanoTime()
-        var waitTime = 0L
-        getReactContext(this).runOnNativeModulesQueueThread {
-            lock.withLock {
-                if (!done) {
-                    done = true
-                    condition.signal()
-                }
-            }
-        }
-        lock.withLock {
-            while (!done && waitTime < MAX_WAIT_TIME_NANO) {
-                try {
-                    condition.awaitNanos(MAX_WAIT_TIME_NANO)
-                } catch (ex: InterruptedException) {
-                    // In case of an interrupt just give up waiting.
-                    done = true
-                }
-                waitTime += System.nanoTime() - startTime
-            }
-        }
-        // Timed out waiting.
-        if (waitTime >= MAX_WAIT_TIME_NANO) {
-            Log.w(TAG, "Timed out waiting for layout.")
         }
     }
 

package/android/src/main/java/com/swmansion/rnscreens/safearea/{paper/SafeAreaViewEdges.kt → SafeAreaViewEdges.kt}

@@ -1,6 +1,6 @@
 // Implementation adapted from `react-native-safe-area-context`:
 // https://github.com/AppAndFlow/react-native-safe-area-context/tree/v5.6.1
-package com.swmansion.rnscreens.safearea.paper
+package com.swmansion.rnscreens.safearea
 
 import com.facebook.react.bridge.ReadableMap