react-native-navigation 7.42.0-snapshot.1529 → 7.99.1-testbla

package/lib/Mock/Components/ComponentScreen.tsx

@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
-import { View, Text, TouchableOpacity, Image, ImageURISource } from 'react-native';
-import { Navigation, ImageResource } from 'react-native-navigation';
+import { View, Text, TouchableOpacity, Image, ImageURISource} from 'react-native';
+import { Navigation, ImageResource} from 'react-native-navigation';
 import { ComponentProps } from '../ComponentProps';
 import { VISIBLE_SCREEN_TEST_ID } from '../constants';
 import { LayoutStore } from '../Stores/LayoutStore';
@@ -10,7 +10,8 @@ import { events } from '../Stores/EventsStore';
 import _ from 'lodash';
 import { switchTabByIndex } from '../actions/layoutActions';
 
-function isURISource(src: ImageResource | undefined): src is ImageURISource {
+
+function isURISource(src: ImageResource| undefined): src is ImageURISource {
   return !!src && typeof src === 'object' && 'uri' in src;
 }
 
@@ -35,15 +36,12 @@ export const ComponentScreen = connect(
       if (bottomTabsOptions?.visible === false) return null;
       const buttons = bottomTabs!.children!.map((child, i) => {
         const bottomTabOptions = child.resolveOptions().bottomTab;
-        const icon =
-          (bottomTabs as any).selectedIndex === i
-            ? bottomTabOptions?.selectedIcon
-            : bottomTabOptions?.icon;
+        const icon = (bottomTabs as any).selectedIndex === i ? bottomTabOptions?.selectedIcon : bottomTabOptions?.icon;
         const iconURI = isURISource(icon) ? icon.uri : undefined;
         return (
           <View key={`tab-${i}`}>
             <TouchableOpacity
-              style={{ padding: 10 }}
+              style={{padding:10}}
               testID={bottomTabOptions?.testID}
               onPress={() => {
                 events.invokeBottomTabPressed({
@@ -53,34 +51,22 @@ export const ComponentScreen = connect(
                   switchTabByIndex(this.props.layoutNode.getBottomTabs(), i);
               }}
             >
-              <View style={{ justifyContent: 'center', alignItems: 'center' }}>
-                <Text>{bottomTabOptions?.badge}</Text>
-                {iconURI && (
-                  <Image
-                    style={{ width: 18, height: 18, marginBottom: 5 }}
-                    source={{ uri: iconURI }}
-                  />
-                )}
-                <Text style={{ fontSize: 12 }}>{bottomTabOptions?.text || ''}</Text>
-              </View>
+            <View style={{justifyContent: 'center', alignItems: 'center'}}>
+              <Text>{bottomTabOptions?.badge}</Text>
+              {iconURI && <Image style={{width: 18, height: 18, marginBottom: 5}} source={{uri: iconURI}}/>}
+              <Text style={{fontSize: 12}}>{bottomTabOptions?.text || ''}</Text>
+            </View>
             </TouchableOpacity>
           </View>
         );
       });
 
       return (
-        <View
-          testID={bottomTabsOptions?.testID}
-          style={{
-            flexDirection: 'row',
-            justifyContent: 'center',
-            width: '100%',
-            backgroundColor: '#F0F2F5',
-          }}
-        >
+      <View 
+        testID={bottomTabsOptions?.testID} 
+        style={{flexDirection: 'row',justifyContent: 'center', width: '100%', backgroundColor: '#F0F2F5'}}>
           {buttons}
-        </View>
-      );
+      </View>);
     }
 
     render() {

package/lib/Mock/Components/LayoutComponent.tsx

@@ -19,8 +19,8 @@ export const LayoutComponent = class extends Component<ComponentProps> {
     return <View />;
   }
   componentDidCatch(error: Error, errorInfo: React.ErrorInfo) {
-    const err = new Error(
-      `Error while trying to render layout ${this.props.layoutNode.nodeId} of type ${this.props.layoutNode.type}: ${error}\n${errorInfo?.componentStack}`
+    const err =  new Error(
+      `Error while trying to render layout ${this.props.layoutNode.nodeId} of type ${this.props.layoutNode.type}: ${error}\n${errorInfo?.componentStack}`,
     );
     (err as any).cause = error;
     throw err;

package/lib/Mock/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mockNativeComponents = exports.ApplicationMock = void 0;
+exports.ApplicationMock = void 0;
+exports.mockNativeComponents = mockNativeComponents;
 const tslib_1 = require("tslib");
 exports.ApplicationMock = require('./Application').Application;
 tslib_1.__exportStar(require("./constants"), exports);
@@ -11,4 +12,3 @@ function mockNativeComponents() {
     const { Navigation } = require('react-native-navigation');
     Navigation.mockNativeComponents(new NativeCommandsSender(), new NativeEventsReceiver(), new AppRegistryService());
 }
-exports.mockNativeComponents = mockNativeComponents;

package/lib/android/app/build.gradle

@@ -20,7 +20,6 @@ def DEFAULT_KOTLIN_STDLIB = 'kotlin-stdlib-jdk8'
 def kotlinVersion = safeExtGet("RNNKotlinVersion", DEFAULT_KOTLIN_VERSION)
 def kotlinStdlib = safeExtGet('RNNKotlinStdlib',DEFAULT_KOTLIN_STDLIB )
 def kotlinCoroutinesCore = safeExtGet('RNNKotlinCoroutinesCore', '1.5.2')
-
 android {
     namespace 'com.reactnativenavigation'
     compileSdkVersion safeExtGetFallbackLowerBound('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)

package/lib/android/app/src/main/java/com/reactnativenavigation/NavigationApplication.java

@@ -4,13 +4,10 @@ import android.app.Application;
 
 import com.facebook.react.ReactApplication;
 import com.facebook.react.ReactNativeHost;
-import com.facebook.react.soloader.OpenSourceMergedSoMapping;
 import com.facebook.soloader.SoLoader;
 import com.reactnativenavigation.react.ReactGateway;
 import com.reactnativenavigation.viewcontrollers.externalcomponent.ExternalComponentCreator;
 
-import java.util.Collections;
-import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -18,28 +15,15 @@ import androidx.annotation.NonNull;
 
 public abstract class NavigationApplication extends Application implements ReactApplication {
 
-	public static NavigationApplication instance;
-
-	private final Map<String, ExternalComponentCreator> externalComponents = new HashMap<>();
 	private ReactGateway reactGateway;
-
-    public NavigationApplication() {
-        this(Collections.emptyMap());
-    }
-
-    public NavigationApplication(Map<RNNToggles, Boolean> featureToggleOverrides) {
-        instance = this;
-        RNNFeatureToggles.init(featureToggleOverrides);
-    }
+	public static NavigationApplication instance;
+	final Map<String, ExternalComponentCreator> externalComponents = new HashMap<>();
 
 	@Override
 	public void onCreate() {
 		super.onCreate();
-        try {
-            SoLoader.init(this, OpenSourceMergedSoMapping.INSTANCE);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
+        instance = this;
+        SoLoader.init(this, false);
         reactGateway = createReactGateway();
 	}
 

package/lib/android/app/src/main/java/com/reactnativenavigation/options/ValueAnimationOptions.kt

@@ -50,9 +50,9 @@ class ValueAnimationOptions {
             to += this.to[animationValueAccessor!!(view)]
         }
         val animator = ObjectAnimator.ofFloat(view,
-            animProp,
-            from,
-            to
+                animProp,
+                from,
+                to
         )
         animator.interpolator = interpolator
         if (duration.hasValue()) animator.duration = duration.get().toLong()

package/lib/android/app/src/main/java/com/reactnativenavigation/react/ReactView.java

@@ -5,8 +5,6 @@ import android.content.Context;
 import android.os.Bundle;
 import android.view.MotionEvent;
 
-import androidx.annotation.RestrictTo;
-
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactRootView;
 import com.facebook.react.bridge.ReactContext;
@@ -14,12 +12,14 @@ import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.uimanager.JSTouchDispatcher;
 import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.events.EventDispatcher;
+import com.reactnativenavigation.viewcontrollers.viewcontroller.ScrollEventListener;
 import com.reactnativenavigation.react.events.ComponentType;
 import com.reactnativenavigation.react.events.EventEmitter;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.IReactView;
-import com.reactnativenavigation.viewcontrollers.viewcontroller.ScrollEventListener;
 import com.reactnativenavigation.views.component.Renderable;
 
+import androidx.annotation.RestrictTo;
+
 @SuppressLint("ViewConstructor")
 public class ReactView extends ReactRootView implements IReactView, Renderable {
 

package/lib/android/app/src/main/java/com/reactnativenavigation/react/modal/ModalHostLayout.kt

@@ -34,7 +34,7 @@ open class ModalHostLayout(reactContext: ThemedReactContext) : ViewGroup(reactCo
     }
 
     @TargetApi(23)
-    override fun dispatchProvideStructure(structure: ViewStructure) {
+    override fun dispatchProvideStructure(structure: ViewStructure?) {
         mHostView.dispatchProvideStructure(structure)
     }
 

package/lib/android/app/src/main/java/com/reactnativenavigation/utils/ReactTypefaceUtils.java

@@ -18,7 +18,6 @@ import android.graphics.Typeface;
 import android.text.TextUtils;
 import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.common.ReactConstants;
 import com.facebook.react.views.text.ReactFontManager;
 import com.facebook.react.views.text.ReactTextShadowNode;
 import java.util.ArrayList;
@@ -97,12 +96,12 @@ public class ReactTypefaceUtils {
 
     int want = 0;
     if ((weight == Typeface.BOLD)
-        || ((oldStyle & Typeface.BOLD) != 0 && weight == ReactConstants.UNSET)) {
+        || ((oldStyle & Typeface.BOLD) != 0 && weight == ReactTextShadowNode.UNSET)) {
       want |= Typeface.BOLD;
     }
 
     if ((style == Typeface.ITALIC)
-        || ((oldStyle & Typeface.ITALIC) != 0 && style == ReactConstants.UNSET)) {
+        || ((oldStyle & Typeface.ITALIC) != 0 && style == ReactTextShadowNode.UNSET)) {
       want |= Typeface.ITALIC;
     }
 

package/lib/android/app/src/main/java/com/reactnativenavigation/utils/ReactViewGroup.kt

@@ -1,9 +1,7 @@
 package com.reactnativenavigation.utils
 
-import com.facebook.react.common.annotations.UnstableReactNativeAPI
-import com.facebook.react.uimanager.drawable.CSSBackgroundDrawable
+import com.facebook.react.views.view.ReactViewBackgroundDrawable
 import com.facebook.react.views.view.ReactViewGroup
 
-@OptIn(UnstableReactNativeAPI::class)
 val ReactViewGroup.borderRadius: Float
-    get() = (background as? CSSBackgroundDrawable)?.fullBorderWidth ?: 0f
+    get() = (background as? ReactViewBackgroundDrawable)?.fullBorderRadius ?: 0f

package/lib/android/app/src/main/java/com/reactnativenavigation/utils/SystemUiUtils.kt

@@ -121,25 +121,19 @@ object SystemUiUtils {
         @ColorInt color: Int,
         translucent: Boolean
     ) {
-        val opaqueColor =
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
-                Color.BLACK
-            } else {
-                val colorAlpha = Color.alpha(color)
-                val alpha = if (translucent && colorAlpha == 255) STATUS_BAR_HEIGHT_TRANSLUCENCY else colorAlpha/255.0f
-                val red: Int = Color.red(color)
-                val green: Int = Color.green(color)
-                val blue: Int = Color.blue(color)
-                Color.argb(ceil(alpha * 255).toInt(), red, green, blue)
-            }
+        val opaqueColor = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+            Color.BLACK
+        }else{
+            val colorAlpha = Color.alpha(color)
+            val alpha = if (translucent && colorAlpha == 255) STATUS_BAR_HEIGHT_TRANSLUCENCY else colorAlpha/255.0f
+            val red: Int = Color.red(color)
+            val green: Int = Color.green(color)
+            val blue: Int = Color.blue(color)
+            Color.argb(ceil(alpha * 255).toInt(), red, green, blue)
+        }
         window?.statusBarColor = opaqueColor
     }
 
-    @JvmStatic
-    fun getStatusBarColor(window: Window?): Int? {
-        return window?.statusBarColor
-    }
-
     @JvmStatic
     fun hideStatusBar(window: Window?, view: View) {
         window?.let {

package/lib/android/app/src/main/java/com/reactnativenavigation/utils/ViewUtils.java

@@ -5,6 +5,8 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewParent;
 
+import com.facebook.react.views.view.ReactViewBackgroundDrawable;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -12,9 +14,6 @@ import androidx.annotation.Nullable;
 
 import static com.reactnativenavigation.utils.ObjectUtils.perform;
 
-import com.facebook.react.common.annotations.UnstableReactNativeAPI;
-import com.facebook.react.uimanager.drawable.CSSBackgroundDrawable;
-
 public class ViewUtils {
     @Nullable
     public static <T extends View> T findChildByClass(ViewGroup root, Class<T> clazz) {
@@ -108,10 +107,9 @@ public class ViewUtils {
         return ((ViewGroup) parent).indexOfChild(view);
     }
 
-    @UnstableReactNativeAPI
     public static int getBackgroundColor(View view) {
-        if (view.getBackground() instanceof CSSBackgroundDrawable) {
-            return ((CSSBackgroundDrawable) view.getBackground()).getColor();
+        if (view.getBackground() instanceof ReactViewBackgroundDrawable) {
+            return ((ReactViewBackgroundDrawable) view.getBackground()).getColor();
         }
         throw new RuntimeException(view.getBackground().getClass().getSimpleName() + " is not ReactViewBackgroundDrawable");
     }

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/bottomtabs/BottomTabsAnimator.kt

@@ -1,9 +1,9 @@
 package com.reactnativenavigation.viewcontrollers.bottomtabs
 
-import com.reactnativenavigation.views.animations.BaseViewAppearanceAnimator
+import com.reactnativenavigation.views.animations.BaseViewAnimator
 import com.reactnativenavigation.views.bottomtabs.BottomTabs
 
-class BottomTabsAnimator(view: BottomTabs? = null) : BaseViewAppearanceAnimator<BottomTabs>(HideDirection.Down, view) {
+class BottomTabsAnimator(view: BottomTabs? = null) : BaseViewAnimator<BottomTabs>(HideDirection.Down, view) {
     override fun onShowAnimationEnd() {
         view.restoreBottomNavigation(false)
     }

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/child/ChildController.java

@@ -2,23 +2,30 @@ package com.reactnativenavigation.viewcontrollers.child;
 
 import android.app.Activity;
 import android.content.res.Configuration;
+import android.os.Build;
+import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
-
-import androidx.annotation.CallSuper;
-import androidx.core.view.ViewCompat;
-import androidx.core.view.WindowInsetsCompat;
+import android.view.WindowInsets;
 
 import com.reactnativenavigation.options.Options;
-import com.reactnativenavigation.viewcontrollers.navigator.Navigator;
-import com.reactnativenavigation.viewcontrollers.viewcontroller.NoOpYellowBoxDelegate;
+import com.reactnativenavigation.utils.LogKt;
+import com.reactnativenavigation.viewcontrollers.parent.ParentController;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.Presenter;
+import com.reactnativenavigation.viewcontrollers.viewcontroller.NoOpYellowBoxDelegate;
+import com.reactnativenavigation.viewcontrollers.navigator.Navigator;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.ViewController;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.overlay.ViewControllerOverlay;
 import com.reactnativenavigation.views.component.Component;
 
+import androidx.annotation.CallSuper;
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowCompat;
+import androidx.core.view.WindowInsetsCompat;
+
 public abstract class ChildController<T extends ViewGroup> extends ViewController<T> {
-    protected final Presenter presenter;
+    private final Presenter presenter;
     private final ChildControllersRegistry childRegistry;
 
     public ChildControllersRegistry getChildRegistry() {

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/component/ComponentViewController.java

@@ -1,29 +1,28 @@
 package com.reactnativenavigation.viewcontrollers.component;
 
-import static com.reactnativenavigation.utils.ObjectUtils.perform;
-
-import android.animation.Animator;
 import android.app.Activity;
 import android.content.res.Configuration;
 import android.view.View;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.graphics.Insets;
-import androidx.core.view.ViewCompat;
-import androidx.core.view.WindowInsetsCompat;
-
+import com.reactnativenavigation.utils.LogKt;
+import com.reactnativenavigation.viewcontrollers.viewcontroller.ScrollEventListener;
 import com.reactnativenavigation.options.Options;
+import com.reactnativenavigation.viewcontrollers.viewcontroller.Presenter;
 import com.reactnativenavigation.utils.SystemUiUtils;
+import com.reactnativenavigation.viewcontrollers.viewcontroller.ReactViewCreator;
 import com.reactnativenavigation.viewcontrollers.child.ChildController;
 import com.reactnativenavigation.viewcontrollers.child.ChildControllersRegistry;
-import com.reactnativenavigation.viewcontrollers.stack.statusbar.StatusBarController;
-import com.reactnativenavigation.viewcontrollers.viewcontroller.Presenter;
-import com.reactnativenavigation.viewcontrollers.viewcontroller.ReactViewCreator;
-import com.reactnativenavigation.viewcontrollers.viewcontroller.ScrollEventListener;
+import com.reactnativenavigation.viewcontrollers.viewcontroller.ViewController;
 import com.reactnativenavigation.views.component.ComponentLayout;
 
-public class ComponentViewController extends ChildController<ComponentLayout> implements StatusBarController {
+import androidx.annotation.NonNull;
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
+
+import static com.reactnativenavigation.utils.ObjectUtils.perform;
+
+public class ComponentViewController extends ChildController<ComponentLayout> {
     private final String componentName;
     private final ComponentPresenter presenter;
     private final ReactViewCreator viewCreator;
@@ -65,29 +64,6 @@ public class ComponentViewController extends ChildController<ComponentLayout> im
         presenter.setDefaultOptions(defaultOptions);
     }
 
-    @Override
-    public StatusBarController getStatusBarController() {
-        return this;
-    }
-
-    @Nullable
-    @Override
-    public Animator getStatusBarPushAnimation(@NonNull Options appearingOptions) {
-        if (super.presenter != null) {
-            return super.presenter.getStatusBarPushAnimation(appearingOptions);
-        }
-        return null;
-    }
-
-    @Nullable
-    @Override
-    public Animator getStatusBarPopAnimation(@NonNull Options appearingOptions, @NonNull Options disappearingOptions) {
-        if (super.presenter != null) {
-            return super.presenter.getStatusBarPopAnimation(appearingOptions, disappearingOptions);
-        }
-        return null;
-    }
-
     @Override
     public ScrollEventListener getScrollEventListener() {
         return perform(view, null, ComponentLayout::getScrollEventListener);

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

@@ -159,19 +159,16 @@ 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 = pushChildToStack(child);
-
-        if (!isViewCreated()) {
-            return;
-        }
-
+        final ViewController<?> toRemove = stack.peek();
+        if (size() > 0) backButtonHelper.addToPushedChild(child);
+        child.setParentController(this);
+        stack.push(child.getId(), child);
+        if (!isViewCreated()) return;
         Options resolvedOptions = resolveCurrentOptions(presenter.getDefaultOptions());
-        updateChildLayout(child, resolvedOptions);
-
+        addChildToStack(child, resolvedOptions);
         if (toRemove != null) {
-            StackAnimationOptions animOptions = resolvedOptions.animations.push;
-            if (animOptions.enabled.isTrueOrUndefined()) {
+            StackAnimationOptions animation = resolvedOptions.animations.push;
+            if (animation.enabled.isTrueOrUndefined()) {
                 animator.push(
                         child,
                         toRemove,
@@ -198,17 +195,7 @@ public class StackController extends ParentController<StackLayout> {
         listener.onSuccess(toAdd.getId());
     }
 
-    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) {
+    private void addChildToStack(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)));
@@ -235,7 +222,7 @@ public class StackController extends ParentController<StackLayout> {
         child.setParentController(this);
         stack.push(child.getId(), child);
         Options resolvedOptions = resolveCurrentOptions(presenter.getDefaultOptions());
-        updateChildLayout(child, resolvedOptions);
+        addChildToStack(child, resolvedOptions);
 
         CommandListener listenerAdapter = new CommandListenerAdapter() {
             @Override
@@ -329,7 +316,7 @@ public class StackController extends ParentController<StackLayout> {
                     appearing,
                     disappearing,
                     disappearingOptions,
-                    presenter.getAdditionalPopAnimations(appearingOptions, disappearingOptions, appearing),
+                    presenter.getAdditionalPopAnimations(appearingOptions, disappearingOptions),
                     () -> finishPopping(appearing, disappearing, listener)
             );
         } else {

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

@@ -233,7 +233,7 @@ public class StackPresenter {
 
         topBar.setBorderHeight(topBarOptions.borderHeight.get(0d));
         topBar.setBorderColor(topBarOptions.borderColor.get(DEFAULT_BORDER_COLOR));
-        topBarController.setBackgroundColor(topBarOptions, Color.WHITE);
+        topBar.setBackgroundColor(topBarOptions.background.color.get(Color.WHITE));
 
         if (topBarOptions.background.component.hasValue()) {
             View createdComponent = findBackgroundComponent(topBarOptions.background.component);
@@ -417,23 +417,18 @@ public class StackPresenter {
         }
     }
 
-    public List<Animator> getAdditionalPushAnimations(
-            StackController stack,
-            ViewController<?> appearingCtrl,
+    public List<Animator> getAdditionalPushAnimations(StackController stack, ViewController<?> appearing,
             Options appearingOptions) {
         return CollectionUtils.asList(
-                topBarController.getPushAnimation(appearingOptions, getTopBarTranslationAnimationDelta(stack, appearingCtrl)),
-                perform(appearingCtrl.getStatusBarController(), null, sbc -> sbc.getStatusBarPushAnimation(appearingOptions)),
-                perform(bottomTabsController, null, btc -> btc.getPushAnimation(appearingOptions))
-            );
+                topBarController.getPushAnimation(appearingOptions,
+                        getTopBarTranslationAnimationDelta(stack, appearing)),
+                perform(bottomTabsController, null, btc -> btc.getPushAnimation(appearingOptions)));
     }
 
-    public List<Animator> getAdditionalPopAnimations(Options appearingOptions, Options disappearingOptions, ViewController<?> appearingCtrl) {
+    public List<Animator> getAdditionalPopAnimations(Options appearingOptions, Options disappearingOptions) {
         return CollectionUtils.asList(
                 topBarController.getPopAnimation(appearingOptions, disappearingOptions),
-                perform(appearingCtrl.getStatusBarController(), null, sbc -> sbc.getStatusBarPopAnimation(appearingOptions, disappearingOptions)),
-                perform(bottomTabsController, null, btc -> btc.getPopAnimation(appearingOptions, disappearingOptions))
-        );
+                perform(bottomTabsController, null, btc -> btc.getPopAnimation(appearingOptions, disappearingOptions)));
     }
 
     public List<Animator> getAdditionalSetRootAnimations(StackController stack, ViewController<?> appearing,
@@ -623,7 +618,9 @@ public class StackPresenter {
         if (resolveOptions.subtitle.font.hasValue()) {
             topBar.setSubtitleTypeface(typefaceLoader, resolveOptions.subtitle.font);
         }
-        topBarController.setBackgroundColor(topBarOptions);
+
+        if (topBarOptions.background.color.hasValue())
+            topBar.setBackgroundColor(topBarOptions.background.color.get());
 
         if (topBarOptions.background.component.hasValue()) {
             if (backgroundControllers.containsKey(component)) {

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

@@ -1,11 +1,9 @@
 package com.reactnativenavigation.viewcontrollers.stack.topbar
 
-import com.reactnativenavigation.views.animations.BaseViewAppearanceAnimator
+import com.reactnativenavigation.views.animations.BaseViewAnimator
 import com.reactnativenavigation.views.stack.topbar.TopBar
 
-class TopBarAppearanceAnimator @JvmOverloads constructor(view: TopBar? = null)
-    : BaseViewAppearanceAnimator<TopBar>(HideDirection.Up, view) {
-
+class TopBarAnimator @JvmOverloads constructor(view: TopBar? = null) : BaseViewAnimator<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: TopBarAppearanceAnimator = TopBarAppearanceAnimator(topBar)
+    private val animator: TopBarAnimator = TopBarAnimator(topBar)
 
     fun enableCollapse(scrollEventListener: ScrollEventListener?) {
         this.scrollEventListener = scrollEventListener