react-native-navigation 7.23.1 → 7.24.0

package/lib/android/app/src/main/java/com/reactnativenavigation/views/stack/topbar/titlebar/ButtonBar.kt

@@ -4,17 +4,15 @@ import android.content.Context
 import android.graphics.PorterDuff
 import android.graphics.PorterDuffColorFilter
 import android.text.SpannableString
-import android.transition.AutoTransition
-import android.transition.TransitionManager
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.widget.ActionMenuView
 import androidx.appcompat.widget.Toolbar
+import androidx.core.view.children
 import com.reactnativenavigation.utils.ObjectUtils
 import com.reactnativenavigation.utils.ViewUtils
 import com.reactnativenavigation.viewcontrollers.stack.topbar.button.ButtonController
-
 open class ButtonBar internal constructor(context: Context) : Toolbar(context) {
     var shouldAnimate: Boolean=false
 
@@ -43,23 +41,17 @@ open class ButtonBar internal constructor(context: Context) : Toolbar(context) {
         get() = menu.size()
 
     fun addButton(menuItem: Int, intId: Int, order: Int, styledText: SpannableString): MenuItem? {
-        if(shouldAnimate)
-        TransitionManager.beginDelayedTransition(this,AutoTransition())
         return this.menu?.add(menuItem,
-                intId,
-                order,
-                styledText)
+            intId,
+            order,
+            styledText)
     }
 
     fun removeButton(buttonId: Int) {
-        if(shouldAnimate)
-        TransitionManager.beginDelayedTransition(this,AutoTransition())
         menu.removeItem(buttonId)
     }
 
     open fun clearButtons() {
-        if(shouldAnimate)
-        TransitionManager.beginDelayedTransition(this,AutoTransition())
         clearBackButton()
         if (menu.size() > 0) menu.clear()
     }
@@ -68,6 +60,9 @@ open class ButtonBar internal constructor(context: Context) : Toolbar(context) {
         return menu.getItem(index)
     }
 
+    fun getButtonById(id: Int): MenuItem? {
+        return menu.children.firstOrNull { it.itemId == id }
+    }
     fun containsButton(menuItem: MenuItem?, order: Int): Boolean {
         return menuItem != null && menu.findItem(menuItem.itemId) != null && menuItem.order == order
     }

package/lib/android/app/src/main/java/com/reactnativenavigation/views/stack/topbar/titlebar/TitleAndButtonsContainer.kt

@@ -76,8 +76,6 @@ class TitleAndButtonsContainer(context: Context) : ViewGroup(context) {
 
     fun setSubTitleTextAlignment(alignment: Alignment) = titleSubTitleBar.setSubTitleAlignment(alignment)
 
-    fun setTitleTextAlignment(alignment: Alignment) = titleSubTitleBar.setTitleAlignment(alignment)
-
     fun setBackgroundColor(color: ThemeColour) = if (color.hasValue()) setBackgroundColor(color.get()) else Unit
 
     fun setTitleFontSize(size: Float) = titleSubTitleBar.setTitleFontSize(size)

package/lib/android/app/src/main/java/com/reactnativenavigation/views/stack/topbar/titlebar/TitleSubTitleLayout.kt

@@ -38,13 +38,6 @@ class TitleSubTitleLayout(context: Context) : LinearLayout(context) {
         }
     }
 
-    fun setTitleAlignment(alignment: Alignment) {
-        if (alignment == Alignment.Center) {
-            (this.titleTextView.layoutParams as LayoutParams).gravity = Gravity.CENTER
-        } else {
-            (this.titleTextView.layoutParams as LayoutParams).gravity = Gravity.START or Gravity.CENTER_VERTICAL
-        }
-    }
 
     fun setTitleFontSize(size: Float) = titleTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, size)
 

package/lib/android/app/src/reactNative51/java/com/reactnativenavigation/react/NavigationReactNativeHost.java

@@ -8,6 +8,7 @@ import com.facebook.react.ReactPackage;
 import com.facebook.react.common.LifecycleState;
 import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
 import com.reactnativenavigation.NavigationApplication;
+import com.facebook.hermes.reactexecutor.HermesExecutorFactory;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -44,7 +45,7 @@ public abstract class NavigationReactNativeHost extends ReactNativeHost implemen
                 .setJSMainModulePath(getJSMainModuleName())
                 .setUseDeveloperSupport(getUseDeveloperSupport())
                 .setRedBoxHandler(getRedBoxHandler())
-                .setJavaScriptExecutorFactory(getJavaScriptExecutorFactory())
+                .setJavaScriptExecutorFactory(new HermesExecutorFactory())
                 .setUIImplementationProvider(getUIImplementationProvider())
                 .setInitialLifecycleState(LifecycleState.BEFORE_CREATE)
                 .setDevBundleDownloadListener(getDevBundleDownloadListener());

package/lib/android/app/src/test/java/com/reactnativenavigation/BaseTest.java

@@ -21,7 +21,7 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout;
 
 import com.reactnativenavigation.options.params.Bool;
 import com.reactnativenavigation.utils.Functions;
-import com.reactnativenavigation.utils.StatusBarUtils;
+import com.reactnativenavigation.utils.SystemUiUtils;
 import com.reactnativenavigation.utils.ViewUtils;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.ViewController;
 
@@ -59,15 +59,16 @@ public abstract class BaseTest {
         when(res.getColor(ArgumentMatchers.anyInt(),any())).thenReturn(0x00000);
     }
 
-    public void mockStatusBarUtils(int statusBarHeight,int statusBarHeightDp, Functions.Func block) {
-        try (MockedStatic<StatusBarUtils> theMock = Mockito.mockStatic(StatusBarUtils.class)) {
+
+    public void mockSystemUiUtils(int statusBarHeight, int statusBarHeightDp, Functions.Func1<MockedStatic<SystemUiUtils>> mockedBlock) {
+        try (MockedStatic<SystemUiUtils> theMock = Mockito.mockStatic(SystemUiUtils.class)) {
             theMock.when(() -> {
-                StatusBarUtils.getStatusBarHeight(any());
+                SystemUiUtils.getStatusBarHeight(any());
             }).thenReturn(statusBarHeight);
             theMock.when(() -> {
-                StatusBarUtils.getStatusBarHeightDp(any());
+                SystemUiUtils.getStatusBarHeightDp(any());
             }).thenReturn(statusBarHeightDp);
-            block.run();
+            mockedBlock.run(theMock);
         }
     }
 

package/lib/android/app/src/test/java/com/reactnativenavigation/TestActivity.java

@@ -15,4 +15,9 @@ public class TestActivity extends NavigationActivity {
     public void setNavigator(Navigator navigator) {
         this.navigator = navigator;
     }
+
+    @Override
+    public void onBackPressed() {
+        super.onBackPressed();
+    }
 }

package/lib/android/app/src/test/java/com/reactnativenavigation/mocks/ImageLoaderMock.kt

@@ -3,12 +3,13 @@ package com.reactnativenavigation.mocks
 import android.graphics.Canvas
 import android.graphics.ColorFilter
 import android.graphics.drawable.Drawable
-import com.nhaarman.mockitokotlin2.any
-import com.nhaarman.mockitokotlin2.doAnswer
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.whenever
+
 import com.reactnativenavigation.utils.ImageLoader
 import com.reactnativenavigation.utils.ImageLoader.ImagesLoadingListener
+import org.mockito.Mockito.doAnswer
+import org.mockito.kotlin.any
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
 import java.util.*
 
 object ImageLoaderMock {

package/lib/android/app/src/test/java/com/reactnativenavigation/mocks/Mocks.kt

@@ -1,10 +1,11 @@
 package com.reactnativenavigation.mocks
 
 import android.view.ViewGroup
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.whenever
+
 import com.reactnativenavigation.options.Options
 import com.reactnativenavigation.viewcontrollers.viewcontroller.ViewController
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
 
 object Mocks {
     fun viewController(): ViewController<*> {

package/lib/android/app/src/test/java/com/reactnativenavigation/mocks/TypefaceLoaderMock.kt

@@ -1,16 +1,20 @@
 package com.reactnativenavigation.mocks
 
 import android.graphics.Typeface
-import com.nhaarman.mockitokotlin2.mock
 import com.reactnativenavigation.options.parsers.TypefaceLoader
+import org.mockito.kotlin.mock
 
 class TypefaceLoaderMock() : TypefaceLoader(mock()) {
     private var mockTypefaces: Map<String, Typeface>? = null
 
     constructor(mockTypefaces: Map<String, Typeface>?) : this() {
         this.mockTypefaces = mockTypefaces
+
     }
 
+    override val defaultTypeFace: Typeface
+        get() = Typeface.DEFAULT
+
     override fun getTypeFace(fontFamilyName: String?, fontStyle: String?, fontWeight: String?, defaultTypeFace: Typeface?): Typeface? {
         return mockTypefaces?.getOrDefault(fontFamilyName, defaultTypeFace) ?: defaultTypeFace
     }

package/lib/android/app/src/test/java/com/reactnativenavigation/options/TransitionAnimationOptionsTest.kt

@@ -1,7 +1,6 @@
 package com.reactnativenavigation.options
-
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.whenever
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
 import com.reactnativenavigation.BaseTest
 import org.assertj.core.api.Assertions.assertThat
 import org.json.JSONArray

package/lib/android/app/src/test/java/com/reactnativenavigation/presentation/PresenterTest.java

@@ -1,41 +1,56 @@
 package com.reactnativenavigation.presentation;
 
 import android.app.Activity;
+import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
 import com.reactnativenavigation.BaseTest;
 import com.reactnativenavigation.options.Options;
 import com.reactnativenavigation.options.params.Bool;
+import com.reactnativenavigation.utils.SystemUiUtils;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.Presenter;
+import com.reactnativenavigation.viewcontrollers.viewcontroller.ViewController;
 
 import org.junit.Test;
 import org.mockito.Mockito;
 
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
 public class PresenterTest extends BaseTest {
     private Presenter uut;
     private Activity activity;
+    private ViewController<ViewGroup> controller;
 
     @Override
     public void beforeEach() {
         super.beforeEach();
         activity = newActivity();
+        controller = mock(ViewController.class);
         uut = new Presenter(activity, Options.EMPTY);
     }
 
     @Test
-    public void mergeStatusBarVisible_requestLayout() {
-        ViewGroup spy = Mockito.spy(new FrameLayout(activity));
-        Options options = new Options();
-        options.statusBar.visible = new Bool(false);
+    public void mergeStatusBarVisible_callsShowHide() {
+        mockSystemUiUtils(1,1,(mockedStatic)->{
+            ViewGroup spy = Mockito.spy(new FrameLayout(activity));
+            Mockito.when(controller.getView()).thenReturn(spy);
+            Mockito.when(controller.resolveCurrentOptions()).thenReturn(Options.EMPTY);
+            Options options = new Options();
+            options.statusBar.visible = new Bool(false);
+            uut.mergeOptions(controller, options);
+            mockedStatic.verify(
+                    ()-> SystemUiUtils.hideStatusBar(any(),eq(spy)),times(1));
+
+            options.statusBar.visible = new Bool(true);
+            uut.mergeOptions(controller, options);
+            mockedStatic.verify(
+                    ()-> SystemUiUtils.showStatusBar(any(),eq(spy)),times(1));
+        });
 
-        uut.mergeOptions(spy, options);
-        verify(spy).requestLayout();
-
-        // requested only if needed
-        uut.mergeOptions(spy, options);
-        verify(spy).requestLayout();
     }
 }

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

@@ -15,14 +15,19 @@ import org.mockito.Mockito;
 import java.util.HashMap;
 
 import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.assertj.core.api.Java6Assertions.fail;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 public class LayoutFactoryTest extends BaseTest {
     private LayoutFactory uut;
+    private ReactInstanceManager mockReactInstanceManager;
 
     @Override
     public void beforeEach() {
-        uut = new LayoutFactory(mock(ReactInstanceManager.class));
+        super.beforeEach();
+        mockReactInstanceManager = mock(ReactInstanceManager.class);
+        uut = new LayoutFactory(mockReactInstanceManager);
         uut.init(
                 newActivity(),
                 Mockito.mock(EventEmitter.class),
@@ -36,6 +41,16 @@ public class LayoutFactoryTest extends BaseTest {
         assertThat(uut.create(component())).isNotNull();
     }
 
+    @Test
+    public void shouldParseOptionsWhenReactContextIsNull() {
+        when(mockReactInstanceManager.getCurrentReactContext()).thenReturn(null);
+        try {
+            uut.create(component());
+        } catch (Exception e) {
+            fail("Create should not fail! when react instance has null context");
+        }
+    }
+
     @Test
     public void defaultOptionsAreNotNull() {
         assertThat(uut.getDefaultOptions()).isNotNull();
@@ -50,6 +65,14 @@ public class LayoutFactoryTest extends BaseTest {
     }
 
     private LayoutNode component() throws JSONException {
-        return new LayoutNode("Component1", LayoutNode.Type.Component, new JSONObject().put("name", "com.component"), null);
+        final JSONObject component = new JSONObject();
+        final JSONObject layout = new JSONObject();
+        final JSONObject backgroundColor = new JSONObject();
+        backgroundColor.put("dark",0);
+        backgroundColor.put("light",1);
+        layout.put("backgroundColor",backgroundColor );
+        component.put("name", "com.component");
+        component.put("options",new JSONObject().put("layout", layout));
+        return new LayoutNode("Component1", LayoutNode.Type.Component, component, null);
     }
 }

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

@@ -4,7 +4,7 @@ import android.app.Activity
 import android.view.MotionEvent
 import android.view.View
 import android.widget.FrameLayout
-import com.nhaarman.mockitokotlin2.mock
+import org.mockito.kotlin.mock
 import com.reactnativenavigation.BaseTest
 import org.assertj.core.api.Java6Assertions.assertThat
 import org.junit.Test

package/lib/android/app/src/test/java/com/reactnativenavigation/utils/{TitleAndButtonsMeasurer.kt → TitleAndButtonsMeasurerTest.kt}

@@ -2,13 +2,13 @@ package com.reactnativenavigation.utils
 
 import com.reactnativenavigation.BaseTest
 import com.reactnativenavigation.views.stack.topbar.titlebar.DEFAULT_LEFT_MARGIN_PX
+import com.reactnativenavigation.views.stack.topbar.titlebar.resolveHorizontalTitleBoundsLimit
 import com.reactnativenavigation.views.stack.topbar.titlebar.resolveLeftButtonsBounds
 import com.reactnativenavigation.views.stack.topbar.titlebar.resolveRightButtonsBounds
-import com.reactnativenavigation.views.stack.topbar.titlebar.resolveHorizontalTitleBoundsLimit
 import org.junit.Test
 import kotlin.test.assertEquals
 
-class TitleAndButtonsMeasurer : BaseTest() {
+class TitleAndButtonsMeasurerTest : BaseTest() {
     private val parentWidth = 1080
 
     @Test

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

@@ -13,7 +13,7 @@ public class UiThreadTest extends BaseTest {
         Runnable task = mock(Runnable.class);
         ShadowLooper.pauseMainLooper();
         UiThread.post(task);
-        verifyZeroInteractions(task);
+        verifyNoInteractions(task);
         ShadowLooper.runUiThreadTasks();
         verify(task, times(1)).run();
     }
@@ -22,7 +22,7 @@ public class UiThreadTest extends BaseTest {
     public void postDelayedOnUiThread() throws Exception {
         Runnable task = mock(Runnable.class);
         UiThread.postDelayed(task, 1000);
-        verifyZeroInteractions(task);
+        verifyNoInteractions(task);
         ShadowLooper.runUiThreadTasksIncludingDelayedTasks();
         verify(task, times(1)).run();
     }

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

@@ -13,7 +13,7 @@ public class UiUtilsTest extends BaseTest {
     public void runOnPreDrawOnce() {
         View view = new View(newActivity());
         Runnable task = mock(Runnable.class);
-        verifyZeroInteractions(task);
+        verifyNoInteractions(task);
 
         UiUtils.runOnPreDrawOnce(view, task);
         dispatchPreDraw(view);