react-native-navigation 7.43.0 → 8.0.0

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/statusbar/StatusBarPresenter.kt

@@ -0,0 +1,9 @@
+package com.reactnativenavigation.viewcontrollers.stack.statusbar
+
+import android.animation.Animator
+import com.reactnativenavigation.options.Options
+
+interface StatusBarPresenter {
+    fun getStatusBarPushAnimation(appearingOptions: Options): Animator?
+    fun getStatusBarPopAnimation(appearingOptions: Options, disappearingOptions: Options): Animator?
+}

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/topbar/{TopBarAnimator.kt → TopBarAppearanceAnimator.kt}

@@ -1,9 +1,11 @@
 package com.reactnativenavigation.viewcontrollers.stack.topbar
 
-import com.reactnativenavigation.views.animations.BaseViewAnimator
+import com.reactnativenavigation.views.animations.BaseViewAppearanceAnimator
 import com.reactnativenavigation.views.stack.topbar.TopBar
 
-class TopBarAnimator @JvmOverloads constructor(view: TopBar? = null) : BaseViewAnimator<TopBar>(HideDirection.Up, view) {
+class TopBarAppearanceAnimator @JvmOverloads constructor(view: TopBar? = null)
+    : BaseViewAppearanceAnimator<TopBar>(HideDirection.Up, view) {
+
     @Suppress("UNUSED_PARAMETER")
     fun hideOnScroll(translationStart: Float, translationEndDy: Float) {
         // NOOP for now - this entire mechanism needs to be reimplemented as it relies on bridge events which are obsolete in TurboModules config

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/topbar/TopBarCollapseBehavior.kt

@@ -7,7 +7,7 @@ import com.reactnativenavigation.views.stack.topbar.TopBar
 
 class TopBarCollapseBehavior(private val topBar: TopBar) : ScrollEventListener.OnScrollListener, ScrollEventListener.OnDragListener {
     private var scrollEventListener: ScrollEventListener? = null
-    private val animator: TopBarAnimator = TopBarAnimator(topBar)
+    private val animator: TopBarAppearanceAnimator = TopBarAppearanceAnimator(topBar)
 
     fun enableCollapse(scrollEventListener: ScrollEventListener?) {
         this.scrollEventListener = scrollEventListener

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/topbar/TopBarController.kt

@@ -1,28 +1,40 @@
 package com.reactnativenavigation.viewcontrollers.stack.topbar
 
 import android.animation.Animator
+import android.animation.AnimatorSet
 import android.content.Context
+import android.graphics.drawable.ColorDrawable
 import android.view.MenuItem
 import android.view.View
+import androidx.core.animation.addListener
 import androidx.viewpager.widget.ViewPager
+import com.reactnativenavigation.RNNFeatureToggles
+import com.reactnativenavigation.RNNToggles.TOP_BAR_COLOR_ANIMATION
 import com.reactnativenavigation.options.Alignment
 import com.reactnativenavigation.options.AnimationOptions
 import com.reactnativenavigation.options.Options
+import com.reactnativenavigation.options.TopBarOptions
+import com.reactnativenavigation.options.animations.ViewAnimationOptions
 import com.reactnativenavigation.utils.CollectionUtils.forEachIndexed
 import com.reactnativenavigation.utils.ViewUtils
 import com.reactnativenavigation.utils.resetViewProperties
 import com.reactnativenavigation.viewcontrollers.stack.topbar.button.ButtonController
 import com.reactnativenavigation.viewcontrollers.stack.topbar.title.TitleBarReactViewController
+import com.reactnativenavigation.views.animations.ColorAnimator
 import com.reactnativenavigation.views.stack.StackLayout
 import com.reactnativenavigation.views.stack.topbar.TopBar
 import com.reactnativenavigation.views.stack.topbar.titlebar.ButtonBar
 
 
-open class TopBarController(private val animator: TopBarAnimator = TopBarAnimator()) {
+open class TopBarController(
+    private val appearAnimator: TopBarAppearanceAnimator = TopBarAppearanceAnimator(),
+    private val colorAnimator: ColorAnimator = ColorAnimator(),
+) {
     lateinit var view: TopBar
     private lateinit var leftButtonBar: ButtonBar
     private lateinit var rightButtonBar: ButtonBar
 
+    private var hasPendingColorAnim = false
 
     val height: Int
         get() = view.height
@@ -31,46 +43,89 @@ open class TopBarController(private val animator: TopBarAnimator = TopBarAnimato
     val leftButtonCount: Int
         get() = leftButtonBar.buttonCount
 
-    fun getRightButton(index: Int): MenuItem = rightButtonBar.getButton(index)
-
     fun createView(context: Context, parent: StackLayout): TopBar {
         if (!::view.isInitialized) {
             view = createTopBar(context, parent)
             leftButtonBar = view.leftButtonBar
             rightButtonBar = view.rightButtonBar
-            animator.bindView(view)
+            appearAnimator.bindView(view)
         }
         return view
     }
 
-    protected open fun createTopBar(context: Context, stackLayout: StackLayout): TopBar {
-        return TopBar(context)
-    }
-
     fun initTopTabs(viewPager: ViewPager?) = view.initTopTabs(viewPager)
 
     fun clearTopTabs() = view.clearTopTabs()
 
+    fun setBackgroundColor(topBarOptions: TopBarOptions, defaultColor: Int) {
+        val color = topBarOptions.background.color
+
+        if (!hasPendingColorAnim) {
+            view.setBackgroundColor(color.get(defaultColor)!!)
+        }
+    }
+
+    fun setBackgroundColor(topBarOptions: TopBarOptions) {
+        val color = topBarOptions.background.color
+
+        if (color.hasValue() && !hasPendingColorAnim) {
+            view.setBackgroundColor(color.get())
+        }
+    }
+
+    fun getRightButton(index: Int): MenuItem = rightButtonBar.getButton(index)
+
     fun getPushAnimation(appearingOptions: Options, additionalDy: Float = 0f): Animator? {
-        if (appearingOptions.topBar.animate.isFalse) return null
-        return animator.getPushAnimation(
-                appearingOptions.animations.push.topBar,
-                appearingOptions.topBar.visible,
-                additionalDy
-        )
+        val topBarOptions = appearingOptions.topBar
+        val topBarAnimOptions = appearingOptions.animations.push.topBar
+
+        hasPendingColorAnim = false
+
+        mutableListOf(
+            getAppearancePushAnimation(topBarOptions, topBarAnimOptions, additionalDy),
+            getBkgColorAnimation(topBarOptions)?.apply {
+                hasPendingColorAnim = true
+
+                addListener(onEnd = {
+                    hasPendingColorAnim = false
+                })
+            },
+        ).filterNotNull().let {
+            return if (it.isNotEmpty()) {
+                AnimatorSet().apply { playTogether(it) }
+            } else {
+                null
+            }
+        }
     }
 
     fun getPopAnimation(appearingOptions: Options, disappearingOptions: Options): Animator? {
-        if (appearingOptions.topBar.animate.isFalse) return null
-        return animator.getPopAnimation(
-                disappearingOptions.animations.pop.topBar,
-                appearingOptions.topBar.visible
-        )
+        val topBarOptions = appearingOptions.topBar
+        val topBarAnimOptions = disappearingOptions.animations.pop.topBar
+
+        hasPendingColorAnim = false
+
+        mutableListOf(
+            getAppearancePopAnimation(topBarOptions, topBarAnimOptions),
+            getBkgColorAnimation(topBarOptions)?.apply {
+                hasPendingColorAnim = true
+
+                addListener(onEnd = {
+                    hasPendingColorAnim = false
+                })
+            },
+        ).filterNotNull().let {
+            return if (it.isNotEmpty()) {
+                AnimatorSet().apply { playTogether(it) }
+            } else {
+                null
+            }
+        }
     }
 
     fun getSetStackRootAnimation(appearingOptions: Options, additionalDy: Float = 0f): Animator? {
         if (appearingOptions.topBar.animate.isFalse) return null
-        return animator.getSetStackRootAnimation(
+        return appearAnimator.getSetStackRootAnimation(
                 appearingOptions.animations.setStackRoot.topBar,
                 appearingOptions.topBar.visible,
                 additionalDy
@@ -78,23 +133,23 @@ open class TopBarController(private val animator: TopBarAnimator = TopBarAnimato
     }
 
     fun show() {
-        if (ViewUtils.isVisible(view) || animator.isAnimatingShow()) return
+        if (ViewUtils.isVisible(view) || appearAnimator.isAnimatingShow()) return
         view.resetViewProperties()
         view.visibility = View.VISIBLE
     }
 
     fun showAnimate(options: AnimationOptions, additionalDy: Float) {
-        if (ViewUtils.isVisible(view) || animator.isAnimatingShow()) return
-        animator.show(options, additionalDy)
+        if (ViewUtils.isVisible(view) || appearAnimator.isAnimatingShow()) return
+        appearAnimator.show(options, additionalDy)
     }
 
     fun hide() {
-        if (!animator.isAnimatingHide()) view.visibility = View.GONE
+        if (!appearAnimator.isAnimatingHide()) view.visibility = View.GONE
     }
 
     fun hideAnimate(options: AnimationOptions, additionalDy: Float) {
-        if (!ViewUtils.isVisible(view) || animator.isAnimatingHide()) return
-        animator.hide(options, additionalDy)
+        if (!ViewUtils.isVisible(view) || appearAnimator.isAnimatingHide()) return
+        appearAnimator.hide(options, additionalDy)
     }
 
     fun setTitleComponent(component: TitleBarReactViewController) {
@@ -126,4 +181,44 @@ open class TopBarController(private val animator: TopBarAnimator = TopBarAnimato
         toRemove.forEach { view.removeLeftButton(it) }
         forEachIndexed(toAdd) { b: ButtonController, i: Int -> b.addToMenu(leftButtonBar, i * 10) }
     }
-}
+
+    protected open fun createTopBar(context: Context, stackLayout: StackLayout): TopBar {
+        return TopBar(context)
+    }
+
+    private fun getBkgColorAnimation(topBarOptions: TopBarOptions): Animator? {
+        val targetColor = topBarOptions.background.color
+
+        if (targetColor.hasValue()
+            && view.background is ColorDrawable
+            && RNNFeatureToggles.isEnabled(TOP_BAR_COLOR_ANIMATION)) {
+            return colorAnimator.getAnimation(
+                view,
+                (view.background as ColorDrawable).color,
+                targetColor.get()
+            )
+        }
+        return null
+    }
+
+    private fun getAppearancePushAnimation(topBarOptions: TopBarOptions, topBarAnimOptions: ViewAnimationOptions, additionalDy: Float) =
+        if (!topBarOptions.animate.isFalse) {
+            appearAnimator.getPushAnimation(
+                topBarAnimOptions,
+                topBarOptions.visible,
+                additionalDy,
+            )
+        } else {
+            null
+        }
+
+    private fun getAppearancePopAnimation(topBarOptions: TopBarOptions, topBarAnimOptions: ViewAnimationOptions) =
+        if (!topBarOptions.animate.isFalse) {
+            appearAnimator.getPopAnimation(
+                topBarAnimOptions,
+                topBarOptions.visible,
+            )
+        } else {
+            null
+        }
+}

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/viewcontroller/LayoutDirectionApplier.kt

@@ -1,15 +1,19 @@
 package com.reactnativenavigation.viewcontrollers.viewcontroller
 
+import android.annotation.SuppressLint
 import com.facebook.react.ReactInstanceManager
 import com.facebook.react.modules.i18nmanager.I18nUtil
 import com.reactnativenavigation.options.Options
 
 class LayoutDirectionApplier {
-    fun apply(root: ViewController<*>, options: Options, instanceManager: ReactInstanceManager) {
-        if (options.layout.direction.hasValue() && instanceManager.currentReactContext != null) {
+    @SuppressLint("WrongConstant")
+    fun apply(root: ViewController<*>, options: Options) {
+        val currentContext = root.view?.context ?: return
+
+        if (options.layout.direction.hasValue()) {
             root.activity.window.decorView.layoutDirection = options.layout.direction.get()
-            I18nUtil.getInstance().allowRTL(instanceManager.currentReactContext, options.layout.direction.isRtl)
-            I18nUtil.getInstance().forceRTL(instanceManager.currentReactContext, options.layout.direction.isRtl)
+            I18nUtil.instance.allowRTL(currentContext, options.layout.direction.isRtl)
+            I18nUtil.instance.forceRTL(currentContext, options.layout.direction.isRtl)
         }
     }
 }

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/viewcontroller/Presenter.java

@@ -1,5 +1,9 @@
 package com.reactnativenavigation.viewcontrollers.viewcontroller;
 
+import static com.reactnativenavigation.utils.StubAnimationListener.onAnimatorEnd;
+
+import android.animation.Animator;
+import android.animation.ValueAnimator;
 import android.app.Activity;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
@@ -10,6 +14,11 @@ import android.view.ViewGroup;
 import android.view.ViewGroup.MarginLayoutParams;
 import android.view.Window;
 
+import androidx.annotation.NonNull;
+
+import com.reactnativenavigation.RNNFeatureToggles;
+import com.reactnativenavigation.RNNToggles;
+import com.reactnativenavigation.options.AnimationOptions;
 import com.reactnativenavigation.options.NavigationBarOptions;
 import com.reactnativenavigation.options.Options;
 import com.reactnativenavigation.options.OrientationOptions;
@@ -17,18 +26,31 @@ import com.reactnativenavigation.options.StatusBarOptions;
 import com.reactnativenavigation.options.StatusBarOptions.TextColorScheme;
 import com.reactnativenavigation.options.layout.LayoutInsets;
 import com.reactnativenavigation.options.params.Bool;
+import com.reactnativenavigation.options.params.ThemeColour;
 import com.reactnativenavigation.utils.SystemUiUtils;
-import com.reactnativenavigation.viewcontrollers.parent.ParentController;
 import com.reactnativenavigation.viewcontrollers.navigator.Navigator;
+import com.reactnativenavigation.viewcontrollers.parent.ParentController;
+import com.reactnativenavigation.viewcontrollers.stack.statusbar.StatusBarPresenter;
+import com.reactnativenavigation.views.animations.ColorAnimator;
 
-public class Presenter {
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class Presenter implements StatusBarPresenter {
     private final Activity activity;
+    private final ColorAnimator colorAnimator;
+
     private Options defaultOptions;
+    private Boolean hasPendingColorAnim = false;
 
     public Presenter(Activity activity, Options defaultOptions) {
+        this(activity, defaultOptions, new ColorAnimator());
+    }
+
+    public Presenter(Activity activity, Options defaultOptions, ColorAnimator colorAnimator) {
         this.activity = activity;
+        this.colorAnimator = colorAnimator;
         this.defaultOptions = defaultOptions;
-
     }
 
     public void setDefaultOptions(Options defaultOptions) {
@@ -106,12 +128,56 @@ public class Presenter {
 
     private void applyStatusBarOptions(ViewController viewController, Options options) {
         StatusBarOptions statusBar = options.copy().withDefaultOptions(defaultOptions).statusBar;
-        setStatusBarBackgroundColor(statusBar);
+
+        if (!hasPendingColorAnim) {
+            setStatusBarBackgroundColor(statusBar);
+        }
         setTextColorScheme(statusBar);
         setTranslucent(statusBar);
         setStatusBarVisible(viewController, statusBar.visible);
     }
 
+    @Nullable
+    @Override
+    public Animator getStatusBarPushAnimation(@NotNull Options appearingOptions) {
+        StatusBarOptions statusBarOptions = appearingOptions.statusBar;
+        return getStatusBarColorAnimation(statusBarOptions);
+    }
+
+    @androidx.annotation.Nullable
+    @Override
+    public Animator getStatusBarPopAnimation(@NonNull Options appearingOptions, @NonNull Options disappearingOptions) {
+        StatusBarOptions statusBarOptions = appearingOptions.statusBar;
+        return getStatusBarColorAnimation(statusBarOptions);
+    }
+
+    private Animator getStatusBarColorAnimation(StatusBarOptions statusBarOptions) {
+        if (RNNFeatureToggles.isEnabled(RNNToggles.TOP_BAR_COLOR_ANIMATION)) {
+            ThemeColour targetColor = statusBarOptions.backgroundColor;
+
+            if (targetColor.hasValue()) {
+                boolean translucent = statusBarOptions.translucent.isTrue();
+                ValueAnimator animator = colorAnimator.getAnimation(
+                        getCurrentStatusBarBackgroundColor(),
+                        targetColor.get()
+                );
+
+                animator.addUpdateListener(animation ->
+                        setStatusBarBackgroundColor((int) animation.getAnimatedValue(), translucent));
+
+                animator.addListener(onAnimatorEnd(animation -> {
+                    hasPendingColorAnim = false;
+                    return null;
+                }));
+
+                hasPendingColorAnim = true;
+                return animator;
+            }
+        }
+        hasPendingColorAnim = false;
+        return null;
+    }
+
     private void setTranslucent(StatusBarOptions options) {
         Window window = activity.getWindow();
         if (options.translucent.isTrue()) {
@@ -133,11 +199,14 @@ public class Presenter {
     private void setStatusBarBackgroundColor(StatusBarOptions statusBar) {
         if (statusBar.backgroundColor.canApplyValue()) {
             final int statusBarBackgroundColor = getStatusBarBackgroundColor(statusBar);
-            SystemUiUtils.setStatusBarColor(activity.getWindow(), statusBarBackgroundColor,
-                    statusBar.translucent.isTrue());
+            setStatusBarBackgroundColor(statusBarBackgroundColor, statusBar.translucent.isTrue());
         }
     }
 
+    private void setStatusBarBackgroundColor(int color, Boolean translucent) {
+        SystemUiUtils.setStatusBarColor(activity.getWindow(), color, translucent);
+    }
+
     private boolean isDarkTextColorScheme(StatusBarOptions statusBar) {
         if (statusBar.textColorScheme == TextColorScheme.Dark) {
             return true;
@@ -153,6 +222,10 @@ public class Presenter {
         return statusBar.backgroundColor.get(defaultColor);
     }
 
+    private int getCurrentStatusBarBackgroundColor() {
+        return SystemUiUtils.getStatusBarColor(activity.getWindow());
+    }
+
     private void setTextColorScheme(StatusBarOptions statusBar) {
         final View view = activity.getWindow().getDecorView();
         //View.post is a Workaround, added to solve internal Samsung 

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/viewcontroller/RootPresenter.java

@@ -35,7 +35,7 @@ public class RootPresenter {
     }
 
     public void setRoot(ViewController appearingRoot, ViewController<?> disappearingRoot, Options defaultOptions, CommandListener listener, ReactInstanceManager reactInstanceManager) {
-        layoutDirectionApplier.apply(appearingRoot, defaultOptions, reactInstanceManager);
+        layoutDirectionApplier.apply(appearingRoot, defaultOptions);
         rootLayout.addView(appearingRoot.getView(), matchParentWithBehaviour(new BehaviourDelegate(appearingRoot)));
         Options options = appearingRoot.resolveCurrentOptions(defaultOptions);
         AnimationOptions enter = options.animations.setRoot.getEnter();

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/viewcontroller/ViewController.java

@@ -27,6 +27,7 @@ import com.reactnativenavigation.utils.UiThread;
 import com.reactnativenavigation.utils.UiUtils;
 import com.reactnativenavigation.viewcontrollers.parent.ParentController;
 import com.reactnativenavigation.viewcontrollers.stack.StackController;
+import com.reactnativenavigation.viewcontrollers.stack.statusbar.StatusBarController;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.overlay.ViewControllerOverlay;
 import com.reactnativenavigation.views.BehaviourAdapter;
 import com.reactnativenavigation.views.component.Component;
@@ -91,6 +92,10 @@ public abstract class ViewController<T extends ViewGroup> implements ViewTreeObs
         options = initialOptions.copy();
     }
 
+    public StatusBarController getStatusBarController() {
+        return null;
+    }
+
     public void setWaitForRender(Bool waitForRender) {
         this.waitForRender = waitForRender;
     }

package/lib/android/app/src/main/java/com/reactnativenavigation/views/animations/{BaseViewAnimator.kt → BaseViewAppearanceAnimator.kt}

@@ -12,7 +12,7 @@ import com.reactnativenavigation.options.animations.ViewAnimationOptions
 import com.reactnativenavigation.options.params.Bool
 import com.reactnativenavigation.utils.resetViewProperties
 
-open class BaseViewAnimator<T : View>(
+open class BaseViewAppearanceAnimator<T : View>(
         private val hideDirection: HideDirection,
         view: T? = null,
         private val defaultAnimatorCreator: ViewAnimatorCreator = DefaultViewAnimatorCreator()
@@ -90,16 +90,16 @@ open class BaseViewAnimator<T : View>(
 
     fun isAnimatingShow() = showAnimator.isRunning
 
-    fun getPushAnimation(animation: ViewAnimationOptions, visible: Bool, additionalDy: Float = 0f): Animator? {
+    fun getPushAnimation(animationOpts: ViewAnimationOptions, visible: Bool, additionalDy: Float = 0f): Animator? {
         if (isOrWillBeVisible && visible.isFalse) {
             showAnimator.cancel()
-            hideAnimator = animation.exit.getAnimation(view, defaultAnimatorCreator.getHideAnimator(view, hideDirection, additionalDy))
+            hideAnimator = animationOpts.exit.getAnimation(view, defaultAnimatorCreator.getHideAnimator(view, hideDirection, additionalDy))
             return hideAnimator
         }
 
         if (isOrWillBeHidden && visible.isTrueOrUndefined) {
             hideAnimator.cancel()
-            showAnimator = animation.enter.getAnimation(view, defaultAnimatorCreator.getShowAnimator(view, hideDirection, additionalDy))
+            showAnimator = animationOpts.enter.getAnimation(view, defaultAnimatorCreator.getShowAnimator(view, hideDirection, additionalDy))
             return showAnimator
         }
 

package/lib/android/app/src/main/java/com/reactnativenavigation/views/animations/ColorAnimator.kt

@@ -0,0 +1,22 @@
+package com.reactnativenavigation.views.animations
+
+import android.animation.ObjectAnimator
+import android.animation.ValueAnimator
+import android.view.View
+
+class ColorAnimator {
+    fun getAnimation(from: Int, to: Int): ValueAnimator = createObjectAnimator(null, from, to)
+    fun getAnimation(view: View, from: Int, to: Int): ValueAnimator = createObjectAnimator(view, from, to)
+
+    private fun createObjectAnimator(view: View?, from: Int, to: Int) =
+        if (view == null) {
+            ObjectAnimator.ofArgb(from, to)
+        } else {
+            ObjectAnimator.ofArgb(
+                view,
+                view.BkgColorProperty,
+                from,
+                to,
+            )
+        }
+}

package/lib/android/app/src/main/java/com/reactnativenavigation/views/animations/DefaultViewAnimatorCreator.kt

@@ -13,11 +13,11 @@ class DefaultViewAnimatorCreator : ViewAnimatorCreator {
     }
 
     override fun getShowAnimator(
-            view: View,
-            hideDirection: BaseViewAnimator.HideDirection,
-            translationStart: Float
+        view: View,
+        hideDirection: BaseViewAppearanceAnimator.HideDirection,
+        translationStart: Float
     ): Animator {
-        val direction = if (hideDirection == BaseViewAnimator.HideDirection.Up) 1 else -1
+        val direction = if (hideDirection == BaseViewAppearanceAnimator.HideDirection.Up) 1 else -1
         return ObjectAnimator.ofFloat(
                 view,
                 View.TRANSLATION_Y,
@@ -30,11 +30,11 @@ class DefaultViewAnimatorCreator : ViewAnimatorCreator {
     }
 
     override fun getHideAnimator(
-            view: View,
-            hideDirection: BaseViewAnimator.HideDirection,
-            additionalDy: Float
+        view: View,
+        hideDirection: BaseViewAppearanceAnimator.HideDirection,
+        additionalDy: Float
     ): Animator {
-        val direction = if (hideDirection == BaseViewAnimator.HideDirection.Up) -1 else 1
+        val direction = if (hideDirection == BaseViewAppearanceAnimator.HideDirection.Up) -1 else 1
         return ObjectAnimator.ofFloat(
                 view,
                 View.TRANSLATION_Y,

package/lib/android/app/src/main/java/com/reactnativenavigation/views/animations/ViewAnimatorCreator.kt

@@ -4,6 +4,6 @@ import android.animation.Animator
 import android.view.View
 
 interface ViewAnimatorCreator {
-    fun getShowAnimator(view: View, hideDirection: BaseViewAnimator.HideDirection, translationStart: Float): Animator
-    fun getHideAnimator(view: View, hideDirection: BaseViewAnimator.HideDirection, additionalDy: Float): Animator
+    fun getShowAnimator(view: View, hideDirection: BaseViewAppearanceAnimator.HideDirection, translationStart: Float): Animator
+    fun getHideAnimator(view: View, hideDirection: BaseViewAppearanceAnimator.HideDirection, additionalDy: Float): Animator
 }

package/lib/android/app/src/main/java/com/reactnativenavigation/views/animations/ViewBkgColorProperty.kt

@@ -0,0 +1,17 @@
+package com.reactnativenavigation.views.animations
+
+import android.graphics.drawable.ColorDrawable
+import android.util.Property
+import android.view.View
+
+val View.BkgColorProperty: Property<View, Int>
+    // TODO Replace Property with IntProperty (Requires SDK≥24)
+    get() = object: Property<View, Int>(Int::class.java, "bkgColor") {
+        override fun set(view: View, value: Int) {
+            (view.background as ColorDrawable).color = value
+        }
+
+        override fun get(view: View): Int {
+            return (view.background as ColorDrawable).color
+        }
+    }

package/lib/android/app/src/main/java/com/reactnativenavigation/views/element/animators/BackgroundColorAnimator.kt

@@ -4,21 +4,23 @@ import android.animation.Animator
 import android.animation.ObjectAnimator
 import android.view.View
 import android.view.ViewGroup
+import com.facebook.react.common.annotations.UnstableReactNativeAPI
+import com.facebook.react.uimanager.drawable.CSSBackgroundDrawable
 import com.facebook.react.views.text.ReactTextView
-import com.facebook.react.views.view.ReactViewBackgroundDrawable
 import com.reactnativenavigation.options.SharedElementTransitionOptions
 import com.reactnativenavigation.utils.*
 
+@OptIn(UnstableReactNativeAPI::class)
 class BackgroundColorAnimator(from: View, to: View) : PropertyAnimatorCreator<ViewGroup>(from, to) {
     override fun shouldAnimateProperty(fromChild: ViewGroup, toChild: ViewGroup): Boolean {
-        return fromChild.background is ReactViewBackgroundDrawable &&
-                toChild.background is ReactViewBackgroundDrawable && (fromChild.background as ReactViewBackgroundDrawable).color != (toChild.background as ReactViewBackgroundDrawable).color
+        return fromChild.background is CSSBackgroundDrawable &&
+                toChild.background is CSSBackgroundDrawable && (fromChild.background as CSSBackgroundDrawable).color != (toChild.background as CSSBackgroundDrawable).color
     }
 
     override fun excludedViews() = listOf(ReactTextView::class.java)
 
     override fun create(options: SharedElementTransitionOptions): Animator {
-        val backgroundColorEvaluator = BackgroundColorEvaluator(to.background as ReactViewBackgroundDrawable)
+        val backgroundColorEvaluator = BackgroundColorEvaluator(to.background as CSSBackgroundDrawable)
         val fromColor = ColorUtils.colorToLAB(ViewUtils.getBackgroundColor(from))
         val toColor = ColorUtils.colorToLAB(ViewUtils.getBackgroundColor(to))
 

package/lib/android/app/src/main/java/com/reactnativenavigation/views/element/animators/BackgroundColorEvaluator.kt

@@ -2,11 +2,13 @@ package com.reactnativenavigation.views.element.animators
 
 import android.animation.TypeEvaluator
 import androidx.core.graphics.ColorUtils
-import com.facebook.react.views.view.ReactViewBackgroundDrawable
+import com.facebook.react.common.annotations.UnstableReactNativeAPI
+import com.facebook.react.uimanager.drawable.CSSBackgroundDrawable
 
-class BackgroundColorEvaluator(private val background: ReactViewBackgroundDrawable) : TypeEvaluator<DoubleArray> {
+class BackgroundColorEvaluator @OptIn(UnstableReactNativeAPI::class) constructor(private val background: CSSBackgroundDrawable) : TypeEvaluator<DoubleArray> {
     private val color = DoubleArray(3)
 
+    @OptIn(UnstableReactNativeAPI::class)
     override fun evaluate(ratio: Float, from: DoubleArray, to: DoubleArray): DoubleArray {
         ColorUtils.blendLAB(from, to, ratio.toDouble(), color)
         background.color = com.reactnativenavigation.utils.ColorUtils.labToColor(color)

package/lib/android/app/src/reactNative71/java/com/reactnativenavigation/react/modal/ModalContentLayout.kt

@@ -49,17 +49,17 @@ class ModalContentLayout(context: Context?) : ReactViewGroup(context), RootView{
             updateFirstChildView()
         }
     }
-    override fun onChildStartedNativeGesture(child: View, androidEvent: MotionEvent?) {
+    override fun onChildStartedNativeGesture(child: View, androidEvent: MotionEvent) {
         mJSTouchDispatcher.onChildStartedNativeGesture(androidEvent, this.getEventDispatcher())
     }
-    override fun onChildStartedNativeGesture(androidEvent: MotionEvent?) {
+    override fun onChildStartedNativeGesture(androidEvent: MotionEvent) {
         mJSTouchDispatcher.onChildStartedNativeGesture(androidEvent, this.getEventDispatcher())
     }
-    override fun onChildEndedNativeGesture(child: View, androidEvent: MotionEvent?) {
+    override fun onChildEndedNativeGesture(child: View, androidEvent: MotionEvent) {
         mJSTouchDispatcher.onChildEndedNativeGesture(androidEvent, this.getEventDispatcher())
     }
     override fun requestDisallowInterceptTouchEvent(disallowIntercept: Boolean) {}
-    private fun getEventDispatcher(): EventDispatcher? {
+    private fun getEventDispatcher(): EventDispatcher {
         val reactContext: ReactContext = this.getReactContext()
         return reactContext.getNativeModule(UIManagerModule::class.java)!!.eventDispatcher
     }
@@ -73,12 +73,12 @@ class ModalContentLayout(context: Context?) : ReactViewGroup(context), RootView{
         return this.context as ReactContext
     }
 
-    override fun onInterceptTouchEvent(event: MotionEvent?): Boolean {
+    override fun onInterceptTouchEvent(event: MotionEvent): Boolean {
         mJSTouchDispatcher.handleTouchEvent(event, getEventDispatcher())
         return super.onInterceptTouchEvent(event)
     }
 
-    override fun onTouchEvent(event: MotionEvent?): Boolean {
+    override fun onTouchEvent(event: MotionEvent): Boolean {
         mJSTouchDispatcher.handleTouchEvent(event, getEventDispatcher())
         super.onTouchEvent(event)
         return true