react-native-navigation 7.43.0 → 7.44.0

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/StackController.java

@@ -1,10 +1,23 @@
 package com.reactnativenavigation.viewcontrollers.stack;
 
+import static com.reactnativenavigation.react.Constants.HARDWARE_BACK_BUTTON_ID;
+import static com.reactnativenavigation.utils.CollectionUtils.requireLast;
+import static com.reactnativenavigation.utils.CoordinatorLayoutUtils.matchParentWithBehaviour;
+import static com.reactnativenavigation.utils.CoordinatorLayoutUtils.updateBottomMargin;
+import static com.reactnativenavigation.utils.ObjectUtils.perform;
+
 import android.app.Activity;
 import android.content.res.Configuration;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
+import androidx.annotation.Size;
+import androidx.annotation.VisibleForTesting;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import androidx.viewpager.widget.ViewPager;
+
 import com.facebook.react.ReactRootView;
 import com.reactnativenavigation.options.ButtonOptions;
 import com.reactnativenavigation.options.Options;
@@ -18,7 +31,9 @@ import com.reactnativenavigation.viewcontrollers.parent.ParentController;
 import com.reactnativenavigation.viewcontrollers.stack.topbar.TopBarController;
 import com.reactnativenavigation.viewcontrollers.stack.topbar.button.BackButtonHelper;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.Presenter;
+import com.reactnativenavigation.viewcontrollers.viewcontroller.TopBarVisibilityInfo;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.ViewController;
+import com.reactnativenavigation.viewcontrollers.viewcontroller.ViewControllerVisibilityInfo;
 import com.reactnativenavigation.views.component.Component;
 import com.reactnativenavigation.views.stack.StackBehaviour;
 import com.reactnativenavigation.views.stack.StackLayout;
@@ -31,19 +46,6 @@ import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.RestrictTo;
-import androidx.annotation.Size;
-import androidx.annotation.VisibleForTesting;
-import androidx.coordinatorlayout.widget.CoordinatorLayout;
-import androidx.viewpager.widget.ViewPager;
-
-import static com.reactnativenavigation.react.Constants.HARDWARE_BACK_BUTTON_ID;
-import static com.reactnativenavigation.utils.CollectionUtils.*;
-import static com.reactnativenavigation.utils.CoordinatorLayoutUtils.matchParentWithBehaviour;
-import static com.reactnativenavigation.utils.CoordinatorLayoutUtils.updateBottomMargin;
-import static com.reactnativenavigation.utils.ObjectUtils.perform;
-
 public class StackController extends ParentController<StackLayout> {
 
     private IdStack<ViewController<?>> stack = new IdStack<>();
@@ -95,6 +97,19 @@ public class StackController extends ParentController<StackLayout> {
         return stack.peek();
     }
 
+    @Override
+    public void onSelected(ViewController<?> previousVC) {
+        presenter.bindNewViewController(previousVC, this);
+        super.onSelected(previousVC);
+    }
+
+    @NonNull
+    @Override
+    public ViewControllerVisibilityInfo getVisibilityInfo() {
+        TopBarVisibilityInfo topBarInfo = topBarController.getVisibilityInfo();
+        return new ViewControllerVisibilityInfo(topBarInfo);
+    }
+
     @Override
     public void onAttachToParent() {
         if (!isEmpty() && !getCurrentChild().isDestroyed() && !isViewShown()) {
@@ -159,16 +174,19 @@ public class StackController extends ParentController<StackLayout> {
             listener.onError("A stack can't contain two children with the same id: " + child.getId());
             return;
         }
-        final ViewController<?> toRemove = stack.peek();
-        if (size() > 0) backButtonHelper.addToPushedChild(child);
-        child.setParentController(this);
-        stack.push(child.getId(), child);
-        if (!isViewCreated()) return;
+
+        final ViewController<?> toRemove = pushChildToStack(child);
+
+        if (!isViewCreated()) {
+            return;
+        }
+
         Options resolvedOptions = resolveCurrentOptions(presenter.getDefaultOptions());
-        addChildToStack(child, resolvedOptions);
+        updateChildLayout(child, resolvedOptions);
+
         if (toRemove != null) {
-            StackAnimationOptions animation = resolvedOptions.animations.push;
-            if (animation.enabled.isTrueOrUndefined()) {
+            StackAnimationOptions animOptions = resolvedOptions.animations.push;
+            if (animOptions.enabled.isTrueOrUndefined()) {
                 animator.push(
                         child,
                         toRemove,
@@ -195,7 +213,17 @@ public class StackController extends ParentController<StackLayout> {
         listener.onSuccess(toAdd.getId());
     }
 
-    private void addChildToStack(ViewController<?> child, Options resolvedOptions) {
+    private ViewController<?> pushChildToStack(ViewController<?> child) {
+        final ViewController<?> toRemove = stack.peek();
+
+        if (size() > 0) backButtonHelper.addToPushedChild(child);
+
+        child.setParentController(this);
+        stack.push(child.getId(), child);
+        return toRemove;
+    }
+
+    private void updateChildLayout(ViewController<?> child, Options resolvedOptions) {
         child.setWaitForRender(resolvedOptions.animations.push.waitForRender);
         if (size() == 1) presenter.applyInitialChildLayoutOptions(resolvedOptions);
         getView().addView(child.getView(), getView().getChildCount() - 1, matchParentWithBehaviour(new StackBehaviour(this)));
@@ -222,7 +250,7 @@ public class StackController extends ParentController<StackLayout> {
         child.setParentController(this);
         stack.push(child.getId(), child);
         Options resolvedOptions = resolveCurrentOptions(presenter.getDefaultOptions());
-        addChildToStack(child, resolvedOptions);
+        updateChildLayout(child, resolvedOptions);
 
         CommandListener listenerAdapter = new CommandListenerAdapter() {
             @Override
@@ -316,7 +344,7 @@ public class StackController extends ParentController<StackLayout> {
                     appearing,
                     disappearing,
                     disappearingOptions,
-                    presenter.getAdditionalPopAnimations(appearingOptions, disappearingOptions),
+                    presenter.getAdditionalPopAnimations(appearingOptions, disappearingOptions, appearing),
                     () -> finishPopping(appearing, disappearing, listener)
             );
         } else {

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/StackPresenter.java

@@ -37,6 +37,7 @@ import com.reactnativenavigation.viewcontrollers.stack.topbar.button.ButtonContr
 import com.reactnativenavigation.viewcontrollers.stack.topbar.button.ButtonPresenter;
 import com.reactnativenavigation.viewcontrollers.stack.topbar.button.IconResolver;
 import com.reactnativenavigation.viewcontrollers.stack.topbar.title.TitleBarReactViewController;
+import com.reactnativenavigation.viewcontrollers.statusbar.StatusBarPresenter;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.IReactView;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.ViewController;
 import com.reactnativenavigation.views.stack.topbar.TopBar;
@@ -191,6 +192,12 @@ public class StackPresenter {
         componentLeftButtons.remove(child.getView());
     }
 
+    public void bindNewViewController(ViewController<?> previousVC, ViewController<?> newVC) {
+        Options options = newVC.resolveCurrentOptions(defaultOptions);
+        topBarController.bindNewViewController(previousVC, newVC);
+        StatusBarPresenter.instance.bindViewController(options.statusBar);
+    }
+
     private void destroyButtons(@Nullable Map<String, ButtonController> buttons) {
         if (buttons != null)
             forEach(buttons.values(), ViewController::destroy);
@@ -233,7 +240,7 @@ public class StackPresenter {
 
         topBar.setBorderHeight(topBarOptions.borderHeight.get(0d));
         topBar.setBorderColor(topBarOptions.borderColor.get(DEFAULT_BORDER_COLOR));
-        topBar.setBackgroundColor(topBarOptions.background.color.get(Color.WHITE));
+        topBarController.setBackgroundColor(topBarOptions, Color.WHITE);
 
         if (topBarOptions.background.component.hasValue()) {
             View createdComponent = findBackgroundComponent(topBarOptions.background.component);
@@ -417,18 +424,23 @@ public class StackPresenter {
         }
     }
 
-    public List<Animator> getAdditionalPushAnimations(StackController stack, ViewController<?> appearing,
+    public List<Animator> getAdditionalPushAnimations(
+            StackController stack,
+            ViewController<?> appearingCtrl,
             Options appearingOptions) {
         return CollectionUtils.asList(
-                topBarController.getPushAnimation(appearingOptions,
-                        getTopBarTranslationAnimationDelta(stack, appearing)),
-                perform(bottomTabsController, null, btc -> btc.getPushAnimation(appearingOptions)));
+                topBarController.getPushAnimation(appearingOptions, getTopBarTranslationAnimationDelta(stack, appearingCtrl)),
+                perform(appearingCtrl, null, vc -> vc.getPushAnimations(appearingOptions)),
+                perform(bottomTabsController, null, btc -> btc.getPushAnimation(appearingOptions)
+            ));
     }
 
-    public List<Animator> getAdditionalPopAnimations(Options appearingOptions, Options disappearingOptions) {
+    public List<Animator> getAdditionalPopAnimations(Options appearingOptions, Options disappearingOptions, ViewController<?> appearingCtrl) {
         return CollectionUtils.asList(
                 topBarController.getPopAnimation(appearingOptions, disappearingOptions),
-                perform(bottomTabsController, null, btc -> btc.getPopAnimation(appearingOptions, disappearingOptions)));
+                perform(appearingCtrl, null, vc -> vc.getPopAnimations(appearingOptions, disappearingOptions)),
+                perform(bottomTabsController, null, btc -> btc.getPopAnimation(appearingOptions, disappearingOptions)
+            ));
     }
 
     public List<Animator> getAdditionalSetRootAnimations(StackController stack, ViewController<?> appearing,
@@ -618,9 +630,7 @@ public class StackPresenter {
         if (resolveOptions.subtitle.font.hasValue()) {
             topBar.setSubtitleTypeface(typefaceLoader, resolveOptions.subtitle.font);
         }
-
-        if (topBarOptions.background.color.hasValue())
-            topBar.setBackgroundColor(topBarOptions.background.color.get());
+        topBarController.setBackgroundColor(topBarOptions);
 
         if (topBarOptions.background.component.hasValue()) {
             if (backgroundControllers.containsKey(component)) {

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,44 @@
 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.os.Build
 import android.view.MenuItem
 import android.view.View
+import androidx.core.animation.addListener
+import androidx.core.animation.doOnEnd
 import androidx.viewpager.widget.ViewPager
+import com.reactnativenavigation.RNNFeatureToggles
+import com.reactnativenavigation.RNNToggles
 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.viewcontrollers.viewcontroller.TopBarVisibilityInfo
+import com.reactnativenavigation.viewcontrollers.viewcontroller.ViewController
+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,70 +47,142 @@ open class TopBarController(private val animator: TopBarAnimator = TopBarAnimato
     val leftButtonCount: Int
         get() = leftButtonBar.buttonCount
 
-    fun getRightButton(index: Int): MenuItem = rightButtonBar.getButton(index)
+    val visibilityInfo: TopBarVisibilityInfo
+        get() = TopBarVisibilityInfo(view.isShown, getBackgroundColor())
 
     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 getBackgroundColor(): Int? {
+        return if (view.background is ColorDrawable) {
+            (view.background as ColorDrawable).color
+        } else {
+            null
+        }
+    }
+
+    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
         )
     }
 
+    fun bindNewViewController(previousVC: ViewController<*>?, newVC: ViewController<*>?) {
+        if (!RNNFeatureToggles.isEnabled(RNNToggles.TOP_BAR_COLOR_ANIMATION__TABS)) {
+            return
+        }
+
+        previousVC?.visibilityInfo?.topBarVisibilityInfo?.solidColor?.let { fromColor ->
+            newVC?.visibilityInfo?.topBarVisibilityInfo?.solidColor?.let { toColor ->
+                colorAnimator.getAnimation(view, fromColor, toColor).apply {
+                    doOnEnd {
+                        hasPendingColorAnim = false
+                    }
+                    hasPendingColorAnim = true
+                    start()
+                }
+            }
+        }
+    }
+
     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 +214,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(RNNToggles.TOP_BAR_COLOR_ANIMATION__PUSH)) {
+            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
+        }
+}