react-native-screens 3.10.1 → 3.12.0

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

@@ -3,7 +3,6 @@ package com.swmansion.rnscreens
 import android.content.Context
 import android.graphics.Canvas
 import android.view.View
-import androidx.fragment.app.FragmentTransaction
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.uimanager.UIManagerModule
 import com.swmansion.rnscreens.Screen.StackAnimation
@@ -110,7 +109,6 @@ class ScreenStack(context: Context?) : ScreenContainer<ScreenStackFragment>(cont
             }
         }
         var shouldUseOpenAnimation = true
-        var transition = FragmentTransaction.TRANSIT_FRAGMENT_OPEN
         var stackAnimation: StackAnimation? = null
         if (!mStack.contains(newTop)) {
             // if new top screen wasn't on stack we do "open animation" so long it is not the very first
@@ -127,17 +125,9 @@ class ScreenStack(context: Context?) : ScreenContainer<ScreenStackFragment>(cont
                 stackAnimation = if (shouldUseOpenAnimation) newTop.screen.stackAnimation else mTopScreen?.screen?.stackAnimation
             } else if (mTopScreen == null && newTop != null) {
                 // mTopScreen was not present before so newTop is the first screen added to a stack
-                // and we don't want the animation when it is entering, but we want to send the
-                // willAppear and Appear events to the user, which won't be sent by default if Screen's
-                // stack animation is not NONE (see check for stackAnimation in onCreateAnimation in
-                // ScreenStackFragment).
-                // We don't do it if the stack is nested since the parent will trigger these events in child
+                // and we don't want the animation when it is entering
                 stackAnimation = StackAnimation.NONE
-                if (newTop.screen.stackAnimation !== StackAnimation.NONE && !isNested) {
-                    goingForward = true
-                    newTop.dispatchOnWillAppear()
-                    newTop.dispatchOnAppear()
-                }
+                goingForward = true
             }
         } else if (mTopScreen != null && mTopScreen != newTop) {
             // otherwise if we are performing top screen change we do "close animation"
@@ -149,40 +139,32 @@ class ScreenStack(context: Context?) : ScreenContainer<ScreenStackFragment>(cont
             // animation logic start
             if (stackAnimation != null) {
                 if (shouldUseOpenAnimation) {
-                    transition = FragmentTransaction.TRANSIT_FRAGMENT_OPEN
                     when (stackAnimation) {
+                        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.FADE_FROM_BOTTOM -> it.setCustomAnimations(R.anim.rns_fade_from_bottom, R.anim.rns_no_animation_350)
-                        else -> {
-                        }
                     }
                 } else {
-                    transition = FragmentTransaction.TRANSIT_FRAGMENT_CLOSE
                     when (stackAnimation) {
+                        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.FADE_FROM_BOTTOM -> it.setCustomAnimations(R.anim.rns_no_animation_250, R.anim.rns_fade_to_bottom)
-                        else -> {
-                        }
                     }
                 }
             }
-            if (stackAnimation === StackAnimation.NONE) {
-                transition = FragmentTransaction.TRANSIT_NONE
-            }
-            if (stackAnimation === StackAnimation.FADE) {
-                transition = FragmentTransaction.TRANSIT_FRAGMENT_FADE
-            }
-            if (stackAnimation != null && isSystemAnimation(stackAnimation)) {
-                it.setTransition(transition)
-            }
+
             // animation logic end
             goingForward = shouldUseOpenAnimation
 
@@ -348,10 +330,6 @@ class ScreenStack(context: Context?) : ScreenContainer<ScreenStackFragment>(cont
     }
 
     companion object {
-        private fun isSystemAnimation(stackAnimation: StackAnimation): Boolean {
-            return stackAnimation === StackAnimation.DEFAULT || stackAnimation === StackAnimation.FADE || stackAnimation === StackAnimation.NONE
-        }
-
         private fun isTransparent(fragment: ScreenStackFragment): Boolean {
             return (
                 fragment.screen.stackPresentation

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

@@ -16,7 +16,6 @@ import android.view.animation.Transformation
 import android.widget.LinearLayout
 import androidx.appcompat.widget.Toolbar
 import androidx.coordinatorlayout.widget.CoordinatorLayout
-import com.facebook.react.bridge.UiThreadUtil
 import com.facebook.react.uimanager.PixelUtil
 import com.google.android.material.appbar.AppBarLayout
 import com.google.android.material.appbar.AppBarLayout.ScrollingViewBehavior
@@ -86,35 +85,6 @@ class ScreenStackFragment : ScreenFragment {
         notifyViewAppearTransitionEnd()
     }
 
-    override fun onCreateAnimation(transit: Int, enter: Boolean, nextAnim: Int): Animation? {
-        // this means that the fragment will appear with a custom transition, in the case
-        // of animation: 'none', onViewAnimationStart and onViewAnimationEnd
-        // won't be called and we need to notify stack directly from here.
-        // When using the Toolbar back button this is called an extra time with transit = 0 but in
-        // this case we don't want to notify. The way I found to detect is case is check isHidden.
-        if (transit == 0 && !isHidden &&
-            screen.stackAnimation === Screen.StackAnimation.NONE
-        ) {
-            if (enter) {
-                // Android dispatches the animation start event for the fragment that is being added first
-                // however we want the one being dismissed first to match iOS. It also makes more sense
-                // from  a navigation point of view to have the disappear event first.
-                // Since there are no explicit relationships between the fragment being added / removed
-                // the practical way to fix this is delaying dispatching the appear events at the end of
-                // the frame.
-                UiThreadUtil.runOnUiThread {
-                    dispatchOnWillAppear()
-                    dispatchOnAppear()
-                }
-            } else {
-                dispatchOnWillDisappear()
-                dispatchOnDisappear()
-                notifyViewAppearTransitionEnd()
-            }
-        }
-        return null
-    }
-
     private fun notifyViewAppearTransitionEnd() {
         val screenStack = view?.parent
         if (screenStack is ScreenStack) {

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

@@ -24,6 +24,7 @@ import com.facebook.react.views.text.ReactTypefaceUtils
 class ScreenStackHeaderConfig(context: Context) : ViewGroup(context) {
     private val mConfigSubviews = ArrayList<ScreenStackHeaderSubview>(3)
     val toolbar: CustomToolbar
+    private var headerTopInset: Int? = null
     private var mTitle: String? = null
     private var mTitleColor = 0
     private var mTitleFontFamily: String? = null
@@ -81,6 +82,15 @@ class ScreenStackHeaderConfig(context: Context) : ViewGroup(context) {
         super.onAttachedToWindow()
         mIsAttachedToWindow = true
         sendEvent("onAttached", null)
+        // we want to save the top inset before the status bar can be hidden, which would resolve in
+        // inset being 0
+        if (headerTopInset == null) {
+            headerTopInset = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
+                rootWindowInsets.systemWindowInsetTop
+            else
+            // Hacky fallback for old android. Before Marshmallow, the status bar height was always 25
+                (25 * resources.displayMetrics.density).toInt()
+        }
         onUpdate()
     }
 
@@ -159,11 +169,8 @@ class ScreenStackHeaderConfig(context: Context) : ViewGroup(context) {
             screenFragment?.setToolbar(toolbar)
         }
         if (mIsTopInsetEnabled) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                toolbar.setPadding(0, rootWindowInsets.systemWindowInsetTop, 0, 0)
-            } else {
-                // Hacky fallback for old android. Before Marshmallow, the status bar height was always 25
-                toolbar.setPadding(0, (25 * resources.displayMetrics.density).toInt(), 0, 0)
+            headerTopInset.let {
+                toolbar.setPadding(0, it ?: 0, 0, 0)
             }
         } else {
             if (toolbar.paddingTop > 0) {

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

@@ -1,16 +1,26 @@
 package com.swmansion.rnscreens
 
+import android.util.Log
 import android.view.View
 import com.facebook.react.bridge.JSApplicationCausedNativeException
 import com.facebook.react.common.MapBuilder
 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.RNSScreenStackHeaderConfigManagerDelegate
+import com.facebook.react.viewmanagers.RNSScreenStackHeaderConfigManagerInterface
 import javax.annotation.Nonnull
 
 @ReactModule(name = ScreenStackHeaderConfigViewManager.REACT_CLASS)
-class ScreenStackHeaderConfigViewManager : ViewGroupManager<ScreenStackHeaderConfig>() {
+class ScreenStackHeaderConfigViewManager : ViewGroupManager<ScreenStackHeaderConfig>(), RNSScreenStackHeaderConfigManagerInterface<ScreenStackHeaderConfig> {
+    private val mDelegate: ViewManagerDelegate<ScreenStackHeaderConfig>
+
+    init {
+        mDelegate = RNSScreenStackHeaderConfigManagerDelegate<ScreenStackHeaderConfig, ScreenStackHeaderConfigViewManager>(this)
+    }
+
     override fun getName(): String {
         return REACT_CLASS
     }
@@ -58,67 +68,69 @@ class ScreenStackHeaderConfigViewManager : ViewGroupManager<ScreenStackHeaderCon
     }
 
     @ReactProp(name = "title")
-    fun setTitle(config: ScreenStackHeaderConfig, title: String?) {
+    override fun setTitle(config: ScreenStackHeaderConfig, title: String?) {
         config.setTitle(title)
     }
 
     @ReactProp(name = "titleFontFamily")
-    fun setTitleFontFamily(config: ScreenStackHeaderConfig, titleFontFamily: String?) {
+    override fun setTitleFontFamily(config: ScreenStackHeaderConfig, titleFontFamily: String?) {
         config.setTitleFontFamily(titleFontFamily)
     }
 
     @ReactProp(name = "titleFontSize")
-    fun setTitleFontSize(config: ScreenStackHeaderConfig, titleFontSize: Float) {
-        config.setTitleFontSize(titleFontSize)
+    override fun setTitleFontSize(config: ScreenStackHeaderConfig, titleFontSize: Int) {
+        config.setTitleFontSize(titleFontSize.toFloat())
     }
 
     @ReactProp(name = "titleFontWeight")
-    fun setTitleFontWeight(config: ScreenStackHeaderConfig, titleFontWeight: String?) {
+    override fun setTitleFontWeight(config: ScreenStackHeaderConfig, titleFontWeight: String?) {
         config.setTitleFontWeight(titleFontWeight)
     }
 
     @ReactProp(name = "titleColor", customType = "Color")
-    fun setTitleColor(config: ScreenStackHeaderConfig, titleColor: Int) {
-        config.setTitleColor(titleColor)
+    override fun setTitleColor(config: ScreenStackHeaderConfig, titleColor: Int?) {
+        if (titleColor != null) {
+            config.setTitleColor(titleColor)
+        }
     }
 
     @ReactProp(name = "backgroundColor", customType = "Color")
-    fun setBackgroundColor(config: ScreenStackHeaderConfig, backgroundColor: Int?) {
+    override fun setBackgroundColor(config: ScreenStackHeaderConfig, backgroundColor: Int?) {
         config.setBackgroundColor(backgroundColor)
     }
 
     @ReactProp(name = "hideShadow")
-    fun setHideShadow(config: ScreenStackHeaderConfig, hideShadow: Boolean) {
+    override fun setHideShadow(config: ScreenStackHeaderConfig, hideShadow: Boolean) {
         config.setHideShadow(hideShadow)
     }
 
     @ReactProp(name = "hideBackButton")
-    fun setHideBackButton(config: ScreenStackHeaderConfig, hideBackButton: Boolean) {
+    override fun setHideBackButton(config: ScreenStackHeaderConfig, hideBackButton: Boolean) {
         config.setHideBackButton(hideBackButton)
     }
 
     @ReactProp(name = "topInsetEnabled")
-    fun setTopInsetEnabled(config: ScreenStackHeaderConfig, topInsetEnabled: Boolean) {
+    override fun setTopInsetEnabled(config: ScreenStackHeaderConfig, topInsetEnabled: Boolean) {
         config.setTopInsetEnabled(topInsetEnabled)
     }
 
     @ReactProp(name = "color", customType = "Color")
-    fun setColor(config: ScreenStackHeaderConfig, color: Int) {
-        config.setTintColor(color)
+    override fun setColor(config: ScreenStackHeaderConfig, color: Int?) {
+        config.setTintColor(color ?: 0)
     }
 
     @ReactProp(name = "hidden")
-    fun setHidden(config: ScreenStackHeaderConfig, hidden: Boolean) {
+    override fun setHidden(config: ScreenStackHeaderConfig, hidden: Boolean) {
         config.setHidden(hidden)
     }
 
     @ReactProp(name = "translucent")
-    fun setTranslucent(config: ScreenStackHeaderConfig, translucent: Boolean) {
+    override fun setTranslucent(config: ScreenStackHeaderConfig, translucent: Boolean) {
         config.setTranslucent(translucent)
     }
 
     @ReactProp(name = "backButtonInCustomView")
-    fun setBackButtonInCustomView(
+    override fun setBackButtonInCustomView(
         config: ScreenStackHeaderConfig,
         backButtonInCustomView: Boolean
     ) {
@@ -126,7 +138,7 @@ class ScreenStackHeaderConfigViewManager : ViewGroupManager<ScreenStackHeaderCon
     }
 
     @ReactProp(name = "direction")
-    fun setDirection(config: ScreenStackHeaderConfig, direction: String?) {
+    override fun setDirection(config: ScreenStackHeaderConfig, direction: String?) {
         config.setDirection(direction)
     }
 
@@ -137,7 +149,60 @@ class ScreenStackHeaderConfigViewManager : ViewGroupManager<ScreenStackHeaderCon
             .build()
     }
 
+    protected override fun getDelegate(): ViewManagerDelegate<ScreenStackHeaderConfig> {
+        return mDelegate
+    }
+
     companion object {
         const val REACT_CLASS = "RNSScreenStackHeaderConfig"
     }
+
+    // TODO: Find better way to handle platform specific props
+    private fun logNotAvailable(propName: String) {
+        Log.w("RN SCREENS", "$propName prop is not available on Android")
+    }
+
+    override fun setBackTitle(view: ScreenStackHeaderConfig?, value: String?) {
+        logNotAvailable("backTitle")
+    }
+
+    override fun setBackTitleFontFamily(view: ScreenStackHeaderConfig?, value: String?) {
+        logNotAvailable("backTitleFontFamily")
+    }
+
+    override fun setBackTitleFontSize(view: ScreenStackHeaderConfig?, value: Int) {
+        logNotAvailable("backTitleFontSize")
+    }
+
+    override fun setLargeTitle(view: ScreenStackHeaderConfig?, value: Boolean) {
+        logNotAvailable("largeTitle")
+    }
+
+    override fun setLargeTitleFontFamily(view: ScreenStackHeaderConfig?, value: String?) {
+        logNotAvailable("largeTitleFontFamily")
+    }
+
+    override fun setLargeTitleFontSize(view: ScreenStackHeaderConfig?, value: Int) {
+        logNotAvailable("largeTitleFontSize")
+    }
+
+    override fun setLargeTitleFontWeight(view: ScreenStackHeaderConfig?, value: String?) {
+        logNotAvailable("largeTitleFontWeight")
+    }
+
+    override fun setLargeTitleBackgroundColor(view: ScreenStackHeaderConfig?, value: Int?) {
+        logNotAvailable("largeTitleBackgroundColor")
+    }
+
+    override fun setLargeTitleHideShadow(view: ScreenStackHeaderConfig?, value: Boolean) {
+        logNotAvailable("largeTitleHideShadow")
+    }
+
+    override fun setLargeTitleColor(view: ScreenStackHeaderConfig?, value: Int?) {
+        logNotAvailable("largeTitleColor")
+    }
+
+    override fun setDisableBackButtonMenu(view: ScreenStackHeaderConfig?, value: Boolean) {
+        logNotAvailable("disableBackButtonMenu")
+    }
 }

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

@@ -3,22 +3,30 @@ package com.swmansion.rnscreens
 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.views.view.ReactViewGroup
-import com.facebook.react.views.view.ReactViewManager
+import com.facebook.react.viewmanagers.RNSScreenStackHeaderSubviewManagerDelegate
+import com.facebook.react.viewmanagers.RNSScreenStackHeaderSubviewManagerInterface
 
 @ReactModule(name = ScreenStackHeaderSubviewManager.REACT_CLASS)
-class ScreenStackHeaderSubviewManager : ReactViewManager() {
+class ScreenStackHeaderSubviewManager : ViewGroupManager<ScreenStackHeaderSubview>(), RNSScreenStackHeaderSubviewManagerInterface<ScreenStackHeaderSubview> {
+    private val mDelegate: ViewManagerDelegate<ScreenStackHeaderSubview>
+
+    init {
+        mDelegate = RNSScreenStackHeaderSubviewManagerDelegate<ScreenStackHeaderSubview, ScreenStackHeaderSubviewManager>(this)
+    }
+
     override fun getName(): String {
         return REACT_CLASS
     }
 
-    override fun createViewInstance(context: ThemedReactContext): ReactViewGroup {
+    override fun createViewInstance(context: ThemedReactContext): ScreenStackHeaderSubview {
         return ScreenStackHeaderSubview(context)
     }
 
     @ReactProp(name = "type")
-    fun setType(view: ScreenStackHeaderSubview, type: String) {
+    override fun setType(view: ScreenStackHeaderSubview, type: String?) {
         view.type = when (type) {
             "left" -> ScreenStackHeaderSubview.Type.LEFT
             "center" -> ScreenStackHeaderSubview.Type.CENTER
@@ -29,6 +37,10 @@ class ScreenStackHeaderSubviewManager : ReactViewManager() {
         }
     }
 
+    protected override fun getDelegate(): ViewManagerDelegate<ScreenStackHeaderSubview> {
+        return mDelegate
+    }
+
     companion object {
         const val REACT_CLASS = "RNSScreenStackHeaderSubview"
     }

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

@@ -7,9 +7,18 @@ 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.RNSScreenStackManagerDelegate
+import com.facebook.react.viewmanagers.RNSScreenStackManagerInterface
 
 @ReactModule(name = ScreenStackViewManager.REACT_CLASS)
-class ScreenStackViewManager : ViewGroupManager<ScreenStack>() {
+class ScreenStackViewManager : ViewGroupManager<ScreenStack>(), RNSScreenStackManagerInterface<ScreenStack> {
+    private val mDelegate: ViewManagerDelegate<ScreenStack>
+
+    init {
+        mDelegate = RNSScreenStackManagerDelegate<ScreenStack, ScreenStackViewManager>(this)
+    }
+
     override fun getName(): String {
         return REACT_CLASS
     }
@@ -68,6 +77,10 @@ class ScreenStackViewManager : ViewGroupManager<ScreenStack>() {
         return true
     }
 
+    protected override fun getDelegate(): ViewManagerDelegate<ScreenStack> {
+        return mDelegate
+    }
+
     companion object {
         const val REACT_CLASS = "RNSScreenStack"
     }

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

@@ -1,11 +1,18 @@
 package com.swmansion.rnscreens
 
+import androidx.annotation.NonNull
+import androidx.annotation.Nullable
 import com.facebook.react.bridge.JSApplicationIllegalArgumentException
 import com.facebook.react.common.MapBuilder
 import com.facebook.react.module.annotations.ReactModule
+import com.facebook.react.uimanager.ReactStylesDiffMap
+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.events.HeaderBackButtonClickedEvent
 import com.swmansion.rnscreens.events.ScreenAppearEvent
 import com.swmansion.rnscreens.events.ScreenDisappearEvent
@@ -16,7 +23,13 @@ import com.swmansion.rnscreens.events.ScreenWillDisappearEvent
 import com.swmansion.rnscreens.events.StackFinishTransitioningEvent
 
 @ReactModule(name = ScreenViewManager.REACT_CLASS)
-class ScreenViewManager : ViewGroupManager<Screen>() {
+class ScreenViewManager : ViewGroupManager<Screen>(), RNSScreenManagerInterface<Screen> {
+    private val mDelegate: ViewManagerDelegate<Screen>
+
+    init {
+        mDelegate = RNSScreenManagerDelegate<Screen, ScreenViewManager>(this)
+    }
+
     override fun getName(): String {
         return REACT_CLASS
     }
@@ -26,8 +39,8 @@ class ScreenViewManager : ViewGroupManager<Screen>() {
     }
 
     @ReactProp(name = "activityState")
-    fun setActivityState(view: Screen, activityState: Int?) {
-        if (activityState == null) {
+    override 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).
             // In case when null is received, we want to ignore such value and not make
@@ -42,7 +55,7 @@ class ScreenViewManager : ViewGroupManager<Screen>() {
     }
 
     @ReactProp(name = "stackPresentation")
-    fun setStackPresentation(view: Screen, presentation: String) {
+    override fun setStackPresentation(view: Screen, presentation: String?) {
         view.stackPresentation = when (presentation) {
             "push" -> Screen.StackPresentation.PUSH
             "modal", "containedModal", "fullScreenModal", "formSheet" ->
@@ -54,7 +67,7 @@ class ScreenViewManager : ViewGroupManager<Screen>() {
     }
 
     @ReactProp(name = "stackAnimation")
-    fun setStackAnimation(view: Screen, animation: String?) {
+    override fun setStackAnimation(view: Screen, animation: String?) {
         view.stackAnimation = when (animation) {
             null, "default", "flip", "simple_push" -> Screen.StackAnimation.DEFAULT
             "none" -> Screen.StackAnimation.NONE
@@ -68,12 +81,12 @@ class ScreenViewManager : ViewGroupManager<Screen>() {
     }
 
     @ReactProp(name = "gestureEnabled", defaultBoolean = true)
-    fun setGestureEnabled(view: Screen, gestureEnabled: Boolean) {
+    override fun setGestureEnabled(view: Screen, gestureEnabled: Boolean) {
         view.isGestureEnabled = gestureEnabled
     }
 
     @ReactProp(name = "replaceAnimation")
-    fun setReplaceAnimation(view: Screen, animation: String?) {
+    override fun setReplaceAnimation(view: Screen, animation: String?) {
         view.replaceAnimation = when (animation) {
             null, "pop" -> Screen.ReplaceAnimation.POP
             "push" -> Screen.ReplaceAnimation.PUSH
@@ -82,38 +95,48 @@ class ScreenViewManager : ViewGroupManager<Screen>() {
     }
 
     @ReactProp(name = "screenOrientation")
-    fun setScreenOrientation(view: Screen, screenOrientation: String?) {
+    override fun setScreenOrientation(view: Screen, screenOrientation: String?) {
         view.setScreenOrientation(screenOrientation)
     }
 
     @ReactProp(name = "statusBarAnimation")
-    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")
-    fun setStatusBarColor(view: Screen, statusBarColor: Int?) {
+    override fun setStatusBarColor(view: Screen, statusBarColor: Int?) {
         view.statusBarColor = statusBarColor
     }
 
     @ReactProp(name = "statusBarStyle")
-    fun setStatusBarStyle(view: Screen, statusBarStyle: String?) {
+    override fun setStatusBarStyle(view: Screen, statusBarStyle: String?) {
         view.statusBarStyle = statusBarStyle
     }
 
     @ReactProp(name = "statusBarTranslucent")
-    fun setStatusBarTranslucent(view: Screen, statusBarTranslucent: Boolean?) {
+    override fun setStatusBarTranslucent(view: Screen, statusBarTranslucent: Boolean) {
         view.isStatusBarTranslucent = statusBarTranslucent
     }
 
     @ReactProp(name = "statusBarHidden")
-    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?) {
+        view.navigationBarColor = navigationBarColor
+    }
+
+    @ReactProp(name = "navigationBarHidden")
+    override fun setNavigationBarHidden(view: Screen, navigationBarHidden: Boolean) {
+        view.isNavigationBarHidden = navigationBarHidden
+    }
+
     @ReactProp(name = "nativeBackButtonDismissalEnabled")
-    fun setNativeBackButtonDismissalEnabled(
+    override fun setNativeBackButtonDismissalEnabled(
         view: Screen,
         nativeBackButtonDismissalEnabled: Boolean
     ) {
@@ -142,6 +165,10 @@ class ScreenViewManager : ViewGroupManager<Screen>() {
         return map
     }
 
+    protected override fun getDelegate(): ViewManagerDelegate<Screen> {
+        return mDelegate
+    }
+
     companion object {
         const val REACT_CLASS = "RNSScreen"
     }