Refactor root presentation

Pull presentation logic from Navigator to rootPresenter

lib/android/app/src/main/java/com/reactnativenavigation/NavigationActivity.java

@@ -19,8 +19,9 @@ import com.reactnativenavigation.react.JsDevReloadHandler;
 import com.reactnativenavigation.react.ReactGateway;
 import com.reactnativenavigation.utils.CommandListenerAdapter;
 import com.reactnativenavigation.viewcontrollers.ChildControllersRegistry;
-import com.reactnativenavigation.viewcontrollers.Navigator;
 import com.reactnativenavigation.viewcontrollers.modal.ModalStack;
+import com.reactnativenavigation.viewcontrollers.navigator.Navigator;
+import com.reactnativenavigation.viewcontrollers.navigator.RootPresenter;
 
 public class NavigationActivity extends AppCompatActivity implements DefaultHardwareBackBtnHandler, PermissionAwareActivity, JsDevReloadHandler.ReloadListener {
     @Nullable
@@ -32,7 +33,8 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         addDefaultSplashLayout();
-        navigator = new Navigator(this, new ChildControllersRegistry(), new ModalStack(this), new OverlayManager());
+        navigator = new Navigator(this, new ChildControllersRegistry(), new ModalStack(this), new OverlayManager(), new RootPresenter(this));
+        navigator.bindViews();
         getReactGateway().onActivityCreated(this);
     }
 

lib/android/app/src/main/java/com/reactnativenavigation/anim/NavigationAnimator.java

@@ -1,7 +1,6 @@
 package com.reactnativenavigation.anim;
 
 import android.animation.Animator;
-import android.animation.Animator.AnimatorListener;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.content.Context;
@@ -93,18 +92,18 @@ public class NavigationAnimator extends BaseAnimator {
         set.start();
     }
 
-    public void animateStartApp(View view, AnimationOptions startApp, AnimatorListener listener) {
-        view.setVisibility(View.INVISIBLE);
-        AnimatorSet set = startApp.getAnimation(view);
+    public void setRoot(View root, AnimationOptions setRoot, Runnable onAnimationEnd) {
+        root.setVisibility(View.INVISIBLE);
+        AnimatorSet set = setRoot.getAnimation(root);
         set.addListener(new AnimatorListenerAdapter() {
             @Override
             public void onAnimationStart(Animator animation) {
-                view.setVisibility(View.VISIBLE);
+                root.setVisibility(View.VISIBLE);
             }
 
             @Override
             public void onAnimationEnd(Animator animation) {
-                listener.onAnimationEnd(animation);
+                onAnimationEnd.run();
             }
         });
         set.start();

lib/android/app/src/main/java/com/reactnativenavigation/react/NavigationModule.java

@@ -23,7 +23,7 @@ import com.reactnativenavigation.utils.Now;
 import com.reactnativenavigation.utils.TypefaceLoader;
 import com.reactnativenavigation.utils.UiThread;
 import com.reactnativenavigation.utils.UiUtils;
-import com.reactnativenavigation.viewcontrollers.Navigator;
+import com.reactnativenavigation.viewcontrollers.navigator.Navigator;
 import com.reactnativenavigation.viewcontrollers.ViewController;
 import com.reactnativenavigation.viewcontrollers.externalcomponent.ExternalComponentCreator;
 

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

@@ -6,6 +6,7 @@ import android.view.ViewGroup;
 
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.presentation.OptionsPresenter;
+import com.reactnativenavigation.viewcontrollers.navigator.Navigator;
 import com.reactnativenavigation.views.Component;
 
 public abstract class ChildController<T extends ViewGroup> extends ViewController<T>  {

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

@@ -137,7 +137,7 @@ public abstract class ViewController<T extends ViewGroup> implements ViewTreeObs
         this.parentController = parentController;
     }
 
-    void performOnParentStack(Task<StackController> task) {
+    public void performOnParentStack(Task<StackController> task) {
         if (parentController instanceof StackController) {
             task.run((StackController) parentController);
         } else if (this instanceof StackController) {

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/Navigator.java → lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/navigator/Navigator.java

@@ -1,14 +1,12 @@
-package com.reactnativenavigation.viewcontrollers;
+package com.reactnativenavigation.viewcontrollers.navigator;
 
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
 import android.app.Activity;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.annotation.RestrictTo;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
-import com.reactnativenavigation.anim.NavigationAnimator;
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.presentation.OptionsPresenter;
 import com.reactnativenavigation.presentation.OverlayManager;
@@ -16,9 +14,11 @@ import com.reactnativenavigation.react.EventEmitter;
 import com.reactnativenavigation.utils.CommandListener;
 import com.reactnativenavigation.utils.CompatUtils;
 import com.reactnativenavigation.utils.Task;
+import com.reactnativenavigation.viewcontrollers.ChildControllersRegistry;
+import com.reactnativenavigation.viewcontrollers.ParentController;
+import com.reactnativenavigation.viewcontrollers.ViewController;
 import com.reactnativenavigation.viewcontrollers.modal.ModalStack;
 import com.reactnativenavigation.viewcontrollers.stack.StackController;
-import com.reactnativenavigation.views.element.ElementTransitionManager;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -27,6 +27,7 @@ public class Navigator extends ParentController {
 
     private final ModalStack modalStack;
     private final OverlayManager overlayManager;
+    private final RootPresenter rootPresenter;
     private ViewController root;
     private final FrameLayout rootLayout;
     private final FrameLayout modalsLayout;
@@ -60,14 +61,19 @@ public class Navigator extends ParentController {
         contentLayout.addView(overlaysLayout);
     }
 
-    public Navigator(final Activity activity, ChildControllersRegistry childRegistry, ModalStack modalStack, OverlayManager overlayManager) {
+    public Navigator(final Activity activity, ChildControllersRegistry childRegistry, ModalStack modalStack, OverlayManager overlayManager, RootPresenter rootPresenter) {
         super(activity, childRegistry,"navigator" + CompatUtils.generateViewId(), new OptionsPresenter(activity, new Options()), new Options());
         this.modalStack = modalStack;
         this.overlayManager = overlayManager;
+        this.rootPresenter = rootPresenter;
         rootLayout = new FrameLayout(getActivity());
         modalsLayout = new FrameLayout(getActivity());
         overlaysLayout = new FrameLayout(getActivity());
+    }
+
+    public void bindViews() {
         modalStack.setModalsContainer(modalsLayout);
+        rootPresenter.setRootContainer(rootLayout);
     }
 
     @NonNull
@@ -123,19 +129,7 @@ public class Navigator extends ParentController {
             getView();
         }
         root = viewController;
-        rootLayout.addView(viewController.getView());
-        Options options = viewController.resolveCurrentOptions().withDefaultOptions(defaultOptions);
-        if (options.animations.setRoot.hasAnimation()) {
-            new NavigationAnimator(viewController.getActivity(), new ElementTransitionManager())
-                    .animateStartApp(viewController.getView(), options.animations.setRoot, new AnimatorListenerAdapter() {
-                        @Override
-                        public void onAnimationEnd(Animator animation) {
-                            commandListener.onSuccess(viewController.getId());
-                        }
-                    });
-        } else {
-            commandListener.onSuccess(viewController.getId());
-        }
+        rootPresenter.setRoot(root, defaultOptions, commandListener);
     }
 
     private void removePreviousContentView() {
@@ -221,4 +215,9 @@ public class Navigator extends ParentController {
     private boolean isRootNotCreated() {
         return view == null;
     }
+
+    @RestrictTo(RestrictTo.Scope.TESTS)
+    public FrameLayout getModalsLayout() {
+        return modalsLayout;
+    }
 }

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/navigator/RootPresenter.java

@@ -0,0 +1,37 @@
+package com.reactnativenavigation.viewcontrollers.navigator;
+
+import android.content.Context;
+import android.widget.FrameLayout;
+
+import com.reactnativenavigation.anim.NavigationAnimator;
+import com.reactnativenavigation.parse.Options;
+import com.reactnativenavigation.utils.CommandListener;
+import com.reactnativenavigation.viewcontrollers.ViewController;
+import com.reactnativenavigation.views.element.ElementTransitionManager;
+
+public class RootPresenter {
+    private NavigationAnimator animator;
+    private FrameLayout rootLayout;
+
+    public void setRootContainer(FrameLayout rootLayout) {
+        this.rootLayout = rootLayout;
+    }
+
+    public RootPresenter(Context context) {
+        animator = new NavigationAnimator(context, new ElementTransitionManager());
+    }
+
+    RootPresenter(NavigationAnimator animator) {
+        this.animator = animator;
+    }
+
+    public void setRoot(ViewController root, Options defaultOptions, CommandListener listener) {
+        rootLayout.addView(root.getView());
+        Options options = root.resolveCurrentOptions(defaultOptions);
+        if (options.animations.setRoot.hasAnimation()) {
+            animator.setRoot(root.getView(), options.animations.setRoot, () -> listener.onSuccess(root.getId()));
+        } else {
+            listener.onSuccess(root.getId());
+        }
+    }
+}

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

@@ -1,7 +1,7 @@
 package com.reactnativenavigation;
 
 import com.reactnativenavigation.react.ReactGateway;
-import com.reactnativenavigation.viewcontrollers.Navigator;
+import com.reactnativenavigation.viewcontrollers.navigator.Navigator;
 
 import org.mockito.Mockito;
 

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/NavigatorTest.java → lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/navigator/NavigatorTest.java

@@ -1,4 +1,4 @@
-package com.reactnativenavigation.viewcontrollers;
+package com.reactnativenavigation.viewcontrollers.navigator;
 
 import android.os.Bundle;
 import android.support.annotation.NonNull;
@@ -25,6 +25,9 @@ import com.reactnativenavigation.utils.CompatUtils;
 import com.reactnativenavigation.utils.ImageLoader;
 import com.reactnativenavigation.utils.OptionHelper;
 import com.reactnativenavigation.utils.ViewUtils;
+import com.reactnativenavigation.viewcontrollers.ChildControllersRegistry;
+import com.reactnativenavigation.viewcontrollers.ComponentViewController;
+import com.reactnativenavigation.viewcontrollers.ViewController;
 import com.reactnativenavigation.viewcontrollers.bottomtabs.BottomTabsController;
 import com.reactnativenavigation.viewcontrollers.modal.ModalStack;
 import com.reactnativenavigation.viewcontrollers.stack.StackController;
@@ -47,6 +50,7 @@ public class NavigatorTest extends BaseTest {
     private TestActivity activity;
     private ChildControllersRegistry childRegistry;
     private Navigator uut;
+    private RootPresenter rootPresenter;
     private StackController parentController;
     private SimpleViewController child1;
     private ViewController child2;
@@ -70,8 +74,9 @@ public class NavigatorTest extends BaseTest {
         activityController = newActivityController(TestActivity.class);
         activity = activityController.create().get();
         modalStack = spy(new ModalStack(activity));
+        rootPresenter = spy(new RootPresenter(activity));
         modalStack.setEventEmitter(Mockito.mock(EventEmitter.class));
-        uut = new Navigator(activity, childRegistry, modalStack, overlayManager);
+        uut = new Navigator(activity, childRegistry, modalStack, overlayManager, rootPresenter);
         activity.setNavigator(uut);
 
         parentController = newStack();
@@ -93,10 +98,18 @@ public class NavigatorTest extends BaseTest {
         child4 = new SimpleViewController(activity, childRegistry, "child4", tabOptions);
         child5 = new SimpleViewController(activity, childRegistry, "child5", tabOptions);
 
+        uut.bindViews();
+
         activityController.visible();
         activityController.postCreate(Bundle.EMPTY);
     }
 
+    @Test
+    public void bindViews() {
+        verify(rootPresenter).setRootContainer(uut.getRootLayout());
+        verify(modalStack).setModalsContainer(uut.getModalsLayout());
+    }
+
     @Test
     public void setDefaultOptions() {
         uut.setDefaultOptions(new Options());
@@ -110,6 +123,13 @@ public class NavigatorTest extends BaseTest {
         verify(modalStack).setDefaultOptions(defaultOptions);
     }
 
+    @Test
+    public void setRoot_delegatesToRootPresenter() {
+        CommandListenerAdapter listener = new CommandListenerAdapter();
+        uut.setRoot(child1, listener);
+        verify(rootPresenter).setRoot(child1, uut.getDefaultOptions(), listener);
+    }
+
     @Test
     public void setRoot_clearsSplashLayout() {
         disableModalAnimations(child1);
@@ -138,7 +158,7 @@ public class NavigatorTest extends BaseTest {
     @Test
     public void hasUniqueId() {
         assertThat(uut.getId()).startsWith("navigator");
-        assertThat(new Navigator(activity, childRegistry, modalStack, overlayManager).getId()).isNotEqualTo(uut.getId());
+        assertThat(new Navigator(activity, childRegistry, modalStack, overlayManager, rootPresenter).getId()).isNotEqualTo(uut.getId());
     }
 
     @Test

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/navigator/RootPresenterTest.java

@@ -0,0 +1,97 @@
+package com.reactnativenavigation.viewcontrollers.navigator;
+
+import android.app.Activity;
+import android.support.annotation.NonNull;
+import android.view.View;
+import android.widget.FrameLayout;
+
+import com.reactnativenavigation.BaseTest;
+import com.reactnativenavigation.anim.NavigationAnimator;
+import com.reactnativenavigation.mocks.SimpleViewController;
+import com.reactnativenavigation.parse.AnimationOptions;
+import com.reactnativenavigation.parse.Options;
+import com.reactnativenavigation.utils.CommandListenerAdapter;
+import com.reactnativenavigation.viewcontrollers.ChildControllersRegistry;
+import com.reactnativenavigation.viewcontrollers.ViewController;
+import com.reactnativenavigation.views.element.ElementTransitionManager;
+
+import org.junit.Test;
+
+import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.when;
+
+public class RootPresenterTest extends BaseTest {
+    private RootPresenter uut;
+    private FrameLayout rootContainer;
+    private ViewController root;
+    private NavigationAnimator animator;
+    private Options defaultOptions;
+
+
+    @Override
+    public void beforeEach() {
+        Activity activity = newActivity();
+        rootContainer = new FrameLayout(activity);
+        root = new SimpleViewController(activity, new ChildControllersRegistry(), "child1", new Options());
+        animator = spy(createAnimator(activity));
+        uut = new RootPresenter(animator);
+        uut.setRootContainer(rootContainer);
+        defaultOptions = new Options();
+    }
+
+    @Test
+    public void setRoot_viewIsAddedToContainer() {
+        uut.setRoot(root, defaultOptions, new CommandListenerAdapter());
+        assertThat(root.getView().getParent()).isEqualTo(rootContainer);
+    }
+
+    @Test
+    public void setRoot_reportsOnSuccess() {
+        CommandListenerAdapter listener = spy(new CommandListenerAdapter());
+        uut.setRoot(root, defaultOptions, listener);
+        verify(listener).onSuccess(root.getId());
+    }
+
+    @Test
+    public void setRoot_doesNotAnimateByDefault() {
+        CommandListenerAdapter listener = spy(new CommandListenerAdapter());
+        uut.setRoot(root, defaultOptions, listener);
+        verifyZeroInteractions(animator);
+        verify(listener).onSuccess(root.getId());
+    }
+
+    @Test
+    public void setRoot_animates() {
+        Options animatedSetRoot = new Options();
+        animatedSetRoot.animations.setRoot = new AnimationOptions() {
+            @Override
+            public boolean hasAnimation() {
+                return true;
+            }
+        };
+
+        ViewController spy = spy(root);
+        when(spy.resolveCurrentOptions(defaultOptions)).thenReturn(animatedSetRoot);
+        CommandListenerAdapter listener = spy(new CommandListenerAdapter());
+
+        uut.setRoot(spy, defaultOptions, listener);
+        verify(animator).setRoot(eq(spy.getView()), eq(animatedSetRoot.animations.setRoot), any());
+        verify(listener).onSuccess(spy.getId());
+    }
+
+    @NonNull
+    private NavigationAnimator createAnimator(Activity activity) {
+        return new NavigationAnimator(activity, mock(ElementTransitionManager.class)) {
+            @Override
+            public void setRoot(View root, AnimationOptions setRoot, Runnable onAnimationEnd) {
+                onAnimationEnd.run();
+            }
+        };
+    }
+}