Merge default options before resolving animation options

Command animations did not take default options into account when resolving animation options.
This commit fixes that, TopBar options still need to be addressed.

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

@@ -10,7 +10,6 @@ import android.view.View;
 import android.view.animation.AccelerateDecelerateInterpolator;
 import android.view.animation.DecelerateInterpolator;
 
-import com.reactnativenavigation.parse.AnimationsOptions;
 import com.reactnativenavigation.utils.UiUtils;
 
 import static android.view.View.ALPHA;
@@ -22,8 +21,6 @@ class BaseAnimator {
     private static final TimeInterpolator DECELERATE = new DecelerateInterpolator();
     private static final TimeInterpolator ACCELERATE_DECELERATE = new AccelerateDecelerateInterpolator();
 
-    protected AnimationsOptions options = new AnimationsOptions();
-
     private float translationY;
 
     BaseAnimator(Context context) {
@@ -52,8 +49,4 @@ class BaseAnimator {
         set.playTogether(translationY, alpha);
         return set;
     }
-
-    public void setOptions(AnimationsOptions options) {
-        this.options = options;
-    }
 }

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

@@ -16,14 +16,14 @@ public class ModalAnimator extends BaseAnimator {
         super(context);
     }
 
-    public void show(View view, AnimationOptions animation, AnimatorListenerAdapter listener) {
-        animator = animation.getAnimation(view, getDefaultPushAnimation(view));
+    public void show(View view, AnimationOptions show, AnimatorListenerAdapter listener) {
+        animator = show.getAnimation(view, getDefaultPushAnimation(view));
         animator.addListener(listener);
         animator.start();
     }
 
-    public void dismiss(View view, AnimatorListenerAdapter listener) {
-        animator = options.dismissModal.getAnimation(view, getDefaultPopAnimation(view));
+    public void dismiss(View view, AnimationOptions dismiss, AnimatorListenerAdapter listener) {
+        animator = dismiss.getAnimation(view, getDefaultPopAnimation(view));
         animator.addListener(listener);
         animator.start();
     }

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

@@ -7,7 +7,8 @@ import android.animation.AnimatorSet;
 import android.content.Context;
 import android.view.View;
 
-import com.reactnativenavigation.parse.AnimationsOptions;
+import com.reactnativenavigation.parse.AnimationOptions;
+import com.reactnativenavigation.parse.NestedAnimationsOptions;
 
 @SuppressWarnings("ResourceType")
 public class NavigationAnimator extends BaseAnimator {
@@ -16,14 +17,9 @@ public class NavigationAnimator extends BaseAnimator {
         super(context);
     }
 
-    public NavigationAnimator(Context context, AnimationsOptions options) {
-        super(context);
-        this.options = options;
-    }
-
-    public void push(final View view, Runnable onAnimationEnd) {
+    public void push(View view, NestedAnimationsOptions push, Runnable onAnimationEnd) {
         view.setVisibility(View.INVISIBLE);
-        AnimatorSet set = options.push.content.getAnimation(view, getDefaultPushAnimation(view));
+        AnimatorSet set = push.content.getAnimation(view, getDefaultPushAnimation(view));
         set.addListener(new AnimatorListenerAdapter() {
             @Override
             public void onAnimationStart(Animator animation) {
@@ -38,8 +34,8 @@ public class NavigationAnimator extends BaseAnimator {
         set.start();
     }
 
-    public void pop(View view, Runnable onAnimationEnd) {
-        AnimatorSet set = options.pop.content.getAnimation(view, getDefaultPopAnimation(view));
+    public void pop(View view, NestedAnimationsOptions pop, Runnable onAnimationEnd) {
+        AnimatorSet set = pop.content.getAnimation(view, getDefaultPopAnimation(view));
         set.addListener(new AnimatorListenerAdapter() {
             @Override
             public void onAnimationEnd(Animator animation) {
@@ -49,9 +45,9 @@ public class NavigationAnimator extends BaseAnimator {
         set.start();
     }
 
-    public void animateStartApp(View view, AnimatorListener listener) {
+    public void animateStartApp(View view, AnimationOptions startApp, AnimatorListener listener) {
         view.setVisibility(View.INVISIBLE);
-        AnimatorSet set = options.startApp.getAnimation(view);
+        AnimatorSet set = startApp.getAnimation(view);
         set.addListener(new AnimatorListenerAdapter() {
             @Override
             public void onAnimationStart(Animator animation) {
@@ -65,12 +61,4 @@ public class NavigationAnimator extends BaseAnimator {
         });
         set.start();
     }
-
-    public void setOptions(AnimationsOptions options) {
-        this.options = options;
-    }
-
-    public void mergeOptions(AnimationsOptions options) {
-        this.options.mergeWith(options);
-    }
 }

lib/android/app/src/main/java/com/reactnativenavigation/parse/LayoutFactory.java

@@ -159,7 +159,7 @@ public class LayoutFactory {
 
 	private ViewController createStack(LayoutNode node) {
         return new StackControllerBuilder(activity)
-                .setChildren(createChildredn(node.children))
+                .setChildren(createChildren(node.children))
                 .setChildRegistry(childRegistry)
                 .setTopBarButtonCreator(new TitleBarButtonCreator(reactInstanceManager))
                 .setTitleBarReactViewCreator(new TitleBarReactViewCreator(reactInstanceManager))
@@ -172,7 +172,7 @@ public class LayoutFactory {
                 .build();
 	}
 
-    private List<ViewController> createChildredn(List<LayoutNode> children) {
+    private List<ViewController> createChildren(List<LayoutNode> children) {
         List<ViewController> result = new ArrayList<>();
         for (LayoutNode child : children) {
             result.add(create(child));

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

@@ -107,8 +107,8 @@ public class Navigator extends ParentController {
         root = viewController;
         contentLayout.addView(viewController.getView());
         if (viewController.options.animations.startApp.hasAnimation()) {
-            new NavigationAnimator(viewController.getActivity(), viewController.options.animations)
-                    .animateStartApp(viewController.getView(), new AnimatorListenerAdapter() {
+            new NavigationAnimator(viewController.getActivity())
+                    .animateStartApp(viewController.getView(), viewController.options.animations.startApp, new AnimatorListenerAdapter() {
                         @Override
                         public void onAnimationEnd(Animator animation) {
                             commandListener.onSuccess(viewController.getId());

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

@@ -67,7 +67,7 @@ public class ModalPresenter {
 
     public void dismissModal(ViewController toDismiss, CommandListener listener) {
         if (toDismiss.options.animations.dismissModal.enable.isTrueOrUndefined()) {
-            animator.dismiss(toDismiss.getView(), new AnimatorListenerAdapter() {
+            animator.dismiss(toDismiss.getView(), toDismiss.options.animations.dismissModal, new AnimatorListenerAdapter() {
                 @Override
                 public void onAnimationEnd(Animator animation) {
                     onDismissEnd(toDismiss, listener);

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

@@ -90,14 +90,12 @@ public class StackController extends ParentController<StackLayout> {
                         child
                 )
         );
-        animator.setOptions(options.animations);
     }
 
     @Override
     public void mergeChildOptions(Options options, Component child) {
         super.mergeChildOptions(options, child);
         presenter.mergeChildOptions(options, child);
-        animator.mergeOptions(options.animations);
         if (options.fabOptions.hasValue() && child instanceof ReactComponent) {
             fabOptionsPresenter.mergeOptions(options.fabOptions, (ReactComponent) child, getView());
         }
@@ -135,14 +133,14 @@ public class StackController extends ParentController<StackLayout> {
         addChildToStack(child, child.getView(), resolvedOptions);
 
         if (toRemove != null) {
-            if (child.options.animations.push.enable.isTrueOrUndefined()) {
+            if (resolvedOptions.animations.push.enable.isTrueOrUndefined()) {
                 if (resolvedOptions.animations.push.waitForRender.isTrue()) {
-                    child.setOnAppearedListener(() -> animator.push(child.getView(), () -> {
+                    child.setOnAppearedListener(() -> animator.push(child.getView(), resolvedOptions.animations.push, () -> {
                         getView().removeView(toRemove.getView());
                         listener.onSuccess(child.getId());
                     }));
                 } else {
-                    animator.push(child.getView(), () -> {
+                    animator.push(child.getView(), resolvedOptions.animations.push, () -> {
                         getView().removeView(toRemove.getView());
                         listener.onSuccess(child.getId());
                     });
@@ -194,16 +192,16 @@ public class StackController extends ParentController<StackLayout> {
         final ViewController appearing = stack.peek();
         disappearing.onViewWillDisappear();
         appearing.onViewWillAppear();
+        Options resolvedOptions = resolveCurrentOptions();
         ViewGroup appearingView = appearing.getView();
         if (appearingView.getLayoutParams() == null) {
             appearingView.setLayoutParams(new RelativeLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT));
-            Options options = resolveCurrentOptions();
-            presenter.applyLayoutParamsOptions(options, appearingView);
+            presenter.applyLayoutParamsOptions(resolvedOptions, appearingView);
         }
         getView().addView(appearingView, 0);
         presenter.onChildWillAppear(appearing.options, disappearing.options);
         if (disappearing.options.animations.pop.enable.isTrueOrUndefined()) {
-            animator.pop(disappearing.getView(), () -> finishPopping(disappearing, listener));
+            animator.pop(disappearing.getView(), resolvedOptions.animations.pop, () -> finishPopping(disappearing, listener));
         } else {
             finishPopping(disappearing, listener);
         }

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

@@ -14,7 +14,7 @@ public class ModalAnimatorMock extends ModalAnimator {
     }
 
     @Override
-    public void show(View view, AnimationOptions animation, AnimatorListenerAdapter listener) {
+    public void show(View view, AnimationOptions show, AnimatorListenerAdapter listener) {
         try {
             listener.onAnimationStart(null);
             Thread.sleep(10);
@@ -25,7 +25,7 @@ public class ModalAnimatorMock extends ModalAnimator {
     }
 
     @Override
-    public void dismiss(View view, AnimatorListenerAdapter listener) {
+    public void dismiss(View view, AnimationOptions dismiss, AnimatorListenerAdapter listener) {
         try {
             listener.onAnimationStart(null);
             Thread.sleep(10);

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

@@ -149,7 +149,7 @@ public class ModalPresenterTest extends BaseTest {
             }
         });
 
-        verify(animator, times(1)).dismiss(eq(modal1.getView()), any());
+        verify(animator, times(1)).dismiss(eq(modal1.getView()), eq(modal1.options.animations.dismissModal), any());
     }
 
     @Test
@@ -170,7 +170,7 @@ public class ModalPresenterTest extends BaseTest {
         uut.dismissTopModal(modal1, root, new CommandListenerAdapter());
         verify(modal1, times(1)).onViewDisappear();
         verify(modal1, times(1)).destroy();
-        verify(animator, times(0)).dismiss(any(), any());
+        verify(animator, times(0)).dismiss(any(), eq(modal1.options.animations.dismissModal), any());
     }
 
     @Test

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

@@ -160,8 +160,8 @@ public class ModalStackTest extends BaseTest {
         CommandListener listener = spy(new CommandListenerAdapter());
         uut.dismissAllModals(listener, rootController);
         verify(presenter, times(1)).dismissTopModal(modal2, rootController, listener);
-        verify(animator, times(0)).dismiss(eq(view1), any());
-        verify(animator, times(1)).dismiss(eq(view2), any());
+        verify(animator, times(0)).dismiss(eq(view1), eq(modal1.options.animations.dismissModal), any());
+        verify(animator, times(1)).dismiss(eq(view2), eq(modal2.options.animations.dismissModal), any());
         assertThat(uut.size()).isEqualTo(0);
     }
 

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/stack/StackControllerTest.java

@@ -166,7 +166,7 @@ public class StackControllerTest extends BaseTest {
         child2.options.animations.push.waitForRender = new Bool(true);
         uut.push(child2, new CommandListenerAdapter());
         verify(child2).setOnAppearedListener(any());
-        verify(animator, times(0)).push(eq(child1.getView()), any());
+        verify(animator, times(0)).push(eq(child1.getView()), eq(child1.options.animations.push), any());
     }
 
     @Test
@@ -484,9 +484,9 @@ public class StackControllerTest extends BaseTest {
                 uut.popTo(child2, new CommandListenerAdapter() {
                     @Override
                     public void onSuccess(String childId) {
-                        verify(animator, times(0)).pop(eq(child1.getView()), any());
-                        verify(animator, times(0)).pop(eq(child2.getView()), any());
-                        verify(animator, times(1)).pop(eq(child4.getView()), any());
+                        verify(animator, times(0)).pop(eq(child1.getView()), any(), any());
+                        verify(animator, times(0)).pop(eq(child2.getView()), any(), any());
+                        verify(animator, times(1)).pop(eq(child4.getView()), eq(child4.options.animations.push), any());
                     }
                 });
             }
@@ -530,7 +530,7 @@ public class StackControllerTest extends BaseTest {
                 uut.popToRoot(new CommandListenerAdapter() {
                     @Override
                     public void onSuccess(String childId) {
-                        verify(animator, times(1)).pop(eq(child3.getView()), any());
+                        verify(animator, times(1)).pop(eq(child3.getView()), eq(child3.options.animations.pop), any());
                     }
                 });
             }
@@ -789,16 +789,6 @@ public class StackControllerTest extends BaseTest {
         assertThat(captor.getValue().bottomTabsOptions.testId.get()).isEqualTo(optionsToMerge.bottomTabsOptions.testId.get());
     }
 
-    @Test
-    public void mergeChildOptions_mergeAnimationOptions() {
-        Options options = new Options();
-        Component component = mock(Component.class);
-
-        uut.mergeChildOptions(options, component);
-        verify(animator, times(0)).setOptions(options.animations);
-        verify(animator, times(1)).mergeOptions(options.animations);
-    }
-
     @Test
     public void mergeChildOptions_StackRelatedOptionsAreCleared() {
         uut.ensureViewIsCreated();