react-native-navigation 7.42.0 → 7.44.0

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

@@ -3,6 +3,7 @@ package com.reactnativenavigation.viewcontrollers.viewcontroller;
 import static com.reactnativenavigation.utils.CollectionUtils.forEach;
 import static com.reactnativenavigation.utils.ObjectUtils.perform;
 
+import android.animation.Animator;
 import android.app.Activity;
 import android.content.res.Configuration;
 import android.view.View;
@@ -12,11 +13,11 @@ import android.view.ViewTreeObserver;
 
 import androidx.annotation.CallSuper;
 import androidx.annotation.CheckResult;
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 
-import com.reactnativenavigation.BuildConfig;
 import com.reactnativenavigation.options.Options;
 import com.reactnativenavigation.options.params.Bool;
 import com.reactnativenavigation.options.params.NullBool;
@@ -113,10 +114,34 @@ public abstract class ViewController<T extends ViewGroup> implements ViewTreeObs
 
     public abstract T createView();
 
+    public void onSelected(ViewController<?> previousVC) {
+        setVisible();
+    }
+
+    public void onDeselected() {
+        setInvisible();
+    }
+
+    public void setVisible() {
+        getView().setVisibility(View.VISIBLE);
+
+        onViewWillAppear();
+        onViewDidAppear();
+    }
+
+    public void setInvisible() {
+        getView().setVisibility(View.INVISIBLE);
+    }
+
     public void setViewVisibilityListener(ViewVisibilityListener viewVisibilityListener) {
         this.viewVisibilityListener = viewVisibilityListener;
     }
 
+    @NonNull
+    public ViewControllerVisibilityInfo getVisibilityInfo() {
+        return new ViewControllerVisibilityInfo(null);
+    }
+
     @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
     public void ensureViewIsCreated() {
         getView();
@@ -172,7 +197,6 @@ public abstract class ViewController<T extends ViewGroup> implements ViewTreeObs
     }
 
     public void setDefaultOptions(Options defaultOptions) {
-
     }
 
     public Activity getActivity() {
@@ -352,6 +376,14 @@ public abstract class ViewController<T extends ViewGroup> implements ViewTreeObs
 
     }
 
+    public Animator getPushAnimations(Options appearingOptions) {
+        return null;
+    }
+
+    public Animator getPopAnimations(Options appearingOptions, Options disappearingOptions) {
+        return null;
+    }
+
     protected void runOnPreDraw(Func1<T> task) {
         if (!isDestroyed) UiUtils.runOnPreDrawOnce(getView(), task);
     }

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

@@ -0,0 +1,5 @@
+package com.reactnativenavigation.viewcontrollers.viewcontroller
+
+data class TopBarVisibilityInfo(val isShown: Boolean, val solidColor: Int?)
+
+data class ViewControllerVisibilityInfo(val topBarVisibilityInfo: TopBarVisibilityInfo?)

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/dist/src/commands/OptionsProcessor.js

@@ -68,7 +68,7 @@ class OptionsProcessor {
         return path;
     }
     processColor(key, value, options) {
-        if ((0, isEqual_1.default)(key, 'color') || (0, endsWith_1.default)(key, 'Color')) {
+        if (((0, isEqual_1.default)(key, 'color') || (0, endsWith_1.default)(key, 'Color')) && !(0, isEqual_1.default)(key, 'bkgColor')) {
             if (react_native_1.Platform.OS === 'ios')
                 this.processColorIOS(key, value, options);
             else
@@ -313,6 +313,13 @@ class OptionsProcessor {
                 enter: animation.topBar,
             };
         }
+        if (animation.statusBar &&
+            !(0, has_1.default)(animation, 'statusBar.enter') &&
+            !(0, has_1.default)(animation, 'statusBar.exit')) {
+            parentOptions.push.statusBar = {
+                enter: animation.statusBar,
+            };
+        }
         if (animation.bottomTabs &&
             !(0, has_1.default)(animation, 'bottomTabs.enter') &&
             !(0, has_1.default)(animation, 'bottomTabs.exit')) {

package/lib/dist/src/interfaces/Options.d.ts

@@ -1166,12 +1166,34 @@ export interface IconInsets {
      */
     right?: number;
 }
+export interface ColorAnimationOptions {
+    /**
+     * Color duration time; Default is as determined by the OS
+     */
+    duration?: number;
+}
 export interface ViewAnimationOptions extends ScreenAnimationOptions {
     /**
      * ID of the Top Bar we want to animate
      */
     id?: string;
 }
+export interface TopBarAnimationOptions extends ViewAnimationOptions {
+    /**
+     * Animation of the top-bar's background color, in case the top-bar background color
+     * has been explicitly specified.
+     *
+     * Applicable only in transition of screens with color (non-component) backgrounds.
+     */
+    bkgColor?: ColorAnimationOptions;
+}
+export interface StatusBarAnimationOptions extends ViewAnimationOptions {
+    /**
+     * Animation of the status-bar's background color, in case its background color
+     * has been explicitly specified.
+     */
+    bkgColor?: ColorAnimationOptions;
+}
 export interface EnterExitAnimationOptions {
     /**
      * Animate opening component
@@ -1226,9 +1248,17 @@ export interface StackAnimationOptions {
     /**
      * Configure animations for the top bar
      */
-    topBar?: ViewAnimationOptions | {
-        enter?: ViewAnimationOptions;
-        exit?: ViewAnimationOptions;
+    topBar?: TopBarAnimationOptions | {
+        enter?: TopBarAnimationOptions;
+        exit?: TopBarAnimationOptions;
+    };
+    /**
+     * Configure animations for the status bar (typically aligned
+     * with the top-bar's)
+     */
+    statusBar?: StatusBarAnimationOptions | {
+        enter?: StatusBarAnimationOptions;
+        exit?: StatusBarAnimationOptions;
     };
     /**
      * Configure animations for the bottom tabs

package/lib/ios/BottomTabsBasePresenter.m

@@ -1,7 +1,7 @@
 #import "BottomTabsBasePresenter.h"
 #import "RNNBottomTabsController.h"
-#import "UIImage+utils.h"
 #import "RNNConvert.h"
+#import "UIImage+utils.h"
 
 @implementation BottomTabsBasePresenter
 

package/lib/ios/RNNConvert.h

@@ -9,5 +9,4 @@
 
 + (UIBarStyle)UIBarStyle:(id)json;
 
-
 @end

package/lib/ios/RNNConvert.m

@@ -32,13 +32,8 @@ RCT_ENUM_CONVERTER(UIModalPresentationStyle, (@{
                    }),
                    UIModalPresentationFullScreen, integerValue)
 
-RCT_ENUM_CONVERTER(
-    UIBarStyle,
-    (@{
-      @"default" : @(UIBarStyleDefault),
-      @"black" : @(UIBarStyleBlack)
-    }),
-    UIBarStyleDefault,
-    integerValue)
+RCT_ENUM_CONVERTER(UIBarStyle,
+                   (@{@"default" : @(UIBarStyleDefault), @"black" : @(UIBarStyleBlack)}),
+                   UIBarStyleDefault, integerValue)
 
 @end

package/lib/ios/RNNStackPresenter.m

@@ -1,11 +1,11 @@
 #import "RNNStackPresenter.h"
 #import "InteractivePopGestureDelegate.h"
+#import "RNNConvert.h"
 #import "RNNCustomTitleView.h"
 #import "RNNReactBackgroundView.h"
 #import "RNNStackController.h"
 #import "TopBarPresenterCreator.h"
 #import "UINavigationController+RNNOptions.h"
-#import "RNNConvert.h"
 
 @interface RNNStackPresenter () {
     RNNReactComponentRegistry *_componentRegistry;

package/lib/src/commands/OptionsProcessor.ts

@@ -20,6 +20,8 @@ import {
   OptionsSearchBar,
   OptionsTopBar,
   StackAnimationOptions,
+  StatusBarAnimationOptions,
+  TopBarAnimationOptions,
   ViewAnimationOptions,
 } from '../interfaces/Options';
 import { Deprecations } from './Deprecations';
@@ -117,7 +119,7 @@ export class OptionsProcessor {
   }
 
   private processColor(key: string, value: any, options: Record<string, any>) {
-    if (isEqual(key, 'color') || endsWith(key, 'Color')) {
+    if ((isEqual(key, 'color') || endsWith(key, 'Color')) && !isEqual(key, 'bkgColor')) {
       if (Platform.OS === 'ios') this.processColorIOS(key, value, options);
       else this.processColorAndroid(key, value, options);
     }
@@ -399,7 +401,16 @@ export class OptionsProcessor {
     }
     if (animation.topBar && !has(animation, 'topBar.enter') && !has(animation, 'topBar.exit')) {
       parentOptions.push!!.topBar = {
-        enter: animation.topBar as ViewAnimationOptions,
+        enter: animation.topBar as TopBarAnimationOptions,
+      };
+    }
+    if (
+      animation.statusBar &&
+      !has(animation, 'statusBar.enter') &&
+      !has(animation, 'statusBar.exit')
+    ) {
+      parentOptions.push!!.statusBar = {
+        enter: animation.statusBar as StatusBarAnimationOptions,
       };
     }
     if (

package/lib/src/interfaces/Options.ts

@@ -1267,6 +1267,13 @@ export interface IconInsets {
   right?: number;
 }
 
+export interface ColorAnimationOptions {
+  /**
+   * Color duration time; Default is as determined by the OS
+   */
+  duration?: number;
+}
+
 export interface ViewAnimationOptions extends ScreenAnimationOptions {
   /**
    * ID of the Top Bar we want to animate
@@ -1274,6 +1281,24 @@ export interface ViewAnimationOptions extends ScreenAnimationOptions {
   id?: string;
 }
 
+export interface TopBarAnimationOptions extends ViewAnimationOptions {
+  /**
+   * Animation of the top-bar's background color, in case the top-bar background color
+   * has been explicitly specified.
+   *
+   * Applicable only in transition of screens with color (non-component) backgrounds.
+   */
+  bkgColor?: ColorAnimationOptions;
+}
+
+export interface StatusBarAnimationOptions extends ViewAnimationOptions {
+  /**
+   * Animation of the status-bar's background color, in case its background color
+   * has been explicitly specified.
+   */
+  bkgColor?: ColorAnimationOptions;
+}
+
 export interface EnterExitAnimationOptions {
   /**
    * Animate opening component
@@ -1332,10 +1357,20 @@ export interface StackAnimationOptions {
    * Configure animations for the top bar
    */
   topBar?:
-    | ViewAnimationOptions
+    | TopBarAnimationOptions
     | {
-        enter?: ViewAnimationOptions;
-        exit?: ViewAnimationOptions;
+        enter?: TopBarAnimationOptions;
+        exit?: TopBarAnimationOptions;
+      };
+  /**
+   * Configure animations for the status bar (typically aligned
+   * with the top-bar's)
+   */
+  statusBar?:
+    | StatusBarAnimationOptions
+    | {
+        enter?: StatusBarAnimationOptions;
+        exit?: StatusBarAnimationOptions;
       };
   /**
    * Configure animations for the bottom tabs

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-navigation",
-  "version": "7.42.0",
+  "version": "7.44.0",
   "description": "React Native Navigation - truly native navigation for iOS and Android",
   "license": "MIT",
   "nativePackage": true,