react-native-navigation 7.24.3 → 7.25.0

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

@@ -1,149 +0,0 @@
-package com.reactnativenavigation.viewcontrollers;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.res.Configuration;
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
-import android.view.View;
-import android.widget.RelativeLayout;
-
-import com.reactnativenavigation.BaseTest;
-import com.reactnativenavigation.TestUtils;
-import com.reactnativenavigation.mocks.TestComponentLayout;
-import com.reactnativenavigation.mocks.TestReactView;
-import com.reactnativenavigation.options.Options;
-import com.reactnativenavigation.options.params.Bool;
-import com.reactnativenavigation.options.params.Colour;
-import com.reactnativenavigation.options.params.ThemeColour;
-import com.reactnativenavigation.options.params.Text;
-import com.reactnativenavigation.viewcontrollers.component.ComponentPresenter;
-import com.reactnativenavigation.viewcontrollers.viewcontroller.Presenter;
-import com.reactnativenavigation.react.CommandListenerAdapter;
-import com.reactnativenavigation.viewcontrollers.child.ChildControllersRegistry;
-import com.reactnativenavigation.viewcontrollers.component.ComponentViewController;
-import com.reactnativenavigation.viewcontrollers.stack.StackController;
-import com.reactnativenavigation.viewcontrollers.stack.topbar.TopBarController;
-import com.reactnativenavigation.viewcontrollers.viewcontroller.IReactView;
-import com.reactnativenavigation.views.stack.StackLayout;
-import com.reactnativenavigation.views.stack.topbar.TopBar;
-
-import org.junit.Test;
-
-import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
-import static org.assertj.core.api.Java6Assertions.assertThat;
-import static org.mockito.Mockito.spy;
-
-public class OptionsApplyingTest extends BaseTest {
-    private Activity activity;
-    private StackController stack;
-    private ComponentViewController uut;
-    private IReactView view;
-    private Options initialNavigationOptions;
-    private TopBar topBar;
-
-    @Override
-    public void beforeEach() {
-        super.beforeEach();
-        activity = newActivity();
-        initialNavigationOptions = new Options();
-        view = spy(new TestComponentLayout(activity, new TestReactView(activity)));
-        view.asView().setLayoutParams(new RelativeLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT));
-        uut = new ComponentViewController(activity,
-                new ChildControllersRegistry(),
-                "componentId1",
-                "componentName",
-                (activity1, componentId, componentName) -> view,
-                initialNavigationOptions,
-                new Presenter(activity, new Options()),
-                new ComponentPresenter(Options.EMPTY)
-        ) {
-            @Override
-            public boolean isViewShown() {
-                return true;
-            }
-        };
-        TopBarController topBarController = new TopBarController() {
-            @Override
-            protected TopBar createTopBar(Context context, StackLayout stackLayout) {
-                topBar = spy(super.createTopBar(context, stackLayout));
-                return topBar;
-            }
-        };
-        stack = TestUtils.newStackController(activity)
-                .setTopBarController(topBarController)
-                .build();
-        stack.ensureViewIsCreated();
-        stack.getView().layout(0, 0, 1000, 1000);
-        stack.getTopBar().layout(0, 0, 1000, 100);
-        activity.setContentView(stack.getView());
-        disablePushAnimation(uut);
-    }
-
-    @SuppressWarnings("ConstantConditions")
-    @Test
-    public void applyNavigationOptionsHandlesNoParentStack() {
-        uut.setParentController(null);
-        assertThat(uut.getParentController()).isNull();
-        uut.ensureViewIsCreated();
-        uut.onViewWillAppear();
-        assertThat(uut.getParentController()).isNull();
-    }
-
-    @Test
-    public void initialOptionsAppliedOnAppear() {
-        uut.options.topBar.title.text = new Text("the title");
-        StackController stackController = TestUtils.newStackController(activity).build();
-        stackController.ensureViewIsCreated();
-        stackController.push(uut, new CommandListenerAdapter());
-        assertThat(stackController.getTopBar().getTitle()).isEmpty();
-
-        uut.onViewWillAppear();
-        assertThat(stackController.getTopBar().getTitle()).isEqualTo("the title");
-    }
-
-    @Test
-    public void mergeNavigationOptionsUpdatesCurrentOptions() {
-        assertThat(uut.options.topBar.title.text.get("")).isEmpty();
-        Options options = new Options();
-        options.topBar.title.text = new Text("new title");
-        uut.mergeOptions(options);
-        assertThat(uut.options.topBar.title.text.get()).isEqualTo("new title");
-    }
-
-    @Test
-    public void reappliesOptionsOnMerge() {
-        assertThat(stack.getTopBar().getTitle()).isEmpty();
-        stack.push(uut, new CommandListenerAdapter());
-
-        Options opts = new Options();
-        opts.topBar.title.text = new Text("the new title");
-        uut.mergeOptions(opts);
-
-        assertThat(stack.getTopBar().getTitle()).isEqualTo("the new title");
-    }
-
-    @Test
-    public void appliesTopBackBackgroundColor() {
-        uut.options.topBar.background.color = new ThemeColour(new Colour(Color.RED));
-        stack.push(uut, new CommandListenerAdapter());
-        idleMainLooper();
-        assertThat(((ColorDrawable) stack.getTopBar().getBackground()).getColor()).isEqualTo(Color.RED);
-    }
-
-    @Test
-    public void appliesTopBarVisible() {
-        stack.push(uut, new CommandListenerAdapter());
-
-        assertThat(uut.initialOptions).isSameAs(initialNavigationOptions);
-        initialNavigationOptions.topBar.title.text = new Text("the title");
-        assertThat(stack.getTopBar().getVisibility()).isNotEqualTo(View.GONE);
-
-        Options opts = new Options();
-        opts.topBar.visible = new Bool(false);
-        opts.topBar.animate = new Bool(false);
-        uut.mergeOptions(opts);
-
-        assertThat(stack.getTopBar().getVisibility()).isEqualTo(View.GONE);
-    }
-}

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

@@ -1,206 +0,0 @@
-package com.reactnativenavigation.viewcontrollers.bottomtabs;
-
-import android.app.Activity;
-import android.content.res.Configuration;
-import android.graphics.Color;
-
-import com.aurelhubert.ahbottomnavigation.notification.AHNotification;
-import com.reactnativenavigation.BaseTest;
-import com.reactnativenavigation.mocks.ImageLoaderMock;
-import com.reactnativenavigation.mocks.SimpleViewController;
-import com.reactnativenavigation.mocks.TypefaceLoaderMock;
-import com.reactnativenavigation.options.Options;
-import com.reactnativenavigation.options.params.Colour;
-import com.reactnativenavigation.options.params.DontApplyColour;
-import com.reactnativenavigation.options.params.NullText;
-import com.reactnativenavigation.options.params.NullThemeColour;
-import com.reactnativenavigation.options.params.ThemeColour;
-import com.reactnativenavigation.options.params.Text;
-import com.reactnativenavigation.viewcontrollers.child.ChildControllersRegistry;
-import com.reactnativenavigation.viewcontrollers.viewcontroller.ViewController;
-import com.reactnativenavigation.views.bottomtabs.BottomTabs;
-
-import org.junit.Test;
-import org.mockito.ArgumentCaptor;
-import org.mockito.InOrder;
-import org.mockito.Mockito;
-
-import java.util.Arrays;
-import java.util.List;
-
-import static com.reactnativenavigation.utils.CollectionUtils.*;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.inOrder;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-
-public class BottomTabPresenterTest extends BaseTest {
-    private Options tab1Options = createTab1Options();
-    private Options tab2Options = createTab2Options();
-    private BottomTabPresenter uut;
-    private BottomTabs bottomTabs;
-    private List<ViewController<?>> tabs;
-    private ViewController<?> child1;
-    private ViewController<?> child2;
-    private ViewController<?> child3;
-    private Activity activity;
-    private ChildControllersRegistry childRegistry;
-
-    @Override
-    public void beforeEach() {
-        super.beforeEach();
-        activity = newActivity();
-        childRegistry = new ChildControllersRegistry();
-        createBottomTabs(tab1Options,tab2Options,new Options());
-    }
-
-    private void createBottomTabs(Options tab1Options,
-                                  Options tab2Options,Options tab3Options ) {
-        childRegistry = new ChildControllersRegistry();
-        bottomTabs = Mockito.mock(BottomTabs.class);
-        child1 = spy(new SimpleViewController(activity, childRegistry, "child1", tab1Options));
-        child2 = spy(new SimpleViewController(activity, childRegistry, "child2", tab2Options));
-        child3 = spy(new SimpleViewController(activity, childRegistry, "child2", tab3Options));
-        tabs = Arrays.asList(child1, child2, child3);
-        uut = new BottomTabPresenter(activity, tabs, ImageLoaderMock.mock(), new TypefaceLoaderMock(), new Options());
-        uut.bindView(bottomTabs);
-        uut.setDefaultOptions(new Options());
-    }
-
-    @Test
-    public void onConfigurationChange_shouldChangeColors(){
-        Options options = Options.EMPTY;
-        options.bottomTabOptions.textColor = ThemeColour.of(Color.BLACK,Color.WHITE);
-        options.bottomTabOptions.selectedTextColor = ThemeColour.of(Color.BLUE,Color.RED);
-        options.bottomTabOptions.iconColor = ThemeColour.of(Color.BLACK,Color.WHITE);
-        options.bottomTabOptions.selectedIconColor = ThemeColour.of(Color.BLUE,Color.RED);
-        options.bottomTabOptions.badgeColor = ThemeColour.of(Color.BLACK,Color.WHITE);
-        createBottomTabs(options,options,options);
-
-        mockConfiguration.uiMode = Configuration.UI_MODE_NIGHT_NO;
-        uut.onConfigurationChanged(options);
-        for(int i=0;i<tabs.size();++i){
-            verify(bottomTabs).setIconActiveColor(i,Color.BLUE);
-            verify(bottomTabs).setIconInactiveColor(i,Color.BLACK);
-
-            verify(bottomTabs).setTitleActiveColor(i,Color.BLUE);
-            verify(bottomTabs).setTitleInactiveColor(i,Color.BLACK);
-        }
-
-        mockConfiguration.uiMode = Configuration.UI_MODE_NIGHT_YES;
-        uut.onConfigurationChanged(options);
-        for(int i=0;i<tabs.size();++i){
-            verify(bottomTabs).setIconActiveColor(i,Color.RED);
-            verify(bottomTabs).setIconInactiveColor(i,Color.WHITE);
-
-            verify(bottomTabs).setTitleActiveColor(i,Color.RED);
-            verify(bottomTabs).setTitleInactiveColor(i,Color.WHITE);
-        }
-    }
-
-    @Test
-    public void present() {
-        uut.applyOptions();
-        verify(bottomTabs, times(1)).setNotification(any(AHNotification.class), eq(0));
-        verify(bottomTabs, times(1)).setNotification(any(AHNotification.class), eq(1));
-        verify(bottomTabs, never()).setNotification(any(AHNotification.class), eq(2));
-
-        for (int i = 0; i < tabs.size(); i++) {
-            verify(bottomTabs, times(1)).setTitleInactiveColor(i, tabs.get(i).options.bottomTabOptions.textColor.get(null));
-            verify(bottomTabs, times(1)).setTitleActiveColor(i, tabs.get(i).options.bottomTabOptions.selectedTextColor.get(null));
-        }
-    }
-
-    @Test
-    public void applyOptions_shouldPresentBadgeIfAvailable() {
-        final Options tab1 = tab1Options.copy();
-        tab1.bottomTabOptions.badge = new NullText();
-        tab1.bottomTabOptions.badgeColor = new NullThemeColour();
-
-        final Options tab2 = tab2Options.copy();
-        tab2.bottomTabOptions.badge = new Text("Badge");
-        tab2.bottomTabOptions.badgeColor = ThemeColour.of(Color.RED);
-
-
-        createBottomTabs(tab1, tab2, new Options());
-        uut.applyOptions();
-
-        ArgumentCaptor<AHNotification> notificationArgumentCaptor = ArgumentCaptor.forClass(AHNotification.class);
-        verify(bottomTabs).setNotification(notificationArgumentCaptor.capture(), eq(1));
-        final AHNotification value = notificationArgumentCaptor.getValue();
-        assertThat(value.getReadableText()).isEqualTo("Badge");
-        assertThat(value.getBackgroundColor()).isEqualTo(Color.RED);
-
-        verify(bottomTabs,never()).setNotification(notificationArgumentCaptor.capture(), eq(0));
-        verify(bottomTabs,never()).setNotification(notificationArgumentCaptor.capture(), eq(2));
-
-    }
-
-    @Test
-    public void mergeOptions_createTabsOnce() {
-        Options options = new Options();
-        options.bottomTabOptions.iconColor = new ThemeColour(new Colour(1));
-        options.bottomTabOptions.selectedIconColor = new ThemeColour(new Colour(1));
-        BottomTabPresenter spy = spy(uut);
-
-        spy.mergeOptions(options);
-
-        InOrder inOrder = inOrder(spy, child1, child2, child3, bottomTabs);
-        inOrder.verify(bottomTabs).disableItemsCreation();
-        forEach(tabs, tab -> inOrder.verify(spy).mergeChildOptions(options, tab));
-        inOrder.verify(bottomTabs).enableItemsCreation();
-    }
-
-    @Test
-    public void mergeChildOptions() {
-        for (int i = 0; i < 2; i++) {
-            Options options = tabs.get(i).options;
-            uut.mergeChildOptions(options, tabs.get(i));
-            verify(bottomTabs, times(1)).setNotification(any(AHNotification.class), eq(i));
-            verify(bottomTabs, times(1)).setIconActiveColor(eq(i), anyInt());
-            verify(bottomTabs, times(1)).setIconInactiveColor(eq(i), anyInt());
-        }
-        verifyNoMoreInteractions(bottomTabs);
-    }
-
-    @Test
-    public void mergeChildOptions_onlySetsDefinedOptions() {
-        uut.mergeChildOptions(child3.options, child3);
-        verify(bottomTabs, times(0)).setNotification(any(AHNotification.class), anyInt());
-        verify(bottomTabs, times(0)).setIconInactiveColor(eq(2), anyInt());
-        verify(bottomTabs, times(0)).setIconActiveColor(eq(2), anyInt());
-        verifyNoMoreInteractions(bottomTabs);
-    }
-
-    @Test
-    public void mergeChildOptions_nullColorsAreNotMerged() {
-        Options options = new Options();
-        options.bottomTabOptions.iconColor = new ThemeColour(new DontApplyColour());
-        options.bottomTabOptions.selectedIconColor = new ThemeColour(new DontApplyColour());
-        uut.mergeChildOptions(options, child3);
-        verify(bottomTabs, times(0)).setIconActiveColor(anyInt(), anyInt());
-        verify(bottomTabs, times(0)).setIconInactiveColor(anyInt(), anyInt());
-    }
-
-    private Options createTab1Options() {
-        Options options = new Options();
-        options.bottomTabOptions.badge = new Text("tab1badge");
-        options.bottomTabOptions.iconColor = new ThemeColour(new Colour(Color.RED));
-        options.bottomTabOptions.selectedIconColor = new ThemeColour(new Colour(Color.RED));
-        return options;
-    }
-
-    private Options createTab2Options() {
-        Options options = new Options();
-        options.bottomTabOptions.badge = new Text("tab2badge");
-        options.bottomTabOptions.iconColor = new ThemeColour(new Colour(Color.RED));
-        options.bottomTabOptions.selectedIconColor = new ThemeColour(new Colour(Color.RED));
-        return options;
-    }
-}

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

@@ -1,62 +0,0 @@
-package com.reactnativenavigation.viewcontrollers.bottomtabs;
-
-import android.view.ViewGroup;
-
-import com.reactnativenavigation.BaseTest;
-import com.reactnativenavigation.options.Options;
-import com.reactnativenavigation.options.TabsAttachMode;
-import com.reactnativenavigation.viewcontrollers.bottomtabs.attacher.BottomTabsAttacher;
-import com.reactnativenavigation.viewcontrollers.bottomtabs.attacher.modes.AttachMode;
-import com.reactnativenavigation.viewcontrollers.bottomtabs.attacher.modes.OnSwitchToTab;
-import com.reactnativenavigation.viewcontrollers.viewcontroller.ViewController;
-
-import org.junit.Test;
-import org.mockito.Mockito;
-
-import java.util.Arrays;
-import java.util.List;
-
-import static org.assertj.core.api.Java6Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-public class BottomTabsAttacherTest extends BaseTest {
-
-    private BottomTabsAttacher uut;
-    private AttachMode mode;
-    private final Options defaultOptions = new Options();
-
-    @Override
-    public void beforeEach() {
-        mode = Mockito.mock(AttachMode.class);
-        List<ViewController<?>> tabs = Arrays.asList(mock(ViewController.class), mock(ViewController.class));
-        uut = new BottomTabsAttacher(tabs, Mockito.mock(BottomTabsPresenter.class), defaultOptions);
-        uut.attachStrategy = mode;
-    }
-
-    @Test
-    public void init_defaultOptionsAreTakenIntoAccount() {
-        defaultOptions.bottomTabsOptions.tabsAttachMode = TabsAttachMode.ON_SWITCH_TO_TAB;
-        uut.init(Mockito.mock(ViewGroup.class), Options.EMPTY);
-        assertThat(uut.attachStrategy).isInstanceOfAny(OnSwitchToTab.class);
-    }
-
-    @Test
-    public void attach_delegatesToStrategy() {
-        uut.attach();
-        verify(mode).attach();
-    }
-
-    @Test
-    public void onTabSelected() {
-        ViewController<?> tab = mock(ViewController.class);
-        uut.onTabSelected(tab);
-        verify(mode).onTabSelected(tab);
-    }
-
-    @Test
-    public void destroy_delegatesToStrategy() {
-        uut.destroy();
-        verify(mode).destroy();
-    }
-}