react-native-navigation 7.24.0 → 7.24.1

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

@@ -66,18 +66,22 @@ public class ReactView extends ReactRootView implements IReactView, Renderable {
     }
 
     public void sendComponentWillStart(ComponentType type) {
-        if (this.reactInstanceManager == null) return;
-        ReactContext currentReactContext = reactInstanceManager.getCurrentReactContext();
-        if (currentReactContext != null)
-            new EventEmitter(currentReactContext).emitComponentWillAppear(componentId, componentName, type);
+        this.post(()->{
+            if (this.reactInstanceManager == null) return;
+            ReactContext currentReactContext = reactInstanceManager.getCurrentReactContext();
+            if (currentReactContext != null)
+                new EventEmitter(currentReactContext).emitComponentWillAppear(componentId, componentName, type);
+        });
     }
 
     public void sendComponentStart(ComponentType type) {
-        if (this.reactInstanceManager == null) return;
-        ReactContext currentReactContext = reactInstanceManager.getCurrentReactContext();
-        if (currentReactContext != null) {
-            new EventEmitter(currentReactContext).emitComponentDidAppear(componentId, componentName, type);
-        }
+        this.post(()->{
+            if (this.reactInstanceManager == null) return;
+            ReactContext currentReactContext = reactInstanceManager.getCurrentReactContext();
+            if (currentReactContext != null) {
+                new EventEmitter(currentReactContext).emitComponentDidAppear(componentId, componentName, type);
+            }
+        });
     }
 
     public void sendComponentStop(ComponentType type) {

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

@@ -17,7 +17,7 @@ import kotlin.math.ceil
 object SystemUiUtils {
     private const val STATUS_BAR_HEIGHT_M = 24
     private const val STATUS_BAR_HEIGHT_L = 25
-    private const val STATUS_BAR_HEIGHT_TRANSLUCENCY = 0.65f
+    internal const val STATUS_BAR_HEIGHT_TRANSLUCENCY = 0.65f
     private var statusBarHeight = -1
     var navigationBarDefaultColor = -1
         private set
@@ -124,7 +124,8 @@ object SystemUiUtils {
         val opaqueColor = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
             Color.BLACK
         }else{
-            val alpha = if (translucent) STATUS_BAR_HEIGHT_TRANSLUCENCY else 1f
+            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)

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

@@ -274,6 +274,7 @@ public class BottomTabsController extends ParentController<BottomTabsLayout> imp
         getCurrentView().setVisibility(View.INVISIBLE);
         bottomTabs.setCurrentItem(newIndex, false);
         getCurrentView().setVisibility(View.VISIBLE);
+        getCurrentChild().onViewWillAppear();
         getCurrentChild().onViewDidAppear();
     }
 

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

@@ -84,6 +84,7 @@ public class ComponentViewController extends ChildController<ComponentLayout> {
 
     @Override
     public void onViewDisappear() {
+        if(lastVisibilityState == VisibilityState.Disappear)return;
         lastVisibilityState = VisibilityState.Disappear;
         if (view != null) view.sendComponentStop();
         super.onViewDisappear();

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/modal/ModalPresenter.java

@@ -90,12 +90,10 @@ public class ModalPresenter {
     }
 
     private void onShowModalEnd(ViewController<?> toAdd, @Nullable ViewController<?> toRemove, CommandListener listener) {
-        toAdd.addOnAppearedListener(()->{
-            toAdd.onViewDidAppear();
-            if (toRemove != null && toAdd.resolveCurrentOptions(defaultOptions).modal.presentationStyle != ModalPresentationStyle.OverCurrentContext) {
-                toRemove.detachView();
-            }
-        });
+        toAdd.onViewDidAppear();
+        if (toRemove != null && toAdd.resolveCurrentOptions(defaultOptions).modal.presentationStyle != ModalPresentationStyle.OverCurrentContext) {
+            toRemove.detachView();
+        }
         listener.onSuccess(toAdd.getId());
     }
 

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

@@ -190,10 +190,8 @@ public class StackController extends ParentController<StackLayout> {
     }
 
     private void onPushAnimationComplete(ViewController<?> toAdd, ViewController<?> toRemove, CommandListener listener) {
-        toAdd.addOnAppearedListener(() -> {
-            toAdd.onViewDidAppear();
-            if (!peek().equals(toRemove)) getView().removeView(toRemove.getView());
-        });
+        toAdd.onViewDidAppear();
+        if (!peek().equals(toRemove)) getView().removeView(toRemove.getView());
         listener.onSuccess(toAdd.getId());
     }
 

package/lib/android/app/src/main/java/com/reactnativenavigation/views/bottomtabs/BottomTabs.java

@@ -88,6 +88,12 @@ public class BottomTabs extends AHBottomNavigation {
         if (getDefaultBackgroundColor() != color) setDefaultBackgroundColor(color);
     }
 
+    @Override
+    public void restoreBottomNavigation(boolean withAnimation) {
+        super.restoreBottomNavigation(withAnimation);
+        if (!withAnimation) setVisibility(View.VISIBLE);
+    }
+
     @Override
     public void hideBottomNavigation(boolean withAnimation) {
         super.hideBottomNavigation(withAnimation);

package/lib/android/app/src/test/java/com/reactnativenavigation/utils/SystemUiUtilsTest.kt

@@ -0,0 +1,27 @@
+package com.reactnativenavigation.utils
+
+import android.graphics.Color
+import android.view.Window
+import com.reactnativenavigation.BaseTest
+import com.reactnativenavigation.utils.SystemUiUtils.STATUS_BAR_HEIGHT_TRANSLUCENCY
+import org.junit.Test
+import org.mockito.Mockito
+import org.mockito.kotlin.verify
+import kotlin.math.ceil
+
+class SystemUiUtilsTest : BaseTest() {
+
+    @Test
+    fun `setStatusBarColor - should change color considering alpha`() {
+        val window = Mockito.mock(Window::class.java)
+        val alphaColor = Color.argb(44, 22, 255, 255)
+        val color = Color.argb(255, 22, 255, 255)
+        SystemUiUtils.setStatusBarColor(window, alphaColor, false)
+
+        verify(window).statusBarColor = alphaColor
+
+        SystemUiUtils.setStatusBarColor(window, color, true)
+
+        verify(window).statusBarColor = Color.argb(ceil(STATUS_BAR_HEIGHT_TRANSLUCENCY*255).toInt(), 22, 255, 255)
+    }
+}

package/lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/bottomtabs/BottomTabsControllerTest.kt

@@ -316,7 +316,24 @@ class BottomTabsControllerTest : BaseTest() {
             ), ArgumentMatchers.any(Int::class.java)
         )
     }
+    @Test
+    fun `mergeOptions - select tab calls onViewWillAppear to apply options on the selected child`(){
+        uut.ensureViewIsCreated()
+        Java6Assertions.assertThat(uut.selectedIndex).isZero
+
+        val options = Options()
+        options.bottomTabsOptions.currentTabIndex = Number(1)
+        uut.mergeOptions(options)
+        Java6Assertions.assertThat(uut.selectedIndex).isOne
+        Mockito.verify(child2).onViewWillAppear()
+        Mockito.verify(child2).onViewDidAppear()
 
+        options.bottomTabsOptions.currentTabIndex = Number(0)
+        uut.mergeOptions(options)
+        Java6Assertions.assertThat(uut.selectedIndex).isZero
+        Mockito.verify(child1).onViewWillAppear()
+        Mockito.verify(child1).onViewDidAppear()
+    }
     @Test
     fun mergeOptions_drawBehind() {
         Java6Assertions.assertThat(uut.getBottomInset(child1)).isEqualTo(uut.bottomTabs.height)

package/lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/component/ComponentViewControllerTest.java

@@ -94,6 +94,24 @@ public class ComponentViewControllerTest extends BaseTest {
         Mockito.verify(view, Mockito.times(1)).sendComponentStop();
     }
 
+    @Test
+    public void shouldNotSendDidDisappearAboutDisappearedView() {
+        uut.ensureViewIsCreated();
+        uut.onViewDisappear();
+        Mockito.verify(view, Mockito.times(0)).sendComponentStart();
+        Mockito.verify(view, Mockito.times(0)).sendComponentStop();
+
+        uut.onViewWillAppear();
+        uut.onViewDidAppear();
+        uut.onViewDisappear();
+        Mockito.verify(view, Mockito.times(1)).sendComponentStart();
+        Mockito.verify(view, Mockito.times(1)).sendComponentStop();
+
+        uut.onViewDisappear();
+        Mockito.verify(view, Mockito.times(1)).sendComponentStart();
+        Mockito.verify(view, Mockito.times(1)).sendComponentStop();
+    }
+
     @Test
     public void onViewDidAppear_componentStartIsEmittedOnlyIfComponentIsNotAppeared() {
         uut.ensureViewIsCreated();

package/lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/modal/ModalStackTest.java

@@ -84,10 +84,9 @@ public class ModalStackTest extends BaseTest {
     }
 
     @Test
-    public void showModal_DidAppearEventShouldWaitForReactViewToBeShown(){
+    public void showModal_DidAppearEventShouldBeCallled(){
         CommandListener listener = spy(new CommandListenerAdapter());
         uut.showModal(modal1, root, listener);
-        verify(modal1).addOnAppearedListener(any());
         verify(listener).onSuccess(modal1.getId());
         idleMainLooper();
         verify(modal1).onViewDidAppear();

package/lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/toptabs/TopTabsViewControllerTest.java

@@ -24,6 +24,7 @@ import com.reactnativenavigation.viewcontrollers.viewcontroller.ViewController;
 import com.reactnativenavigation.views.toptabs.TopTabsLayoutCreator;
 import com.reactnativenavigation.views.toptabs.TopTabsViewPager;
 
+import org.junit.Ignore;
 import org.junit.Test;
 import org.mockito.Mockito;
 
@@ -123,6 +124,7 @@ public class TopTabsViewControllerTest extends BaseTest {
     }
 
     @Test
+    @Ignore("TopTabs not yet well supported")
     public void lifecycleMethodsSentWhenSelectedTabChanges() {
         stack.ensureViewIsCreated();
         uut.ensureViewIsCreated();

package/package.json

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